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

Fix handling of album and song resources in MediaInfo

Browse Source
This commit is contained in:
Connor Wittman 2024-04-12 23:45:14 -04:00
parent aa76a068d6
commit cf07ec2982
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/playbar.rs
View File

@ -236,10 +236,14 @@ fn MediaInfo(status: RwSignal<PlayStatus>) -> impl IntoView {
}); });
let song_artists_resource = create_resource(song_id, move |song_id| async move { let song_artists_resource = create_resource(song_id, move |song_id| async move {
let artists_vec = get_artists(song_id).await.unwrap_or(Vec::new()); if let Some(song_id) = song_id {
// convert the vec of artists to a string of artists separated by commas let artists_vec = get_artists(Some(song_id)).await.map_or(Vec::new(), |artists| artists);
let artists_string = artists_vec.iter().map(|artist| artist.name.clone()).collect::<Vec<String>>().join(", "); // convert the vec of artists to a string of artists separated by commas
artists_string let artists_string = artists_vec.iter().map(|artist| artist.name.clone()).collect::<Vec<String>>().join(", ");
artists_string
} else {
"".into()
}
}); });
let album_id = Signal::derive(move || { let album_id = Signal::derive(move || {
@ -249,9 +253,12 @@ fn MediaInfo(status: RwSignal<PlayStatus>) -> impl IntoView {
}); });
let album_resource = create_resource(album_id, move |album_id| async move { let album_resource = create_resource(album_id, move |album_id| async move {
// get the album name attribute or return "Unknown Album" // get the album name attribute or return ""
let album_name = get_album(album_id).await.map_or("".to_string(), |album| album.title); if let Some(album_id) = album_id {
album_name get_album(Some(album_id)).await.map_or("".into(), |album| album.title)
} else {
"".into()
}
}); });
let image = Signal::derive(move || { let image = Signal::derive(move || {
@ -266,26 +273,26 @@ fn MediaInfo(status: RwSignal<PlayStatus>) -> impl IntoView {
<img class="media-info-img" align="left" src={image}/> <img class="media-info-img" align="left" src={image}/>
<div class="media-info-text"> <div class="media-info-text">
{name} {name}
<br/> <br/>
<Suspense <Suspense
fallback=move || { fallback=move || {
view! {"Loading Artists..."} view! {}
} }
> >
{move || { {move || {
song_artists_resource.get().map(|artists_string| view! { song_artists_resource.get().map_or(view!{{}""}, |artists_string| view! {
<p>{artists_string}</p> {artists_string}" - "
}) })
}} }}
</Suspense> </Suspense>
<Suspense <Suspense
fallback=move || { fallback=move || {
view! {"Loading Album..."} view! {}
} }
> >
{move || { {move || {
album_resource.get().map(|album_name| view! { album_resource.get().map_or(view!{{}""}, |album_name| view! {
<p>{album_name}</p> ""{album_name}
}) })
}} }}
</Suspense> </Suspense>