leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(bluetooth): handle end of device scan stream

Browse source
This commit is contained in:
Ashley Wulber 2023-02-10 15:06:28 -05:00 • committed by Ashley Wulber
parent 7a9ab9de72
commit 02f3e8d76c
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cosmic-applet-bluetooth/src/app.rs
View file

@ -159,6 +159,7 @@ impl Application for CosmicBluetoothApplet {
self.bluer_state = state; self.bluer_state = state;
} }
BluerEvent::Finished => { BluerEvent::Finished => {
// TODO should this exit with an error causing a restart?
eprintln!("bluetooth subscription finished. exiting..."); eprintln!("bluetooth subscription finished. exiting...");
std::process::exit(0); std::process::exit(0);
} }

9
cosmic-applet-bluetooth/src/bluetooth.rs
View file

@ -35,13 +35,13 @@ async fn start_listening<I: Copy + Debug>(id: I, state: State) -> (Option<(I, Bl
State::Ready => { State::Ready => {
let session = match Session::new().await { let session = match Session::new().await {
Ok(s) => s, Ok(s) => s,
Err(_) => return (None, State::Finished), Err(_) => return (Some((id, BluerEvent::Finished)), State::Finished),
}; };
let (tx, rx) = channel(100); let (tx, rx) = channel(100);
let session_state = match BluerSessionState::new(session, rx).await { let session_state = match BluerSessionState::new(session, rx).await {
Ok(s) => s, Ok(s) => s,
Err(_) => return (None, State::Finished), Err(_) => return (Some((id, BluerEvent::Finished)), State::Finished),
}; };
let state = session_state.bluer_state().await; let state = session_state.bluer_state().await;
@ -60,7 +60,7 @@ async fn start_listening<I: Copy + Debug>(id: I, state: State) -> (Option<(I, Bl
let mut session_rx = match session_state.rx.take() { let mut session_rx = match session_state.rx.take() {
Some(rx) => rx, Some(rx) => rx,
None => { None => {
return (None, State::Finished); // fail if we can't get the rx return (Some((id, BluerEvent::Finished)), State::Finished); // fail if we can't get the rx
} }
}; };
@ -85,7 +85,7 @@ async fn start_listening<I: Copy + Debug>(id: I, state: State) -> (Option<(I, Bl
_ => None, _ => None,
} }
} else { } else {
return (None, State::Finished); return (Some((id, BluerEvent::Finished)), State::Finished);
}; };
session_state.rx = Some(session_rx); session_state.rx = Some(session_rx);
(event, State::Waiting { session_state }) (event, State::Waiting { session_state })
@ -480,6 +480,7 @@ impl BluerSessionState {
milli_timeout = (milli_timeout * 2).max(5120); milli_timeout = (milli_timeout * 2).max(5120);
} }
} }
let _ = tx.send(BluerSessionEvent::ChangeStreamEnded).await;
Ok(()) Ok(())
}); });
} }