eta357/LibreTunes-Nix-Test
1
0
Fork 0
Code Pull Requests Actions Activity

Modify queue to only allow delete of upcoming songs

Browse Source
This commit is contained in:
Connor Wittman 2024-02-16 17:34:45 -05:00
parent db2dc3c85a
commit fbc57fd90e
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/queue.rs
View File

@ -1,7 +1,4 @@
use crate::playstatus::PlayStatus; use crate::playstatus::PlayStatus;
use crate::playbar::skip_to;
use crate::playbar::get_song_time_duration;
use crate::playbar::set_playing;
use leptos::ev::MouseEvent; use leptos::ev::MouseEvent;
use leptos::leptos_dom::*; use leptos::leptos_dom::*;
use leptos::*; use leptos::*;
@ -10,24 +7,11 @@ use leptos_icons::BsIcon::*;
const RM_BTN_SIZE: &str = "2rem"; const RM_BTN_SIZE: &str = "2rem";
fn skip_to_next(status: RwSignal<PlayStatus>) {
if let Some(duration) = get_song_time_duration(status) {
skip_to(status, duration.1);
set_playing(status, true);
} else {
error!("Unable to skip forward: Unable to get current duration");
}
}
fn remove_song_fn(index: usize, status: RwSignal<PlayStatus>) { fn remove_song_fn(index: usize, status: RwSignal<PlayStatus>) {
// handle the case when index is 0 (i.e. the first song in the queue is removed)
// if the song is currently playing, skip to the next song
if index == 0 { if index == 0 {
log!("Remove Song from Queue: Song is currently playing, skipping to next song and adding to history"); log!("Error: Trying to remove currently playing song (index 0) from queue");
skip_to_next(status);
} else { } else {
log!("Remove Song from Queue: Song is not currently playing, no need to skip to next song, instead deleting song from queue and not adding to history"); log!("Remove Song from Queue: Song is not currently playing, deleting song from queue and not adding to history");
status.update(|status| { status.update(|status| {
status.queue.remove(index); status.queue.remove(index);
}); });
@ -74,9 +58,15 @@ pub fn Queue(status: RwSignal<PlayStatus>) -> impl IntoView {
.map(|(index, song)| view! { .map(|(index, song)| view! {
<div class="queue-item"> <div class="queue-item">
<Song song_image_path=song.image_path.clone() song_title=song.name.clone() song_artist=song.artist.clone() /> <Song song_image_path=song.image_path.clone() song_title=song.name.clone() song_artist=song.artist.clone() />
<button on:click=move |_| remove_song(index) on:mousedown=prevent_focus> <Show
<Icon class="remove-song" width=RM_BTN_SIZE height=RM_BTN_SIZE icon=Icon::from(BsTrashFill) /> when=move || index != 0
</button> fallback=|| view!{
<p>Playing</p>
}>
<button on:click=move |_| remove_song(index) on:mousedown=prevent_focus>
<Icon class="remove-song" width=RM_BTN_SIZE height=RM_BTN_SIZE icon=Icon::from(BsTrashFill) />
</button>
</Show>
</div> </div>
}) })
.collect::<Vec<_>>()) .collect::<Vec<_>>())