github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for new mercury subscription protocol.

Browse source 
Fixes #185
This commit is contained in:
Paul Lietar 2017-05-15 23:47:34 +01:00
parent 7c237c77df
commit 6f24e3b731
2 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/mercury/mod.rs
View file

@ -19,7 +19,7 @@ component! {
MercuryManager : MercuryManagerInner {
sequence: SeqGenerator<u64> = SeqGenerator::new(0),
pending: HashMap<Vec<u8>, MercuryPending> = HashMap::new(),
subscriptions: HashMap<String, mpsc::UnboundedSender<MercuryResponse>> = HashMap::new(),
subscriptions: Vec<(String, mpsc::UnboundedSender<MercuryResponse>)> = Vec::new(),
}
}
@ -114,14 +114,21 @@ impl MercuryManager {
let (tx, rx) = mpsc::unbounded();
manager.lock(move |inner| {
for sub in response.payload {
let mut sub : protocol::pubsub::Subscription
= protobuf::parse_from_bytes(&sub).unwrap();
let sub_uri = sub.take_uri();
debug!("subscribed uri={} count={}", uri, response.payload.len());
if response.payload.len() > 0 {
// Old subscription protocol, watch the provided list of URIs
for sub in response.payload {
let mut sub : protocol::pubsub::Subscription
= protobuf::parse_from_bytes(&sub).unwrap();
let sub_uri = sub.take_uri();
debug!("subscribed {} ({})", uri, sub_uri);
debug!("subscribed sub_uri={}", sub_uri);
inner.subscriptions.insert(sub_uri, tx.clone());
inner.subscriptions.push((sub_uri, tx.clone()));
}
} else {
// New subscription protocol, watch the requested URI
inner.subscriptions.push((uri, tx));
}
});
@ -197,12 +204,22 @@ impl MercuryManager {
} 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();
let mut found = false;
inner.subscriptions.retain(|&(ref prefix, ref sub)| {
if response.uri.starts_with(prefix) {
found = true;
// if send fails, remove from list of subs
// TODO: send unsub message
sub.send(response.clone()).is_ok()
} else {
// URI doesn't match
true
}
});
if !found {
debug!("unknown subscription uri={}", response.uri);
}
})
} else if let Some(cb) = pending.callback {

2
src/mercury/types.rs
View file

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