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

Merge pull request 'Implement SongList like/dislike functionality' (#141) from 123-implement-likedislike-for-songs-in-songlist into main

Browse Source 
Reviewed-on: LibreTunes/LibreTunes#141
This commit is contained in:
Ethan Girouard 2024-11-15 21:45:06 +00:00
commit 47fc35814d
1 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/components/song_list.rs
View File

@ -1,6 +1,8 @@
use leptos::*; use leptos::*;
use leptos::logging::*;
use leptos_icons::*; use leptos_icons::*;
use crate::api::songs::*;
use crate::songdata::SongData; use crate::songdata::SongData;
use crate::models::{Album, Artist}; use crate::models::{Album, Artist};
@ -70,7 +72,7 @@ pub fn SongListItem<T>(song: SongData, song_playing: MaybeSignal<bool>, extra: O
<td class="song-list-spacer"></td> <td class="song-list-spacer"></td>
<td class="song-album"><SongAlbum album=song.album /></td> <td class="song-album"><SongAlbum album=song.album /></td>
<td class="song-list-spacer-big"></td> <td class="song-list-spacer-big"></td>
<td class="song-like-dislike"><SongLikeDislike liked disliked/></td> <td class="song-like-dislike"><SongLikeDislike song_id=song.id liked disliked/></td>
<td>{format!("{}:{:02}", song.duration / 60, song.duration % 60)}</td> <td>{format!("{}:{:02}", song.duration / 60, song.duration % 60)}</td>
{extra.map(|extra| view! { {extra.map(|extra| view! {
<td class="song-list-spacer"></td> <td class="song-list-spacer"></td>
@ -135,7 +137,12 @@ fn SongAlbum(album: Option<Album>) -> impl IntoView {
/// Display like and dislike buttons for a song, and indicate if the song is liked or disliked /// Display like and dislike buttons for a song, and indicate if the song is liked or disliked
#[component] #[component]
fn SongLikeDislike(liked: RwSignal<bool>, disliked: RwSignal<bool>) -> impl IntoView { fn SongLikeDislike(
#[prop(into)]
song_id: MaybeSignal<i32>,
liked: RwSignal<bool>,
disliked: RwSignal<bool>) -> impl IntoView
{
let like_icon = Signal::derive(move || { let like_icon = Signal::derive(move || {
if liked.get() { if liked.get() {
icondata::TbThumbUpFilled icondata::TbThumbUpFilled
@ -168,14 +175,48 @@ fn SongLikeDislike(liked: RwSignal<bool>, disliked: RwSignal<bool>) -> impl Into
} }
}); });
// If an error occurs, check the like/dislike status again to ensure consistency
let check_like_dislike = move || {
spawn_local(async move {
match get_like_dislike_song(song_id.get_untracked()).await {
Ok((like, dislike)) => {
liked.set(like);
disliked.set(dislike);
},
Err(_) => {}
}
});
};
let toggle_like = move |_| { let toggle_like = move |_| {
liked.set(!liked.get_untracked()); let new_liked = !liked.get_untracked();
liked.set(new_liked);
disliked.set(disliked.get_untracked() && !liked.get_untracked()); disliked.set(disliked.get_untracked() && !liked.get_untracked());
spawn_local(async move {
match set_like_song(song_id.get_untracked(), new_liked).await {
Ok(_) => {},
Err(e) => {
error!("Error setting like: {}", e);
check_like_dislike();
}
}
});
}; };
let toggle_dislike = move |_| { let toggle_dislike = move |_| {
disliked.set(!disliked.get_untracked()); disliked.set(!disliked.get_untracked());
liked.set(liked.get_untracked() && !disliked.get_untracked()); liked.set(liked.get_untracked() && !disliked.get_untracked());
spawn_local(async move {
match set_dislike_song(song_id.get_untracked(), disliked.get_untracked()).await {
Ok(_) => {},
Err(e) => {
error!("Error setting dislike: {}", e);
check_like_dislike();
}
}
});
}; };
view! { view! {