XOR64/xmpd
XOR64/xmpd
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Compare commits

base: XOR64:1b0af636dfc2e5b3f1dcee2a14776925ef235ae4
Branches Tags
XOR64:main
XOR64:legacy
XOR64:ft-dep-dl
XOR64:2.1.3
XOR64:2.1.2
XOR64:2.1.1
XOR64:2.1.0
XOR64:0.0.2b
XOR64:0.0.1b
...
compare: XOR64:2c2f35ff0aad992f88ffd718aea1e4c971c0270a
Branches Tags
XOR64:main
XOR64:legacy
XOR64:ft-dep-dl
XOR64:2.1.3
XOR64:2.1.2
XOR64:2.1.1
XOR64:2.1.0
XOR64:0.0.2b
XOR64:0.0.1b

2 Commits
1b0af636df ... 2c2f35ff0a

Author SHA1 Message Date
MCorange
2c2f35ff0a Fix mixed up placeholders for new song window input boxes 2026-01-11 21:18:04 +02:00
MCorange
2aa0e5a1e8 Change behavour when tool is missing 
Dont die when tool is missing
 2026-01-11 21:17:36 +02:00
3 changed files with 10 additions and 8 deletions
Show Stats Expand all files Collapse all files

4
xmpd-cache/src/lib.rs
View File

@ -55,7 +55,9 @@ impl Cache {
} }
} }
} }
anyhow::bail!("Tool {} was not found", tool_path) // anyhow::bail!("Tool {} was not found", tool_path)
log::error!("Tool {tool_path:?} doesnt exist!");
Ok(())
} }
pub fn init(&mut self) -> Result<Receiver<Message>> { pub fn init(&mut self) -> Result<Receiver<Message>> {
// Check for missing tooling // Check for missing tooling

2
xmpd-gui/src/components/song_list/mod.rs
View File

@ -25,7 +25,7 @@ impl CompUi for SongList {
let mut sl = SongList::get()?; let mut sl = SongList::get()?;
sl.playable_songs = Self::get_playable_songs(&songs)?; sl.playable_songs = Self::get_playable_songs(&songs)?;
if let Some((sid, _)) = songs.first() { if let Some((sid, _)) = songs.first() {
if sl.selected_sid == Default::default() { if sl.selected_sid.eq(&uuid::Uuid::default()) {
sl.selected_sid = (*sid).clone(); sl.selected_sid = (*sid).clone();
} }
} }

12
xmpd-gui/src/windows/new_song.rs
View File

@ -99,8 +99,8 @@ impl Window for NewSongW {
ui.horizontal(|ui| { ui.horizontal(|ui| {
ui.add_space(3.0); ui.add_space(3.0);
if ui.button("Close").clicked() { if ui.button("Close").clicked() {
self.author = String::from("New Song"); self.author = String::from("Unknown");
self.name = String::from("Unknown"); self.name = String::from("New Song");
self.source_t = SourceType::Youtube; self.source_t = SourceType::Youtube;
self.source_url = String::default(); self.source_url = String::default();
state.windows.toggle(&WindowId::NewSong, false); state.windows.toggle(&WindowId::NewSong, false);
@ -112,15 +112,15 @@ impl Window for NewSongW {
s.set_author(&self.author); s.set_author(&self.author);
state.manifest.store_mut().get_songs_mut().insert(uuid::Uuid::new_v4(), s); state.manifest.store_mut().get_songs_mut().insert(uuid::Uuid::new_v4(), s);
self.author = String::from("New Song"); self.author = String::from("Unknown");
self.name = String::from("Unknown"); self.name = String::from("New Song");
self.source_t = SourceType::Youtube; self.source_t = SourceType::Youtube;
self.source_url = String::default(); self.source_url = String::default();
} }
if ui.button("Cancel").clicked() { if ui.button("Cancel").clicked() {
self.author = String::from("New Song"); self.author = String::from("Unknown");
self.name = String::from("Unknown"); self.name = String::from("New Song");
self.source_t = SourceType::Youtube; self.source_t = SourceType::Youtube;
self.source_url = String::default(); self.source_url = String::default();
state.windows.toggle(&WindowId::NewSong, false); state.windows.toggle(&WindowId::NewSong, false);