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

cleanup

Browse source
This commit is contained in:
Ashley Wulber 2023-02-09 23:45:53 -05:00 • committed by Ashley Wulber
parent 5e0baa62aa
commit c068343c4d
2 changed files with 16 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -147,7 +147,6 @@ impl Application for CosmicBluetoothApplet {
} }
self.bluer_state = state; self.bluer_state = state;
// TODO special handling for some requests // TODO special handling for some requests
match req { match req {
BluerRequest::StateUpdate BluerRequest::StateUpdate
if self.popup.is_some() && self.bluer_sender.is_some() => if self.popup.is_some() && self.bluer_sender.is_some() =>
@ -314,7 +313,12 @@ impl Application for CosmicBluetoothApplet {
.into(), .into(),
SurfaceIdWrapper::Popup(_) => { SurfaceIdWrapper::Popup(_) => {
let mut known_bluetooth = column![]; let mut known_bluetooth = column![];
for dev in &self.bluer_state.devices { for dev in self.bluer_state.devices.iter().filter(|d| {
!self
.request_confirmation
.as_ref()
.map_or(false, |(dev, _, _)| d.address == dev.address)
}) {
let mut row = row![].align_items(Alignment::Center); let mut row = row![].align_items(Alignment::Center);
row = row.push( row = row.push(
text(dev.name.clone()) text(dev.name.clone())
@ -477,7 +481,10 @@ impl Application for CosmicBluetoothApplet {
matches!( matches!(
d.status, d.status,
BluerDeviceStatus::Disconnected | BluerDeviceStatus::Pairing BluerDeviceStatus::Disconnected | BluerDeviceStatus::Pairing
) ) && !self
.request_confirmation
.as_ref()
.map_or(false, |(dev, _, _)| d.address == dev.address)
}) { }) {
let mut row = row![].width(Length::Fill).align_items(Alignment::Center); let mut row = row![].width(Length::Fill).align_items(Alignment::Center);
row = row.push( row = row.push(

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

@ -60,14 +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 => {
// try restarting the stream return (None, State::Finished); // fail if we can't get the rx
session_state.process_changes();
match session_state.rx.take() {
Some(rx) => rx,
None => {
return (None, State::Finished); // fail if we can't restart the stream
}
}
} }
}; };
@ -402,7 +395,7 @@ impl BluerSessionState {
}; };
let _agent_handle = session.register_agent(_agent).await?; let _agent_handle = session.register_agent(_agent).await?;
let mut self_ = Self { let self_ = Self {
_agent_handle, _agent_handle,
_session: session, _session: session,
adapter, adapter,
@ -417,9 +410,8 @@ impl BluerSessionState {
} }
// Note: For some reason, this doesn't actually seem to work so well. it seems unreliable... // Note: For some reason, this doesn't actually seem to work so well. it seems unreliable...
pub(crate) fn process_changes(&mut self) { pub(crate) fn process_changes(&self) {
let tx = self.tx.clone(); let tx = self.tx.clone();
let devices_clone = self.devices.clone();
let adapter_clone = self.adapter.clone(); let adapter_clone = self.adapter.clone();
let _monitor_devices: tokio::task::JoinHandle<Result<(), anyhow::Error>> = let _monitor_devices: tokio::task::JoinHandle<Result<(), anyhow::Error>> =
spawn(async move { spawn(async move {
@ -431,55 +423,10 @@ impl BluerSessionState {
while let Ok(event) = while let Ok(event) =
timeout(Duration::from_millis(milli_timeout), change_stream.next()).await timeout(Duration::from_millis(milli_timeout), change_stream.next()).await
{ {
let event = match event { if event.is_none() {
Some(e) => e, break 'outer;
None => break 'outer, // No more events to receive...
};
let mut devices = devices_clone.lock().await;
match event {
bluer::AdapterEvent::DeviceAdded(address) => {
let device = match adapter_clone.device(address) {
Ok(d) => d,
Err(_) => continue,
};
let status = if device.is_connected().await? {
BluerDeviceStatus::Connected
} else if device.is_paired().await? {
BluerDeviceStatus::Paired
} else {
BluerDeviceStatus::Disconnected
};
if devices.iter().any(|device| device.address == address) {
continue;
};
// only send a DevicesChanged event if we have actually added a device
devices_changed = true;
devices.push(BluerDevice {
name: device
.name()
.await
.unwrap_or_default()
.unwrap_or_default(),
address: device.address(),
status,
properties: Vec::new(),
});
}
bluer::AdapterEvent::DeviceRemoved(address) => {
if let Some(pos) =
devices.iter().position(|device| device.address == address)
{
devices_changed = true;
devices.remove(pos);
};
}
bluer::AdapterEvent::PropertyChanged(_) => {
devices_changed = true;
}
} }
devices_changed = true;
} }
if devices_changed { if devices_changed {
devices_changed = false; devices_changed = false;
@ -496,7 +443,6 @@ impl BluerSessionState {
milli_timeout = (milli_timeout * 2).max(5120); milli_timeout = (milli_timeout * 2).max(5120);
} }
} }
eprintln!("Change stream ended");
Ok(()) Ok(())
}); });
} }