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

fix: log errors when sending fails instead of panic

Browse source
This commit is contained in:
Ashley Wulber 2024-01-17 11:30:38 -05:00 • committed by Jeremy Soller
parent edc82022d4
commit ea1db02280
1 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

58
cosmic-applet-audio/src/pulse.rs
View file

@ -191,10 +191,14 @@ impl PulseHandle {
None => continue, None => continue,
}; };
match server.get_default_sink() { match server.get_default_sink() {
Ok(sink) => from_pulse_send Ok(sink) => {
.send(Message::SetDefaultSink(sink)) if let Err(err) = from_pulse_send
.await .send(Message::SetDefaultSink(sink))
.unwrap(), .await
{
tracing::error!("ERROR! {:?}", err);
}
}
Err(_) => Self::send_disconnected(&from_pulse_send).await, Err(_) => Self::send_disconnected(&from_pulse_send).await,
} }
} }
@ -204,10 +208,14 @@ impl PulseHandle {
None => continue, None => continue,
}; };
match server.get_default_source() { match server.get_default_source() {
Ok(source) => from_pulse_send Ok(source) => {
.send(Message::SetDefaultSource(source)) if let Err(err) = from_pulse_send
.await .send(Message::SetDefaultSource(source))
.unwrap(), .await
{
tracing::error!("ERROR! {:?}", err);
}
}
Err(e) => { Err(e) => {
tracing::error!("ERROR! {:?}", e); tracing::error!("ERROR! {:?}", e);
Self::send_disconnected(&from_pulse_send).await; Self::send_disconnected(&from_pulse_send).await;
@ -220,10 +228,13 @@ impl PulseHandle {
None => continue, None => continue,
}; };
match server.get_sinks() { match server.get_sinks() {
Ok(sinks) => from_pulse_send Ok(sinks) => {
.send(Message::SetSinks(sinks)) if let Err(err) =
.await from_pulse_send.send(Message::SetSinks(sinks)).await
.unwrap(), {
tracing::error!("ERROR! {:?}", err);
}
}
Err(_) => Self::send_disconnected(&from_pulse_send).await, Err(_) => Self::send_disconnected(&from_pulse_send).await,
} }
} }
@ -233,10 +244,13 @@ impl PulseHandle {
None => continue, None => continue,
}; };
match server.get_sources() { match server.get_sources() {
Ok(sinks) => from_pulse_send Ok(sinks) => {
.send(Message::SetSources(sinks)) if let Err(err) =
.await from_pulse_send.send(Message::SetSources(sinks)).await
.unwrap(), {
tracing::error!("ERROR! {:?}", err);
}
}
Err(_) => Self::send_disconnected(&from_pulse_send).await, Err(_) => Self::send_disconnected(&from_pulse_send).await,
} }
} }
@ -296,10 +310,12 @@ impl PulseHandle {
let to_move = server.get_sink_inputs(default_sink.index); let to_move = server.get_sink_inputs(default_sink.index);
if let Some(name) = device.name.as_ref() { if let Some(name) = device.name.as_ref() {
if server.set_default_sink(name, to_move) { if server.set_default_sink(name, to_move) {
from_pulse_send if let Err(err) = from_pulse_send
.send(Message::SetDefaultSink(device)) .send(Message::SetDefaultSink(device))
.await .await
.unwrap(); {
tracing::error!("ERROR! {:?}", err);
};
} }
} }
} }
@ -315,10 +331,12 @@ impl PulseHandle {
let to_move = server.get_source_outputs(default_source.index); let to_move = server.get_source_outputs(default_source.index);
if let Some(name) = device.name.as_ref() { if let Some(name) = device.name.as_ref() {
if server.set_default_source(name, to_move) { if server.set_default_source(name, to_move) {
from_pulse_send if let Err(err) = from_pulse_send
.send(Message::SetDefaultSource(device)) .send(Message::SetDefaultSource(device))
.await .await
.unwrap(); {
tracing::error!("ERROR! {:?}", err);
};
} }
} }
} }