Skip to content

Commit 930c092

Browse files
fix(clippy): collapse nested if statements into let-chains
1 parent 8ff7a3e commit 930c092

2 files changed

Lines changed: 42 additions & 45 deletions

File tree

crates/mt-tauri/src/audio/engine.rs

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -339,35 +339,34 @@ impl AudioEngine {
339339
// Reload track on new stream if one was loaded
340340
if let Some(ref track) = track_info {
341341
let path_obj = Path::new(&track.path);
342-
if path_obj.exists() {
343-
if let Ok(file) = File::open(&track.path) {
344-
if let Ok(source) = Decoder::try_from(file) {
345-
let mixer = self.stream.as_ref().expect("stream just assigned").mixer();
346-
let sink = Sink::connect_new(mixer);
347-
sink.set_volume(self.volume);
348-
sink.append(source);
349-
350-
// Seek to previous position
351-
if position_ms > 0 {
352-
let _ = sink.try_seek(Duration::from_millis(position_ms));
353-
}
354-
355-
if was_playing {
356-
sink.play();
357-
self.state = PlaybackState::Playing;
358-
} else {
359-
sink.pause();
360-
self.state = PlaybackState::Paused;
361-
}
362-
363-
self.player_handle = Some(PlayerHandle { sink });
364-
debug!(
365-
path = %track.path,
366-
position_ms,
367-
"Track reloaded on new device"
368-
);
369-
}
342+
if path_obj.exists()
343+
&& let Ok(file) = File::open(&track.path)
344+
&& let Ok(source) = Decoder::try_from(file)
345+
{
346+
let mixer = self.stream.as_ref().expect("stream just assigned").mixer();
347+
let sink = Sink::connect_new(mixer);
348+
sink.set_volume(self.volume);
349+
sink.append(source);
350+
351+
// Seek to previous position
352+
if position_ms > 0 {
353+
let _ = sink.try_seek(Duration::from_millis(position_ms));
370354
}
355+
356+
if was_playing {
357+
sink.play();
358+
self.state = PlaybackState::Playing;
359+
} else {
360+
sink.pause();
361+
self.state = PlaybackState::Paused;
362+
}
363+
364+
self.player_handle = Some(PlayerHandle { sink });
365+
debug!(
366+
path = %track.path,
367+
position_ms,
368+
"Track reloaded on new device"
369+
);
371370
}
372371
}
373372

crates/mt-tauri/src/commands/audio.rs

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -78,23 +78,21 @@ fn audio_thread(rx: Receiver<AudioCommand>, app: AppHandle) {
7878
};
7979

8080
// Restore saved audio output device from settings
81-
if let Ok(store) = app.store("mt-settings.json") {
82-
if let Some(device_value) = store.get("audio_output_device") {
83-
if let Some(device_name) = device_value.as_str() {
84-
if device_name != "default" {
85-
match engine.set_device(Some(device_name)) {
86-
Ok(()) => {
87-
info!(device = device_name, "Restored saved audio output device");
88-
}
89-
Err(e) => {
90-
warn!(
91-
device = device_name,
92-
error = %e,
93-
"Saved audio device unavailable, using default"
94-
);
95-
}
96-
}
97-
}
81+
if let Ok(store) = app.store("mt-settings.json")
82+
&& let Some(device_value) = store.get("audio_output_device")
83+
&& let Some(device_name) = device_value.as_str()
84+
&& device_name != "default"
85+
{
86+
match engine.set_device(Some(device_name)) {
87+
Ok(()) => {
88+
info!(device = device_name, "Restored saved audio output device");
89+
}
90+
Err(e) => {
91+
warn!(
92+
device = device_name,
93+
error = %e,
94+
"Saved audio device unavailable, using default"
95+
);
9896
}
9997
}
10098
}

0 commit comments

Comments
 (0)