github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-11-08 16:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add more mercury debug

Browse source
This commit is contained in:
Paul Lietar 2017-05-15 21:54:28 +01:00
parent 28232b5a52
commit ba51b8f236
2 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/mercury/mod.rs
View file

@ -101,9 +101,10 @@ impl MercuryManager {
pub fn subscribe<T: Into<String>>(&self, uri: T)
-> BoxFuture<mpsc::UnboundedReceiver<MercuryResponse>, MercuryError>
{
let uri = uri.into();
let request = self.request(MercuryRequest {
method: MercuryMethod::SUB,
uri: uri.into(),
uri: uri.clone(),
content_type: None,
payload: Vec::new(),
});
@ -116,8 +117,11 @@ impl MercuryManager {
for sub in response.payload {
let mut sub : protocol::pubsub::Subscription
= protobuf::parse_from_bytes(&sub).unwrap();
let uri = sub.take_uri();
inner.subscriptions.insert(uri, tx.clone());
let sub_uri = sub.take_uri();
debug!("subscribed {} ({})", uri, sub_uri);
inner.subscriptions.insert(sub_uri, tx.clone());
}
});
@ -181,21 +185,29 @@ impl MercuryManager {
let response = MercuryResponse {
uri: header.get_uri().to_owned(),
status_code: header.get_status_code(),
payload: pending.parts,
};
if cmd == 0xb5 {
self.lock(|inner| {
use std::collections::hash_map::Entry;
if let Entry::Occupied(entry) = inner.subscriptions.entry(response.uri.clone()) {
// TODO: send unsub message
if entry.get().send(response).is_err() {
entry.remove();
if response.status_code >= 400 {
warn!("error {} for uri {}", response.status_code, &response.uri);
if let Some(cb) = pending.callback {
cb.complete(Err(MercuryError));
}
} else {
if cmd == 0xb5 {
self.lock(|inner| {
use std::collections::hash_map::Entry;
if let Entry::Occupied(entry) = inner.subscriptions.entry(response.uri.clone()) {
// TODO: send unsub message
if entry.get().send(response).is_err() {
entry.remove();
}
}
}
})
} else if let Some(cb) = pending.callback {
cb.complete(Ok(response));
})
} else if let Some(cb) = pending.callback {
cb.complete(Ok(response));
}
}
}
}

1
src/mercury/types.rs
View file

@ -23,6 +23,7 @@ pub struct MercuryRequest {
#[derive(Debug)]
pub struct MercuryResponse {
pub uri: String,
pub status_code: i32,
pub payload: Vec<Vec<u8>>,
}