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

Refactor upload to handle differently formatted search server functions

Browse Source
This commit is contained in:
Connor Wittman 2024-11-22 17:26:59 -05:00
parent f6fb92e361
commit 03889d4efe
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/upload.rs
View File

@ -124,7 +124,7 @@ pub fn Upload(open: RwSignal<bool>) -> impl IntoView {
> >
<ul class="artist_results search-results"> <ul class="artist_results search-results">
{ {
move || filtered_artists.get().iter().enumerate().map(|(_index,filtered_artist)| view! { move || filtered_artists.get().iter().enumerate().map(|(_index,(filtered_artist, _score))| view! {
<Artist artist=filtered_artist.clone() artists=artists set_artists=set_artists set_filtered=set_filtered_artists/> <Artist artist=filtered_artist.clone() artists=artists set_artists=set_artists set_filtered=set_filtered_artists/>
}).collect::<Vec<_>>() }).collect::<Vec<_>>()
} }
@ -142,7 +142,7 @@ pub fn Upload(open: RwSignal<bool>) -> impl IntoView {
> >
<ul class="album_results search-results"> <ul class="album_results search-results">
{ {
move || filtered_albums.get().iter().enumerate().map(|(_index,filtered_album)| view! { move || filtered_albums.get().iter().enumerate().map(|(_index,(filtered_album, _score))| view! {
<Album album=filtered_album.clone() _albums=albums set_albums=set_albums set_filtered=set_filtered_albums/> <Album album=filtered_album.clone() _albums=albums set_albums=set_albums set_filtered=set_filtered_albums/>
}).collect::<Vec<_>>() }).collect::<Vec<_>>()
} }
@ -182,15 +182,15 @@ pub fn Upload(open: RwSignal<bool>) -> impl IntoView {
} }
#[component] #[component]
pub fn Artist(artist: Artist, artists: ReadSignal<String>, set_artists: WriteSignal<String>, set_filtered: WriteSignal<Vec<Artist>>) -> impl IntoView { pub fn Artist(artist: Artist, artists: ReadSignal<String>, set_artists: WriteSignal<String>, set_filtered: WriteSignal<Vec<(Artist, f32)>>) -> impl IntoView {
// Converts artist name to artist id and adds it to the artist input // Converts artist name to artist id and adds it to the artist input
let add_artist = move |_| { let add_artist = move |_| {
//Create an empty string to hold previous artist ids //Create an empty string to hold previous artist ids
let mut s: String = String::from(""); let mut s: String = String::from("");
//Get the current artist input //Get the current artist input
let all_artirts: String = artists.get(); let all_artists: String = artists.get();
//Split the input into a vector of artists separated by commas //Split the input into a vector of artists separated by commas
let mut ids: Vec<&str> = all_artirts.split(",").collect(); let mut ids: Vec<&str> = all_artists.split(",").collect();
//If there is only one artist in the input, get their id equivalent and add it to the string //If there is only one artist in the input, get their id equivalent and add it to the string
if ids.len() == 1 { if ids.len() == 1 {
let value_str = match artist.id.clone() { let value_str = match artist.id.clone() {
@ -227,7 +227,7 @@ pub fn Artist(artist: Artist, artists: ReadSignal<String>, set_artists: WriteSig
} }
} }
#[component] #[component]
pub fn Album(album: Album, _albums: ReadSignal<String>, set_albums: WriteSignal<String>, set_filtered: WriteSignal<Vec<Album>>) -> impl IntoView { pub fn Album(album: Album, _albums: ReadSignal<String>, set_albums: WriteSignal<String>, set_filtered: WriteSignal<Vec<(Album, f32)>>) -> impl IntoView {
//Converts album title to album id to upload a song //Converts album title to album id to upload a song
let add_album = move |_| { let add_album = move |_| {
let value_str = match album.id.clone() { let value_str = match album.id.clone() {