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

fix(power): connected devices may contain duplicates

Browse source 
It is not valid to have multiple devices with the same device path. When a new
device connection is received, check for an existing `ConnectedDevice` with the
same path and replace it with the new `ConnectedDevice`. Append only if no
match was found.

Closes #1377
This commit is contained in:
Michael Murphy 2025-09-24 14:47:45 +02:00 • committed by GitHub
parent 2984cb0535
commit 667de016bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cosmic-settings/src/pages/power/mod.rs
View file

@ -156,7 +156,7 @@ impl page::Page<crate::pages::Message> for Page {
Ok(stream) => { Ok(stream) => {
let mut stream = std::pin::pin!(stream); let mut stream = std::pin::pin!(stream);
while let Some(device) = stream.next().await { while let Some(device) = stream.next().await {
tracing::info!(device = device.model, "device added"); tracing::debug!(device = device.model, "device added");
emitter.emit(Message::DeviceConnect(device)).await; emitter.emit(Message::DeviceConnect(device)).await;
} }
} }
@ -169,7 +169,7 @@ impl page::Page<crate::pages::Message> for Page {
Ok(stream) => { Ok(stream) => {
let mut stream = std::pin::pin!(stream); let mut stream = std::pin::pin!(stream);
while let Some(device_path) = stream.next().await { while let Some(device_path) = stream.next().await {
tracing::info!(device_path, "device removed"); tracing::debug!(device_path, "device removed");
emitter.emit(Message::DeviceDisconnect(device_path)).await; emitter.emit(Message::DeviceDisconnect(device_path)).await;
} }
} }
@ -259,8 +259,17 @@ impl Page {
Message::DeviceDisconnect(device_path) => self Message::DeviceDisconnect(device_path) => self
.connected_devices .connected_devices
.retain(|device| device.device_path != device_path), .retain(|device| device.device_path != device_path),
Message::DeviceConnect(connected_device) => { Message::DeviceConnect(new_device) => {
self.connected_devices.push(connected_device) // If a connected device already exists at a path, replace it.
if let Some(old) = self
.connected_devices
.iter_mut()
.find(|existing| existing.device_path == new_device.device_path)
{
*old = new_device;
} else {
self.connected_devices.push(new_device)
}
} }
Message::Surface(a) => { Message::Surface(a) => {
return cosmic::task::message(crate::app::Message::Surface(a)); return cosmic::task::message(crate::app::Message::Surface(a));