Dangoware/dango-music-player
1
0
Fork 0
mirror of https://github.com/Dangoware/dango-music-player.git synced 2025-05-04 16:52:55 -05:00
Code Issues Projects Releases Packages Wiki Activity

Hacky fix for crashing when advancing the queue rapidly

Browse source
This commit is contained in:
G2-Games 2024-12-27 19:10:28 -06:00
parent 6b3ac348ac
commit 54cdea797e
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dmp-core/src/music_controller/controller.rs
View file

@ -359,7 +359,7 @@ impl Controller {
lib_mail.send(LibraryCommand::AllSongs).await.unwrap(); lib_mail.send(LibraryCommand::AllSongs).await.unwrap();
let LibraryResponse::AllSongs(songs) = lib_mail.recv().await.unwrap() else { let LibraryResponse::AllSongs(songs) = lib_mail.recv().await.unwrap() else {
unreachable!() continue;
}; };
lib_mail.send(LibraryCommand::Song(np_song.song.uuid)).await.unwrap(); lib_mail.send(LibraryCommand::Song(np_song.song.uuid)).await.unwrap();
let LibraryResponse::Song(_, i) = lib_mail.recv().await.unwrap() else { let LibraryResponse::Song(_, i) = lib_mail.recv().await.unwrap() else {

17
src-tauri/src/lib.rs
View file

@ -92,20 +92,23 @@ pub fn run() {
.unwrap() .unwrap()
.to_string(); .to_string();
let bytes = if query.as_str() == "default" { DEFAULT_IMAGE.to_vec() } let bytes = if query.as_str() == "default" {
else { Some(DEFAULT_IMAGE.to_vec())
futures::executor::block_on(async move { } else {futures::executor::block_on(async move {
let controller = ctx.app_handle().state::<ControllerHandle>(); let controller = ctx.app_handle().state::<ControllerHandle>();
controller.lib_mail.send(dmp_core::music_controller::controller::LibraryCommand::Song(Uuid::parse_str(query.as_str()).unwrap())).await.unwrap(); controller.lib_mail.send(dmp_core::music_controller::controller::LibraryCommand::Song(Uuid::parse_str(query.as_str()).unwrap())).await.unwrap();
let LibraryResponse::Song(song, _) = controller.lib_mail.recv().await.unwrap() else { unreachable!() }; let LibraryResponse::Song(song, _) = controller.lib_mail.recv().await.unwrap() else {
song.album_art(0).unwrap_or_else(|_| None).unwrap_or(DEFAULT_IMAGE.to_vec()) return None
};
Some(song.album_art(0).unwrap_or_else(|_| None).unwrap_or(DEFAULT_IMAGE.to_vec()))
})}; })};
res.respond( res.respond(
Response::builder() Response::builder()
.header("Origin", "*") .header("Origin", "*")
.header("Content-Length", bytes.len()) .header("Content-Length", bytes.as_ref().unwrap_or(&vec![]).len())
.status(200) .status(200)
.body(bytes) .body(bytes.unwrap_or_default())
.unwrap() .unwrap()
); );
}) })

2
src-tauri/src/wrappers.rs
View file

@ -55,7 +55,7 @@ pub async fn get_volume(ctrl_handle: State<'_, ControllerHandle>) -> Result<(),
pub async fn next(app: AppHandle<Wry>, ctrl_handle: State<'_, ControllerHandle>) -> Result<(), String> { pub async fn next(app: AppHandle<Wry>, ctrl_handle: State<'_, ControllerHandle>) -> Result<(), String> {
ctrl_handle.player_mail.send(dmp_core::music_controller::controller::PlayerCommand::NextSong).await.unwrap(); ctrl_handle.player_mail.send(dmp_core::music_controller::controller::PlayerCommand::NextSong).await.unwrap();
let PlayerResponse::NowPlaying(song) = ctrl_handle.player_mail.recv().await.unwrap() else { let PlayerResponse::NowPlaying(song) = ctrl_handle.player_mail.recv().await.unwrap() else {
unreachable!() return Ok(())
}; };
println!("next"); println!("next");
app.emit("now_playing_change", _Song::from(&song)).unwrap(); app.emit("now_playing_change", _Song::from(&song)).unwrap();