From 04e0a661221f3cbafeb106996376c0069878f22f Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 12 Apr 2024 17:04:51 -0400 Subject: [PATCH 01/49] Add server_fn crate --- Cargo.lock | 6 ++++-- Cargo.toml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 90dc998..fb9df85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1513,6 +1513,7 @@ dependencies = [ "openssl", "pbkdf2", "serde", + "server_fn", "thiserror", "time", "tokio", @@ -2298,9 +2299,9 @@ dependencies = [ [[package]] name = "server_fn" -version = "0.6.10" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a46a2ffdecb81430ecfb995989218a18b6e94c1ead50cb806b5927c986a8ce" +checksum = "536a5b959673643ee01e59ae41bf01425482c8070dee95d7061ee2d45296b59c" dependencies = [ "axum", "bytes", @@ -2314,6 +2315,7 @@ dependencies = [ "hyper", "inventory", "js-sys", + "multer", "once_cell", "send_wrapper", "serde", diff --git a/Cargo.toml b/Cargo.toml index 4677ca9..d4f43a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,6 +36,7 @@ tower-sessions = { version = "0.11", default-features = false } tower-sessions-redis-store = { version = "0.11", optional = true } async-trait = "0.1.79" axum-login = { version = "0.14.0", optional = true } +server_fn = { version = "0.6.11", features = ["multipart"] } [patch.crates-io] gloo-net = { git = "https://github.com/rustwasm/gloo.git", rev = "a823fab7ecc4068e9a28bd669da5eaf3f0a56380" } From 6bf08b7507f25632214b79f48c5a88041f61a91e Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 19 Apr 2024 09:23:10 -0400 Subject: [PATCH 02/49] Add symphonia crate --- Cargo.lock | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 2 ++ 2 files changed, 64 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index fb9df85..b47c5f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -56,6 +56,12 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + [[package]] name = "async-recursion" version = "1.1.0" @@ -244,6 +250,12 @@ version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +[[package]] +name = "bytemuck" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" + [[package]] name = "byteorder" version = "1.5.0" @@ -1514,6 +1526,7 @@ dependencies = [ "pbkdf2", "serde", "server_fn", + "symphonia", "thiserror", "time", "tokio", @@ -2421,6 +2434,55 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +[[package]] +name = "symphonia" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9" +dependencies = [ + "lazy_static", + "symphonia-bundle-mp3", + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-bundle-mp3" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4" +dependencies = [ + "lazy_static", + "log", + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-core" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3" +dependencies = [ + "arrayvec", + "bitflags 1.3.2", + "bytemuck", + "lazy_static", + "log", +] + +[[package]] +name = "symphonia-metadata" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c" +dependencies = [ + "encoding_rs", + "lazy_static", + "log", + "symphonia-core", +] + [[package]] name = "syn" version = "1.0.109" diff --git a/Cargo.toml b/Cargo.toml index d4f43a8..aab7d94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,6 +37,7 @@ tower-sessions-redis-store = { version = "0.11", optional = true } async-trait = "0.1.79" axum-login = { version = "0.14.0", optional = true } server_fn = { version = "0.6.11", features = ["multipart"] } +symphonia = { version = "0.5.4", default-features = false, features = ["mp3"], optional = true } [patch.crates-io] gloo-net = { git = "https://github.com/rustwasm/gloo.git", rev = "a823fab7ecc4068e9a28bd669da5eaf3f0a56380" } @@ -62,6 +63,7 @@ ssr = [ "tower-http", "tower-sessions-redis-store", "axum-login", + "symphonia", ] # Defines a size-optimized profile for the WASM bundle in release mode From 490772654d0fe85e2cfae4e989017442e22d9853 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 10 May 2024 10:55:26 -0400 Subject: [PATCH 03/49] Add multer crate --- Cargo.lock | 1 + Cargo.toml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index b47c5f2..9939a7f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1522,6 +1522,7 @@ dependencies = [ "leptos_icons", "leptos_meta", "leptos_router", + "multer", "openssl", "pbkdf2", "serde", diff --git a/Cargo.toml b/Cargo.toml index aab7d94..78b142c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,6 +38,7 @@ async-trait = "0.1.79" axum-login = { version = "0.14.0", optional = true } server_fn = { version = "0.6.11", features = ["multipart"] } symphonia = { version = "0.5.4", default-features = false, features = ["mp3"], optional = true } +multer = { version = "3.0.0", optional = true } [patch.crates-io] gloo-net = { git = "https://github.com/rustwasm/gloo.git", rev = "a823fab7ecc4068e9a28bd669da5eaf3f0a56380" } @@ -64,6 +65,7 @@ ssr = [ "tower-sessions-redis-store", "axum-login", "symphonia", + "multer", ] # Defines a size-optimized profile for the WASM bundle in release mode From 3338cc26624ff0294d01fbd7c8e9311da368e687 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 10 May 2024 11:28:11 -0400 Subject: [PATCH 04/49] Add util module --- src/lib.rs | 2 ++ src/util/mod.rs | 0 2 files changed, 2 insertions(+) create mode 100644 src/util/mod.rs diff --git a/src/lib.rs b/src/lib.rs index 89cd04e..e26e2c5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -13,6 +13,8 @@ pub mod users; pub mod search; pub mod fileserv; pub mod error_template; +pub mod util; + use cfg_if::cfg_if; cfg_if! { diff --git a/src/util/mod.rs b/src/util/mod.rs new file mode 100644 index 0000000..e69de29 From 79ba1914152f5d07cd484e777484aaa058f55fbd Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 10 May 2024 11:28:43 -0400 Subject: [PATCH 05/49] Add function to get audio file duration --- src/util/audio.rs | 33 +++++++++++++++++++++++++++++++++ src/util/mod.rs | 7 +++++++ 2 files changed, 40 insertions(+) create mode 100644 src/util/audio.rs diff --git a/src/util/audio.rs b/src/util/audio.rs new file mode 100644 index 0000000..719052f --- /dev/null +++ b/src/util/audio.rs @@ -0,0 +1,33 @@ +use symphonia::core::formats::FormatOptions; +use symphonia::core::io::MediaSourceStream; +use symphonia::core::meta::MetadataOptions; +use symphonia::core::probe::Hint; +use std::fs::File; + +/// Measure the duration (in seconds) of an audio file +pub fn measure_duration(file: File) -> Result> { + let source_stream = MediaSourceStream::new(Box::new(file), Default::default()); + + let hint = Hint::new(); + let format_opts = FormatOptions::default(); + let metadata_opts = MetadataOptions::default(); + + let probe = symphonia::default::get_probe().format(&hint, source_stream, &format_opts, &metadata_opts)?; + let reader = probe.format; + + if reader.tracks().len() != 1 { + return Err(format!("Expected 1 track, found {}", reader.tracks().len()).into()) + } + + let track = &reader.tracks()[0]; + + let time_base = track.codec_params.time_base.ok_or("Missing time base")?; + let duration = track.codec_params.n_frames + .map(|frames| track.codec_params.start_ts + frames) + .ok_or("Missing number of frames")?; + + duration + .checked_mul(time_base.numer as u64) + .and_then(|v| v.checked_div(time_base.denom as u64)) + .ok_or("Overflow while computing duration".into()) +} diff --git a/src/util/mod.rs b/src/util/mod.rs index e69de29..cf7196e 100644 --- a/src/util/mod.rs +++ b/src/util/mod.rs @@ -0,0 +1,7 @@ +use cfg_if::cfg_if; + +cfg_if! { + if #[cfg(feature = "ssr")] { + pub mod audio; + } +} From 5d7ac2bb805c27dce8491458c32796cfffa5c7c9 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 10 May 2024 14:09:24 -0400 Subject: [PATCH 06/49] Add returning codec type to audio util function --- src/util/audio.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/util/audio.rs b/src/util/audio.rs index 719052f..ff7291f 100644 --- a/src/util/audio.rs +++ b/src/util/audio.rs @@ -1,11 +1,13 @@ +use symphonia::core::codecs::CodecType; use symphonia::core::formats::FormatOptions; use symphonia::core::io::MediaSourceStream; use symphonia::core::meta::MetadataOptions; use symphonia::core::probe::Hint; use std::fs::File; -/// Measure the duration (in seconds) of an audio file -pub fn measure_duration(file: File) -> Result> { +/// Extract the codec and duration of an audio file +/// This is combined into one function because the file object will be consumed +pub fn extract_metadata(file: File) -> Result<(CodecType, u64), Box> { let source_stream = MediaSourceStream::new(Box::new(file), Default::default()); let hint = Hint::new(); @@ -26,8 +28,10 @@ pub fn measure_duration(file: File) -> Result> { .map(|frames| track.codec_params.start_ts + frames) .ok_or("Missing number of frames")?; - duration + let duration = duration .checked_mul(time_base.numer as u64) .and_then(|v| v.checked_div(time_base.denom as u64)) - .ok_or("Overflow while computing duration".into()) + .ok_or("Overflow while computing duration")?; + + Ok((track.codec_params.codec, duration)) } From 353a8e3a9ce3303b867ca93c13cf851cafc6afae Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 10 May 2024 14:18:48 -0400 Subject: [PATCH 07/49] Allow finding Artist and Album by primary key --- src/models.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/models.rs b/src/models.rs index 15a6d12..73dbc62 100644 --- a/src/models.rs +++ b/src/models.rs @@ -44,7 +44,7 @@ pub struct User { } /// Model for an artist -#[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable))] +#[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable, Identifiable))] #[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::artists))] #[cfg_attr(feature = "ssr", diesel(check_for_backend(diesel::pg::Pg)))] #[derive(Serialize, Deserialize)] @@ -165,7 +165,7 @@ impl Artist { } /// Model for an album -#[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable))] +#[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable, Identifiable))] #[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::albums))] #[cfg_attr(feature = "ssr", diesel(check_for_backend(diesel::pg::Pg)))] #[derive(Serialize, Deserialize)] From 161ea5f9c20daf38b079dfa0b3fc0fb8dd568655 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 10 May 2024 15:20:57 -0400 Subject: [PATCH 08/49] Implement file upload backend --- src/lib.rs | 1 + src/upload.rs | 274 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 275 insertions(+) create mode 100644 src/upload.rs diff --git a/src/lib.rs b/src/lib.rs index e26e2c5..e7949e3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -13,6 +13,7 @@ pub mod users; pub mod search; pub mod fileserv; pub mod error_template; +pub mod upload; pub mod util; use cfg_if::cfg_if; diff --git a/src/upload.rs b/src/upload.rs new file mode 100644 index 0000000..db3a3e5 --- /dev/null +++ b/src/upload.rs @@ -0,0 +1,274 @@ +use leptos::*; +use server_fn::{codec::{MultipartData, MultipartFormData}, error::NoCustomError}; +use time::Date; + +use cfg_if::cfg_if; + +cfg_if! { + if #[cfg(feature = "ssr")] { + use multer::Field; + use crate::database::get_db_conn; + use diesel::prelude::*; + use log::*; + } +} + +/// Extract the text from a multipart field +#[cfg(feature = "ssr")] +async fn extract_field(field: Field<'static>) -> Result { + let field = match field.text().await { + Ok(field) => field, + Err(e) => Err(ServerFnError::::ServerError(format!("Error reading field: {}", e)))?, + }; + + Ok(field) +} + +/// Validate the artist ids in a multipart field +/// Expects a field with a comma-separated list of artist ids, and ensures each is a valid artist id in the database +#[cfg(feature = "ssr")] +async fn validate_artist_ids(artist_ids: Field<'static>) -> Result, ServerFnError> { + use crate::models::Artist; + use diesel::result::Error::NotFound; + + // Extract the artist id from the field + match artist_ids.text().await { + Ok(artist_ids) => { + let artist_ids = artist_ids.split(','); + + artist_ids.map(|artist_id| { + // Parse the artist id as an integer + if let Ok(artist_id) = artist_id.parse::() { + // Check if the artist exists + let db_con = &mut get_db_conn(); + let artist = crate::schema::artists::dsl::artists.find(artist_id).first::(db_con); + + match artist { + Ok(_) => Ok(artist_id), + Err(NotFound) => Err(ServerFnError:::: + ServerError("Artist does not exist".to_string())), + Err(e) => Err(ServerFnError:::: + ServerError(format!("Error finding artist id: {}", e))), + } + } else { + Err(ServerFnError::::ServerError("Error parsing artist id".to_string())) + } + }).collect() + }, + + Err(e) => Err(ServerFnError::::ServerError(format!("Error reading artist id: {}", e))), + } +} + +/// Validate the album id in a multipart field +/// Expects a field with an album id, and ensures it is a valid album id in the database +#[cfg(feature = "ssr")] +async fn validate_album_id(album_id: Field<'static>) -> Result { + use crate::models::Album; + use diesel::result::Error::NotFound; + + // Extract the album id from the field + match album_id.text().await { + Ok(album_id) => { + // Parse the album id as an integer + if let Ok(album_id) = album_id.parse::() { + // Check if the album exists + let db_con = &mut get_db_conn(); + let album = crate::schema::albums::dsl::albums.find(album_id).first::(db_con); + + match album { + Ok(_) => Ok(album_id), + Err(NotFound) => Err(ServerFnError:::: + ServerError("Album does not exist".to_string())), + Err(e) => Err(ServerFnError:::: + ServerError(format!("Error finding album id: {}", e))), + } + } else { + Err(ServerFnError::::ServerError("Error parsing album id".to_string())) + } + }, + Err(e) => Err(ServerFnError::::ServerError(format!("Error reading album id: {}", e))), + } +} + +/// Validate the track number in a multipart field +/// Expects a field with a track number, and ensures it is a valid track number (non-negative integer) +#[cfg(feature = "ssr")] +async fn validate_track_number(track_number: Field<'static>) -> Result { + match track_number.text().await { + Ok(track_number) => { + if let Ok(track_number) = track_number.parse::() { + if track_number < 0 { + return Err(ServerFnError:::: + ServerError("Track number must be positive or 0".to_string())); + } else { + Ok(track_number) + } + } else { + return Err(ServerFnError::::ServerError("Error parsing track number".to_string())); + } + }, + Err(e) => Err(ServerFnError::::ServerError(format!("Error reading track number: {}", e)))?, + } +} + +/// Validate the release date in a multipart field +/// Expects a field with a release date, and ensures it is a valid date in the format [year]-[month]-[day] +#[cfg(feature = "ssr")] +async fn validate_release_date(release_date: Field<'static>) -> Result { + match release_date.text().await { + Ok(release_date) => { + let date_format = time::macros::format_description!("[year]-[month]-[day]"); + let release_date = Date::parse(&release_date.trim(), date_format); + + match release_date { + Ok(release_date) => Ok(release_date), + Err(_) => Err(ServerFnError::::ServerError("Invalid release date".to_string())), + } + }, + Err(e) => Err(ServerFnError::::ServerError(format!("Error reading release date: {}", e))), + } +} + +/// Handle the file upload form +#[server(input = MultipartFormData, endpoint = "/upload")] +pub async fn upload(data: MultipartData) -> Result<(), ServerFnError> { + // Safe to unwrap - "On the server side, this always returns Some(_). On the client side, always returns None." + let mut data = data.into_inner().unwrap(); + + let mut title = None; + let mut artist_ids = None; + let mut album_id = None; + let mut track = None; + let mut release_date = None; + let mut file_name = None; + let mut duration = None; + + // Fetch the fields from the form data + while let Ok(Some(mut field)) = data.next_field().await { + let name = field.name().unwrap_or_default().to_string(); + + println!("Field name: {}", name); + + match name.as_str() { + "title" => { title = Some(extract_field(field).await?); }, + "artist_ids" => { artist_ids = Some(validate_artist_ids(field).await?); }, + "album_id" => { album_id = Some(validate_album_id(field).await?); }, + "track_number" => { track = Some(validate_track_number(field).await?); }, + "release_date" => { release_date = Some(validate_release_date(field).await?); }, + "file" => { + use symphonia::core::codecs::CODEC_TYPE_MP3; + use crate::util::audio::extract_metadata; + use std::fs::OpenOptions; + use std::io::{Seek, Write}; + + // Some logging is done here where there is high potential for bugs / failures, + // or behavior that we may wish to change in the future + + // Create file name + let title = title.clone().ok_or(ServerFnError:::: + ServerError("Title field required and must precede file field".to_string()))?; + + let clean_title = title.replace(" ", "_").replace("/", "_"); + let date_format = time::macros::format_description!("[year]-[month]-[day]_[hour]:[minute]:[second]"); + let date_str = time::OffsetDateTime::now_utc().format(date_format).unwrap_or_default(); + let upload_path = format!("assets/audio/upload-{}_{}.mp3", date_str, clean_title); + file_name = Some(format!("upload-{}_{}.mp3", date_str, clean_title)); + + debug!("Saving uploaded file {}", upload_path); + + // Save file to disk + // Use these open options to create the file, write to it, then read from it + let mut file = OpenOptions::new() + .read(true) + .write(true) + .create(true) + .open(upload_path.clone())?; + + while let Some(chunk) = field.chunk().await? { + file.write(&chunk)?; + } + + file.flush()?; + + // Rewind the file so the duration can be measured + file.rewind()?; + + // Get the codec and duration of the file + let (file_codec, file_duration) = extract_metadata(file) + .map_err(|e| { + let msg = format!("Error measuring duration of audio file {}: {}", upload_path, e); + warn!("{}", msg); + ServerFnError::::ServerError(msg) + })?; + + if file_codec != CODEC_TYPE_MP3 { + let msg = format!("Invalid uploaded audio file codec: {}", file_codec); + warn!("{}", msg); + return Err(ServerFnError::::ServerError(msg)); + } + + duration = Some(file_duration); + }, + _ => { + warn!("Unknown file upload field: {}", name); + } + } + } + + // Unwrap mandatory fields + let title = title.ok_or(ServerFnError::::ServerError("Missing title".to_string()))?; + let artist_ids = artist_ids.unwrap_or(vec![]); + let file_name = file_name.ok_or(ServerFnError::::ServerError("Missing file".to_string()))?; + let duration = duration.ok_or(ServerFnError::::ServerError("Missing duration".to_string()))?; + let duration = i32::try_from(duration).map_err(|e| ServerFnError:::: + ServerError(format!("Error converting duration to i32: {}", e)))?; + + // Create the song + use crate::models::Song; + let song = Song { + id: None, + title, + album_id, + track, + duration, + release_date, + storage_path: file_name, + image_path: None, + }; + + // Save the song to the database + let db_con = &mut get_db_conn(); + let song = song.insert_into(crate::schema::songs::table) + .get_result::(db_con) + .map_err(|e| { + let msg = format!("Error saving song to database: {}", e); + warn!("{}", msg); + ServerFnError::::ServerError(msg) + })?; + + // Save the song's artists to the database + let song_id = song.id.ok_or_else(|| { + let msg = "Error saving song to database: song id not found after insertion".to_string(); + warn!("{}", msg); + ServerFnError::::ServerError(msg) + })?; + + use crate::schema::song_artists; + use diesel::ExpressionMethods; + + let artist_ids = artist_ids.into_iter().map(|artist_id| { + (song_artists::song_id.eq(song_id), song_artists::artist_id.eq(artist_id)) + }).collect::>(); + + diesel::insert_into(crate::schema::song_artists::table) + .values(&artist_ids) + .execute(db_con) + .map_err(|e| { + let msg = format!("Error saving song artists to database: {}", e); + warn!("{}", msg); + ServerFnError::::ServerError(msg) + })?; + + Ok(()) +} From 7abfbaf60033c9092d29a4e741491d48a5e8f73f Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 10 May 2024 15:25:57 -0400 Subject: [PATCH 09/49] Fix unused imports --- src/upload.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/upload.rs b/src/upload.rs index db3a3e5..b3c48b7 100644 --- a/src/upload.rs +++ b/src/upload.rs @@ -1,6 +1,5 @@ use leptos::*; -use server_fn::{codec::{MultipartData, MultipartFormData}, error::NoCustomError}; -use time::Date; +use server_fn::codec::{MultipartData, MultipartFormData}; use cfg_if::cfg_if; @@ -10,6 +9,8 @@ cfg_if! { use crate::database::get_db_conn; use diesel::prelude::*; use log::*; + use server_fn::error::NoCustomError; + use time::Date; } } From 8a959d530d85be3024a888a18f7522fbacff100a Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 10 May 2024 15:51:26 -0400 Subject: [PATCH 10/49] Implement basic upload dialog --- src/app.rs | 6 ++- src/components.rs | 3 +- src/components/sidebar.rs | 8 +++- src/components/upload.rs | 86 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 src/components/upload.rs diff --git a/src/app.rs b/src/app.rs index 946b4c2..9fbbf2d 100644 --- a/src/app.rs +++ b/src/app.rs @@ -46,18 +46,20 @@ use crate::components::sidebar::*; use crate::components::dashboard::*; use crate::components::search::*; use crate::components::personal::*; +use crate::components::upload::*; /// Renders the home page of your application. #[component] fn HomePage() -> impl IntoView { let play_status = PlayStatus::default(); let play_status = create_rw_signal(play_status); - + let upload_open = create_rw_signal(false); let (dashboard_open, set_dashboard_open) = create_signal(true); view! {
- + + } diff --git a/src/components.rs b/src/components.rs index 4d0c8a5..ede9b31 100644 --- a/src/components.rs +++ b/src/components.rs @@ -1,4 +1,5 @@ pub mod sidebar; pub mod dashboard; pub mod search; -pub mod personal; \ No newline at end of file +pub mod personal; +pub mod upload; diff --git a/src/components/sidebar.rs b/src/components/sidebar.rs index 805fa4e..9f8fff3 100644 --- a/src/components/sidebar.rs +++ b/src/components/sidebar.rs @@ -1,9 +1,10 @@ use leptos::leptos_dom::*; use leptos::*; use leptos_icons::*; +use crate::components::upload::*; #[component] -pub fn Sidebar(setter: WriteSignal, active: ReadSignal) -> impl IntoView { +pub fn Sidebar(setter: WriteSignal, active: ReadSignal, upload_open: RwSignal) -> impl IntoView { let open_dashboard = move |_| { setter.update(|value| *value = true); log!("open dashboard"); @@ -16,7 +17,10 @@ pub fn Sidebar(setter: WriteSignal, active: ReadSignal) -> impl Into view! {
-

LibreTunes

+
+

LibreTunes

+ +

Dashboard

diff --git a/src/components/upload.rs b/src/components/upload.rs new file mode 100644 index 0000000..971a9fc --- /dev/null +++ b/src/components/upload.rs @@ -0,0 +1,86 @@ +use leptos::leptos_dom::*; +use leptos::*; +use leptos_icons::*; +use leptos_router::Form; + +#[component] +pub fn UploadBtn(dialog_open: RwSignal) -> impl IntoView { + let open_dialog = move |_| { + dialog_open.set(true); + }; + + view! { + + } +} + +#[component] +pub fn Upload(open: RwSignal) -> impl IntoView { + let close_dialog = move |ev: leptos::ev::MouseEvent| { + ev.prevent_default(); + open.set(false); + }; + + let click_cancel_bubble = move |ev: leptos::ev::MouseEvent| { + ev.prevent_default(); + ev.stop_propagation(); + }; + + view! { + +
+ +
+ +

Upload Song

+
+ +
+
+ + Title + +
+ +
+ + Artist + +
+ +
+ + Album + +
+ +
+ + Track Number + +
+ +
+ + Release Date + +
+ +
+ + File + +
+ + +
+ +
+ + } +} From ff43b3f7e84380b0c2ccfa8d03c95a1084e6728c Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sun, 12 May 2024 11:00:47 -0400 Subject: [PATCH 11/49] Use nested routing for navigation Remove dashboard_open signal Use tags to navigate to new pages Add dashboard and search to nested routing --- src/app.rs | 26 ++++++++++++-------------- src/components/sidebar.rs | 28 +++++++++++++++------------- style/sidebar.scss | 1 + 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/src/app.rs b/src/app.rs index 946b4c2..c7b7fe4 100644 --- a/src/app.rs +++ b/src/app.rs @@ -14,6 +14,9 @@ pub fn App() -> impl IntoView { // Provides context that manages stylesheets, titles, meta tags, etc. provide_meta_context(); + let play_status = PlayStatus::default(); + let play_status = create_rw_signal(play_status); + view! { // injects a stylesheet into the document // id=leptos means cargo-leptos will hot-reload this stylesheet @@ -33,7 +36,11 @@ pub fn App() -> impl IntoView { }>
- + }> + + + + @@ -49,21 +56,12 @@ use crate::components::personal::*; /// Renders the home page of your application. #[component] -fn HomePage() -> impl IntoView { - let play_status = PlayStatus::default(); - let play_status = create_rw_signal(play_status); - - let (dashboard_open, set_dashboard_open) = create_signal(true); - +fn HomePage(play_status: RwSignal) -> impl IntoView { view! {
- - } - > - - + + // This will render the child route components + diff --git a/src/components/sidebar.rs b/src/components/sidebar.rs index 805fa4e..0621704 100644 --- a/src/components/sidebar.rs +++ b/src/components/sidebar.rs @@ -3,28 +3,30 @@ use leptos::*; use leptos_icons::*; #[component] -pub fn Sidebar(setter: WriteSignal, active: ReadSignal) -> impl IntoView { - let open_dashboard = move |_| { - setter.update(|value| *value = true); - log!("open dashboard"); - }; - let open_search = move |_| { - setter.update(|value| *value = false); - log!("open search"); - }; +pub fn Sidebar() -> impl IntoView { + use leptos_router::use_location; + let location = use_location(); + + let on_dashboard = Signal::derive( + move || location.pathname.get().starts_with("/dashboard") || location.pathname.get() == "/", + ); + + let on_search = Signal::derive( + move || location.pathname.get().starts_with("/search"), + ); view! {

LibreTunes

-
+

Dashboard

-
-
+ +

Search

-
+
diff --git a/style/sidebar.scss b/style/sidebar.scss index 2eb8c72..e101fc4 100644 --- a/style/sidebar.scss +++ b/style/sidebar.scss @@ -25,6 +25,7 @@ transition: all 0.5s; cursor: pointer; color: grey; + text-decoration: none; } .sidebar-top-container .buttons:hover { color: white; From 714fbc596a6f88431a8586b18ad39d87d95c0388 Mon Sep 17 00:00:00 2001 From: dannyzou18 Date: Sun, 12 May 2024 23:56:59 -0700 Subject: [PATCH 12/49] styled upload form --- src/components/sidebar.rs | 6 +- src/components/upload.rs | 76 +++++++++----------- style/main.scss | 1 + style/sidebar.scss | 146 ++++++++++++++++++++++---------------- style/upload.scss | 145 +++++++++++++++++++++++++++++++++++++ 5 files changed, 267 insertions(+), 107 deletions(-) create mode 100644 style/upload.scss diff --git a/src/components/sidebar.rs b/src/components/sidebar.rs index 9f8fff3..710d634 100644 --- a/src/components/sidebar.rs +++ b/src/components/sidebar.rs @@ -17,10 +17,8 @@ pub fn Sidebar(setter: WriteSignal, active: ReadSignal, upload_open: view! {
-
-

LibreTunes

- -
+

LibreTunes

+

Dashboard

diff --git a/src/components/upload.rs b/src/components/upload.rs index 971a9fc..71c1a61 100644 --- a/src/components/upload.rs +++ b/src/components/upload.rs @@ -33,53 +33,45 @@ pub fn Upload(open: RwSignal) -> impl IntoView { view! { -
- -
- -

Upload Song

+
+
+
+

Upload Song

+
+
+ +
+ + Title +
+
+ + Artists +
+
+ + Album ID +
+
+ + Track Number
- -
- - Title - +
+
+ Release + Date
+ +
-
- - Artist - -
+
+ File + +
-
- - Album - -
- -
- - Track Number - -
- -
- - Release Date - -
- -
- - File - -
- - - -
+ +
} diff --git a/style/main.scss b/style/main.scss index 7793e25..de15da6 100644 --- a/style/main.scss +++ b/style/main.scss @@ -8,6 +8,7 @@ @import 'home.scss'; @import 'search.scss'; @import 'personal.scss'; +@import 'upload.scss'; body { font-family: sans-serif; diff --git a/style/sidebar.scss b/style/sidebar.scss index 2eb8c72..b818a58 100644 --- a/style/sidebar.scss +++ b/style/sidebar.scss @@ -4,67 +4,20 @@ background-color: transparent; width: 22rem; height: calc(100% - 75px); -} - -.sidebar-top-container { - border-radius: 1rem; - background-color: #1c1c1c; - height: 9rem; - margin: 3px; - padding: 0.1rem 1rem 1rem 1rem; -} - -.sidebar-top-container .header { - font-size: 1.2rem; -} -.sidebar-top-container .buttons { - display: flex; - flex-direction: row; - font-size: 1.8rem; - align-items: center; - transition: all 0.5s; - cursor: pointer; - color: grey; -} -.sidebar-top-container .buttons:hover { - color: white; -} - -.sidebar-top-container .buttons:last-child { - margin-left: 0.02rem; - margin-top: 0.5rem; -} - -.sidebar-top-container h1 { - font-size: 0.95rem; - margin-left: 0.9rem; - font-weight: 400; - font-style: $standard-font; - letter-spacing: 0.5px; -} - -.sidebar-bottom-container { - border-radius: 1rem; - background-color: #1c1c1c; - margin: 3px; - margin-top: 6px; - padding: 0.2rem 1rem 1rem 1rem; - height: calc(100% - 9rem); - - .heading { - display: flex; - flex-direction: row; - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - + .sidebar-top-container { + border-radius: 1rem; + background-color: #1c1c1c; + height: 9rem; + margin: 3px; + padding: 0.1rem 1rem 1rem 1rem; + position: relative; .header { font-size: 1.2rem; - font-weight: 200; } - - .add-playlist { + .upload-btn { + position: absolute; + top: 10px; + right: 7px; display: flex; flex-direction: row; align-items: center; @@ -73,8 +26,8 @@ border-radius: 50px; border: none; height: 2.2rem; - padding-right: 2rem; - padding-left: 2rem; + padding-right: 1rem; + padding-left: 1rem; cursor: pointer; transition: background-color 0.3s ease; .add-sign { @@ -84,8 +37,79 @@ color: white; } } - .add-playlist:hover { + .upload-btn:hover { background-color: #9e9e9e; } + .buttons { + display: flex; + flex-direction: row; + font-size: 1.8rem; + align-items: center; + transition: all 0.5s; + cursor: pointer; + color: grey; + } + .buttons:hover { + color: white; + } + .buttons:last-child { + margin-left: 0.02rem; + margin-top: 0.5rem; + } + h1 { + font-size: 0.95rem; + margin-left: 0.9rem; + font-weight: 400; + font-style: $standard-font; + letter-spacing: 0.5px; + } } + .sidebar-bottom-container { + border-radius: 1rem; + background-color: #1c1c1c; + margin: 3px; + margin-top: 6px; + padding: 0.2rem 1rem 1rem 1rem; + height: calc(100% - 9rem); + + .heading { + display: flex; + flex-direction: row; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + + .header { + font-size: 1.2rem; + font-weight: 200; + } + + .add-playlist { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + font-size: 0.9rem; + border-radius: 50px; + border: none; + height: 2.2rem; + padding-right: 2rem; + padding-left: 2rem; + cursor: pointer; + transition: background-color 0.3s ease; + .add-sign { + font-size: 1.5rem; + margin-top: auto; + margin-right: 5px; + color: white; + } + } + .add-playlist:hover { + background-color: #9e9e9e; + } + } + } } + + diff --git a/style/upload.scss b/style/upload.scss new file mode 100644 index 0000000..eeab46a --- /dev/null +++ b/style/upload.scss @@ -0,0 +1,145 @@ +@import "theme.scss"; + +.upload-container { + position: fixed; + top: 45%; + left: 50%; + transform: translate(-50%, -50%); + width: 30rem; + height: 30rem; + border: 1px solid white; + border-radius: 5px; + padding: 1rem; + padding-top: 0; + z-index: 2; + display: flex; + flex-direction: column; + background-color: #1c1c1c; + .close-button { + position: absolute; + top: 5px; + right: 5px; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; + border-radius: 50%; + font-size: 1.6rem; + transition: all 0.3s; + border: none; + + } + + .close-button:hover { + transform: scale(1.1); + background-color: rgba(255, 255, 255, 0.1); + } + .close-button:active { + transform: scale(0.8); + } + .upload-header { + font-size: .7rem; + font-weight: 300; + padding-bottom: 0; + border-bottom: 1px solid white; + font-family: "Roboto", sans-serif; + } + .upload-form { + padding: .1rem; + display: flex; + flex-direction: column; + .input-bx{ + margin-top: 1rem; + position: relative; + width: 300px; + input{ + width: 100%; + padding: 10px; + border: 2px solid #7f8fa6; + border-radius: 5px; + outline: none; + font-size: 1rem; + transition: 0.6s; + background-color: transparent; + } + span{ + position: absolute; + left: 0; + top: 1px; + padding: 10px; + font-size: 1rem; + color: #7f8fa6; + text-transform: uppercase; + pointer-events: none; + transition: 0.6s; + background-color: transparent; + } + input:valid ~ span, + input:focus ~ span{ + color: #fff; + transform: translateX(10px) translateY(-7px); + font-size: 0.65rem; + font-weight: 600; + padding: 0 10px; + background: #1c1c1c; + letter-spacing: 0.1rem; + } + input:valid, + input:focus{ + color: #fff; + border: 2px solid #fff; + } + } + .release-date { + margin-top: 1rem; + font-size: 1.2rem; + color: #7f8fa6; + font-family: "Roboto", sans-serif; + display: flex; + align-items: center; + .left { + display: flex; + flex-direction: column; + margin-left: 5px; + margin-right: 10px; + } + span { + font-size: .85rem; + } + input { + padding: 8px; + } + } + .file { + margin-top: .5rem; + display: flex; + align-items: center; + span { + font-size: .9rem; + color: #7f8fa6; + font-family: "Roboto", sans-serif; + margin-left: 5px; + margin-right: 10px; + } + input { + padding: 10px; + } + } + .upload-button { + margin-top: 1rem; + padding: 10px; + background-color: #7f8fa6; + color: #fff; + font-size: 1rem; + font-family: "Roboto", sans-serif; + border: none; + border-radius: 5px; + cursor: pointer; + transition: 0.3s; + &:hover { + background-color: #fff; + color: #7f8fa6; + } + } + } +} \ No newline at end of file From 5775d3148bba35728dd4a1204e7c2cc42cea3967 Mon Sep 17 00:00:00 2001 From: dannyzou18 Date: Thu, 16 May 2024 15:44:13 -0400 Subject: [PATCH 13/49] finished upload design --- src/components/upload.rs | 53 ++++++++++++++++++++++++++++++++++------ src/models.rs | 2 +- style/upload.scss | 26 ++++++++++++++++++++ 3 files changed, 73 insertions(+), 8 deletions(-) diff --git a/src/components/upload.rs b/src/components/upload.rs index 71c1a61..40c74e1 100644 --- a/src/components/upload.rs +++ b/src/components/upload.rs @@ -2,6 +2,7 @@ use leptos::leptos_dom::*; use leptos::*; use leptos_icons::*; use leptos_router::Form; +use crate::search::search_artists; #[component] pub fn UploadBtn(dialog_open: RwSignal) -> impl IntoView { @@ -21,16 +22,34 @@ pub fn UploadBtn(dialog_open: RwSignal) -> impl IntoView { #[component] pub fn Upload(open: RwSignal) -> impl IntoView { + let (artists_search, set_artists_search) = create_signal("".to_string()); + let (filtered_artists, set_filtered_artists) = create_signal(vec![]); let close_dialog = move |ev: leptos::ev::MouseEvent| { ev.prevent_default(); open.set(false); }; - - let click_cancel_bubble = move |ev: leptos::ev::MouseEvent| { + // let click_cancel_bubble = move |ev: leptos::ev::MouseEvent| { + // ev.prevent_default(); + // ev.stop_propagation(); + // }; + let handle_filter = move |ev: leptos::ev::Event| { ev.prevent_default(); - ev.stop_propagation(); - }; + let searchArtist = event_target_value(&ev); + log!("searchArtist: {:?}", searchArtist); + set_artists_search.update(|value| *value = searchArtist); + spawn_local(async move { + let filter_results = search_artists(artists_search.get_untracked(), 3).await; + if let Err(err) = filter_results { + log!("Error filtering artists: {:?}", err); + } else if let Ok(artists) = filter_results { + log!("Filtered artists: {:?}", artists); + + set_filtered_artists.update(|value| *value = artists); + } + }) + + }; view! {
@@ -44,10 +63,30 @@ pub fn Upload(open: RwSignal) -> impl IntoView { Title
-
- - Artists + +
+
+ + Artists +
+ 0} + fallback=move || view! {} + > +
    + { + move || filtered_artists.get().iter().enumerate().map(|(_index,filtered_artist)| view! { +
    + {filtered_artist.clone().name} +
    + }).collect::>() + } +
+ + +
+
Album ID diff --git a/src/models.rs b/src/models.rs index 73dbc62..ad5cc6c 100644 --- a/src/models.rs +++ b/src/models.rs @@ -47,7 +47,7 @@ pub struct User { #[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable, Identifiable))] #[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::artists))] #[cfg_attr(feature = "ssr", diesel(check_for_backend(diesel::pg::Pg)))] -#[derive(Serialize, Deserialize)] +#[derive(Serialize, Deserialize, Clone, Debug)] pub struct Artist { /// A unique id for the artist #[cfg_attr(feature = "ssr", diesel(deserialize_as = i32))] diff --git a/style/upload.scss b/style/upload.scss index eeab46a..65f8d6c 100644 --- a/style/upload.scss +++ b/style/upload.scss @@ -141,5 +141,31 @@ color: #7f8fa6; } } + .artists { + position: relative; + width: 325px; + .input-bx { + + } + .artist_results { + display: flex; + flex-direction: column; + border: 1px solid white; + width: 100%; + position: absolute; + top: 75%; + background-color: #1c1c1c; + z-index: 2; + border-radius: 5px; + padding: 0; + .artist { + border-bottom: 1px solid white; + padding: 10px; + } + .artist:last-child { + border-bottom: none; + } + } + } } } \ No newline at end of file From cc4aee4ab49f060d9f427a7615dc9163a8f5c1b3 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Thu, 16 May 2024 18:13:14 -0400 Subject: [PATCH 14/49] Add image_path column to albums table --- migrations/2024-05-16-220659_add_album_images/down.sql | 1 + migrations/2024-05-16-220659_add_album_images/up.sql | 1 + src/models.rs | 2 ++ src/schema.rs | 1 + 4 files changed, 5 insertions(+) create mode 100644 migrations/2024-05-16-220659_add_album_images/down.sql create mode 100644 migrations/2024-05-16-220659_add_album_images/up.sql diff --git a/migrations/2024-05-16-220659_add_album_images/down.sql b/migrations/2024-05-16-220659_add_album_images/down.sql new file mode 100644 index 0000000..118e9b5 --- /dev/null +++ b/migrations/2024-05-16-220659_add_album_images/down.sql @@ -0,0 +1 @@ +ALTER TABLE albums DROP COLUMN image_path; diff --git a/migrations/2024-05-16-220659_add_album_images/up.sql b/migrations/2024-05-16-220659_add_album_images/up.sql new file mode 100644 index 0000000..b9f26dc --- /dev/null +++ b/migrations/2024-05-16-220659_add_album_images/up.sql @@ -0,0 +1 @@ +ALTER TABLE albums ADD COLUMN image_path VARCHAR; diff --git a/src/models.rs b/src/models.rs index 15a6d12..8aaec04 100644 --- a/src/models.rs +++ b/src/models.rs @@ -177,6 +177,8 @@ pub struct Album { pub title: String, /// The album's release date pub release_date: Option, + /// The path to the album's image file + pub image_path: Option, } impl Album { diff --git a/src/schema.rs b/src/schema.rs index b98d736..97de324 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -12,6 +12,7 @@ diesel::table! { id -> Int4, title -> Varchar, release_date -> Nullable, + image_path -> Nullable, } } From 955fc8441285c41ea4b41b97d81d065702e0ebf2 Mon Sep 17 00:00:00 2001 From: dannyzou18 Date: Thu, 16 May 2024 18:35:02 -0400 Subject: [PATCH 15/49] allow choosing artists by searching for upload --- src/components/upload.rs | 86 ++++++++++++++++++++++++++++++---------- style/upload.scss | 5 +++ 2 files changed, 69 insertions(+), 22 deletions(-) diff --git a/src/components/upload.rs b/src/components/upload.rs index 40c74e1..8e35c4b 100644 --- a/src/components/upload.rs +++ b/src/components/upload.rs @@ -3,6 +3,7 @@ use leptos::*; use leptos_icons::*; use leptos_router::Form; use crate::search::search_artists; +use crate::models::Artist; #[component] pub fn UploadBtn(dialog_open: RwSignal) -> impl IntoView { @@ -22,24 +23,29 @@ pub fn UploadBtn(dialog_open: RwSignal) -> impl IntoView { #[component] pub fn Upload(open: RwSignal) -> impl IntoView { - let (artists_search, set_artists_search) = create_signal("".to_string()); + // Create signals for the artist input and the filtered artists + let (artists, set_artists) = create_signal("".to_string()); let (filtered_artists, set_filtered_artists) = create_signal(vec![]); + let close_dialog = move |ev: leptos::ev::MouseEvent| { ev.prevent_default(); open.set(false); }; - // let click_cancel_bubble = move |ev: leptos::ev::MouseEvent| { - // ev.prevent_default(); - // ev.stop_propagation(); - // }; + // Create a filter function to handle filtering artists let handle_filter = move |ev: leptos::ev::Event| { ev.prevent_default(); - let searchArtist = event_target_value(&ev); - log!("searchArtist: {:?}", searchArtist); - set_artists_search.update(|value| *value = searchArtist); + + let artist_input: String = event_target_value(&ev); + + //Get the artist that we are currently searching for + let mut all_artists: Vec<&str> = artist_input.split(",").collect(); + let search = all_artists.pop().unwrap().to_string(); + + //Update the artist signal with the input + set_artists.update(|value: &mut String| *value = artist_input); spawn_local(async move { - let filter_results = search_artists(artists_search.get_untracked(), 3).await; + let filter_results = search_artists(search, 3).await; if let Err(err) = filter_results { log!("Error filtering artists: {:?}", err); } else if let Ok(artists) = filter_results { @@ -48,7 +54,6 @@ pub fn Upload(open: RwSignal) -> impl IntoView { set_filtered_artists.update(|value| *value = artists); } }) - }; view! { @@ -58,15 +63,13 @@ pub fn Upload(open: RwSignal) -> impl IntoView {

Upload Song

-
Title
-
- + Artists
) -> impl IntoView {
    { move || filtered_artists.get().iter().enumerate().map(|(_index,filtered_artist)| view! { -
    - {filtered_artist.clone().name} -
    + }).collect::>() }
- -
-
Album ID @@ -95,7 +93,6 @@ pub fn Upload(open: RwSignal) -> impl IntoView { Track Number
-
Release @@ -103,15 +100,60 @@ pub fn Upload(open: RwSignal) -> impl IntoView {
-
File
-
} } + +#[component] +pub fn Artist(artist: Artist, artists: ReadSignal, set_artists: WriteSignal, set_filtered: WriteSignal>) -> impl IntoView { + + // Create a function to add an artist to the artist input + let add_artist = move |_| { + //Create an empty string to hold the artist ids + let mut s: String = String::from(""); + //Get the current value of the artist input + let all_artirts: String = artists.get(); + //Split the input into a vector of artists separated by commas + let mut ids: Vec<&str> = all_artirts.split(",").collect(); + //If there is only one artist in the input, get their id equivalent and add it to the string + if ids.len() == 1 { + let value_str = match artist.id.clone() { + Some(v) => v.to_string(), + None => String::from("None"), + }; + s.push_str(&value_str); + s.push_str(","); + set_artists.update(|value| *value = s); + //If there are multiple artists in the input, pop the last artist by string off the vector, + //get their id equivalent, and add it to the string + } else { + ids.pop(); + for id in ids { + s.push_str(id); + s.push_str(","); + } + let value_str = match artist.id.clone() { + Some(v) => v.to_string(), + None => String::from("None"), + }; + s.push_str(&value_str); + s.push_str(","); + set_artists.update(|value| *value = s); + } + //Clear the search results + set_filtered.update(|value| *value = vec![]); + }; + + view! { +
+ {artist.name.clone()} +
+ } +} \ No newline at end of file diff --git a/style/upload.scss b/style/upload.scss index 65f8d6c..b84920b 100644 --- a/style/upload.scss +++ b/style/upload.scss @@ -161,6 +161,11 @@ .artist { border-bottom: 1px solid white; padding: 10px; + cursor: pointer; + transition: 0.3s; + &:hover { + background-color: #7f8fa6; + } } .artist:last-child { border-bottom: none; From 78d8e1243d2c65bf660868742bac323c858ecfbc Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Thu, 16 May 2024 18:42:03 -0400 Subject: [PATCH 16/49] Remove csr feature --- Cargo.toml | 1 - src/main.rs | 17 +---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 52ad1ad..a21b408 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,6 @@ flexi_logger = { version = "0.28.0", optional = true, default-features = false } gloo-net = { git = "https://github.com/rustwasm/gloo.git", rev = "a823fab7ecc4068e9a28bd669da5eaf3f0a56380" } [features] -csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"] hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"] ssr = [ "dep:leptos_axum", diff --git a/src/main.rs b/src/main.rs index e647089..d0eed6f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -72,24 +72,9 @@ async fn main() { axum::serve(listener, app.into_make_service()).await.expect("Server failed"); } -#[cfg(not(any(feature = "ssr", feature = "csr")))] +#[cfg(not(feature = "ssr"))] pub fn main() { // no client-side main function // unless we want this to work with e.g., Trunk for pure client-side testing // see lib.rs for hydration function instead - // see optional feature `csr` instead -} - -#[cfg(all(not(feature = "ssr"), feature = "csr"))] -pub fn main() { - // a client-side main function is required for using `trunk serve` - // prefer using `cargo leptos serve` instead - // to run: `trunk serve --open --features csr` - use leptos::*; - use libretunes::app::*; - use wasm_bindgen::prelude::wasm_bindgen; - - console_error_panic_hook::set_once(); - - leptos::mount_to_body(App); } From 618b7d65ce138b9cf97bc1447351b75b348b4fa3 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Thu, 16 May 2024 18:47:45 -0400 Subject: [PATCH 17/49] Make console_error_panic_hook required for frontend only --- Cargo.toml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a21b408..cb8443e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ build = "src/build.rs" crate-type = ["cdylib", "rlib"] [dependencies] -console_error_panic_hook = "0.1" +console_error_panic_hook = { version = "0.1", optional = true } cfg-if = "1" http = "1.0" leptos = { version = "0.6", features = ["nightly"] } @@ -43,7 +43,12 @@ flexi_logger = { version = "0.28.0", optional = true, default-features = false } gloo-net = { git = "https://github.com/rustwasm/gloo.git", rev = "a823fab7ecc4068e9a28bd669da5eaf3f0a56380" } [features] -hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"] +hydrate = [ + "leptos/hydrate", + "leptos_meta/hydrate", + "leptos_router/hydrate", + "console_error_panic_hook", +] ssr = [ "dep:leptos_axum", "leptos/ssr", From 893c411c7ff3edcdba45c1dea6e6339afc14dc45 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Thu, 16 May 2024 18:50:44 -0400 Subject: [PATCH 18/49] Disable default features in http crate --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index cb8443e..7ff3e02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] console_error_panic_hook = { version = "0.1", optional = true } cfg-if = "1" -http = "1.0" +http = { version = "1.0", default-features = false } leptos = { version = "0.6", features = ["nightly"] } leptos_meta = { version = "0.6", features = ["nightly"] } leptos_axum = { version = "0.6", optional = true } From 94d62ea2d566f9fec0e3a8fbab20a5d6f4144ea2 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Thu, 16 May 2024 18:53:58 -0400 Subject: [PATCH 19/49] Disable default features in leptos crate --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 7ff3e02..13a0c02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib", "rlib"] console_error_panic_hook = { version = "0.1", optional = true } cfg-if = "1" http = { version = "1.0", default-features = false } -leptos = { version = "0.6", features = ["nightly"] } +leptos = { version = "0.6", default-features = false, features = ["nightly"] } leptos_meta = { version = "0.6", features = ["nightly"] } leptos_axum = { version = "0.6", optional = true } leptos_router = { version = "0.6", features = ["nightly"] } From caefc46fcc0db8b1732cb7fa352f5cf17e82d905 Mon Sep 17 00:00:00 2001 From: dannyzou18 Date: Thu, 16 May 2024 18:59:16 -0400 Subject: [PATCH 20/49] added album search feature for upload --- src/components/upload.rs | 81 ++++++++++++++++++++++++++++++++++------ src/models.rs | 2 +- style/upload.scss | 11 ++---- 3 files changed, 74 insertions(+), 20 deletions(-) diff --git a/src/components/upload.rs b/src/components/upload.rs index 8e35c4b..88612d5 100644 --- a/src/components/upload.rs +++ b/src/components/upload.rs @@ -3,7 +3,9 @@ use leptos::*; use leptos_icons::*; use leptos_router::Form; use crate::search::search_artists; +use crate::search::search_albums; use crate::models::Artist; +use crate::models::Album; #[component] pub fn UploadBtn(dialog_open: RwSignal) -> impl IntoView { @@ -27,12 +29,16 @@ pub fn Upload(open: RwSignal) -> impl IntoView { let (artists, set_artists) = create_signal("".to_string()); let (filtered_artists, set_filtered_artists) = create_signal(vec![]); + let (albums, set_albums) = create_signal("".to_string()); + let (filtered_albums, set_filtered_albums) = create_signal(vec![]); + let close_dialog = move |ev: leptos::ev::MouseEvent| { ev.prevent_default(); open.set(false); }; // Create a filter function to handle filtering artists - let handle_filter = move |ev: leptos::ev::Event| { + // Allow users to search for artists by name, converts the artist name to artist id to be handed off to backend + let handle_filter_artists = move |ev: leptos::ev::Event| { ev.prevent_default(); let artist_input: String = event_target_value(&ev); @@ -55,6 +61,26 @@ pub fn Upload(open: RwSignal) -> impl IntoView { } }) }; + // Create a filter function to handle filtering albums + // Allow users to search for albums by title, converts the album title to album id to be handed off to backend + let handle_filter_albums = move |ev: leptos::ev::Event| { + ev.prevent_default(); + + let album_input: String = event_target_value(&ev); + + //Update the album signal with the input + set_albums.update(|value: &mut String| *value = album_input); + + spawn_local(async move { + let filter_results = search_albums(albums.get_untracked(), 3).await; + if let Err(err) = filter_results { + log!("Error filtering albums: {:?}", err); + } else if let Ok(albums) = filter_results { + log!("Filtered albums: {:?}", albums); + set_filtered_albums.update(|value| *value = albums); + } + }) + }; view! {
@@ -67,16 +93,16 @@ pub fn Upload(open: RwSignal) -> impl IntoView { Title
-
+
- + Artists
0} fallback=move || view! {} > -
    +
      { move || filtered_artists.get().iter().enumerate().map(|(_index,filtered_artist)| view! { @@ -85,10 +111,25 @@ pub fn Upload(open: RwSignal) -> impl IntoView {
-
- - Album ID +
+
+ + Album ID +
+ 0} + fallback=move || view! {} + > +
    + { + move || filtered_albums.get().iter().enumerate().map(|(_index,filtered_album)| view! { + + }).collect::>() + } +
+
+
Track Number @@ -113,12 +154,11 @@ pub fn Upload(open: RwSignal) -> impl IntoView { #[component] pub fn Artist(artist: Artist, artists: ReadSignal, set_artists: WriteSignal, set_filtered: WriteSignal>) -> impl IntoView { - - // Create a function to add an artist to the artist input + // Converts artist name to artist id and adds it to the artist input let add_artist = move |_| { - //Create an empty string to hold the artist ids + //Create an empty string to hold previous artist ids let mut s: String = String::from(""); - //Get the current value of the artist input + //Get the current artist input let all_artirts: String = artists.get(); //Split the input into a vector of artists separated by commas let mut ids: Vec<&str> = all_artirts.split(",").collect(); @@ -152,8 +192,25 @@ pub fn Artist(artist: Artist, artists: ReadSignal, set_artists: WriteSig }; view! { -
+
{artist.name.clone()}
} +} +#[component] +pub fn Album(album: Album, _albums: ReadSignal, set_albums: WriteSignal, set_filtered: WriteSignal>) -> impl IntoView { + //Converts album title to album id to upload a song + let add_album = move |_| { + let value_str = match album.id.clone() { + Some(v) => v.to_string(), + None => String::from("None"), + }; + set_albums.update(|value| *value = value_str); + set_filtered.update(|value| *value = vec![]); + }; + view! { +
+ {album.title.clone()} +
+ } } \ No newline at end of file diff --git a/src/models.rs b/src/models.rs index ad5cc6c..e9aa7b7 100644 --- a/src/models.rs +++ b/src/models.rs @@ -168,7 +168,7 @@ impl Artist { #[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable, Identifiable))] #[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::albums))] #[cfg_attr(feature = "ssr", diesel(check_for_backend(diesel::pg::Pg)))] -#[derive(Serialize, Deserialize)] +#[derive(Serialize, Deserialize, Clone, Debug)] pub struct Album { /// A unique id for the album #[cfg_attr(feature = "ssr", diesel(deserialize_as = i32))] diff --git a/style/upload.scss b/style/upload.scss index b84920b..8da99e2 100644 --- a/style/upload.scss +++ b/style/upload.scss @@ -141,13 +141,10 @@ color: #7f8fa6; } } - .artists { + .has-search { position: relative; width: 325px; - .input-bx { - - } - .artist_results { + .search-results { display: flex; flex-direction: column; border: 1px solid white; @@ -158,7 +155,7 @@ z-index: 2; border-radius: 5px; padding: 0; - .artist { + .result { border-bottom: 1px solid white; padding: 10px; cursor: pointer; @@ -167,7 +164,7 @@ background-color: #7f8fa6; } } - .artist:last-child { + .result:last-child { border-bottom: none; } } From df78afbe60573dab859a121ab542a92721d08bc4 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Thu, 16 May 2024 19:07:39 -0400 Subject: [PATCH 21/49] Disable default features in wasm-bindgen --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 13a0c02..cc9981c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ leptos = { version = "0.6", default-features = false, features = ["nightly"] } leptos_meta = { version = "0.6", features = ["nightly"] } leptos_axum = { version = "0.6", optional = true } leptos_router = { version = "0.6", features = ["nightly"] } -wasm-bindgen = "=0.2.92" +wasm-bindgen = { version = "=0.2.92", default-features = false } leptos_icons = { version = "0.3.0" } icondata = { version = "0.3.0" } dotenv = { version = "0.15.0", optional = true } From 4685861af3e8fed59d31fd2d4024ea2dbb456f38 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Thu, 16 May 2024 19:08:22 -0400 Subject: [PATCH 22/49] Make wasm-bindgen required for frontend only --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index cc9981c..cea4b59 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ leptos = { version = "0.6", default-features = false, features = ["nightly"] } leptos_meta = { version = "0.6", features = ["nightly"] } leptos_axum = { version = "0.6", optional = true } leptos_router = { version = "0.6", features = ["nightly"] } -wasm-bindgen = { version = "=0.2.92", default-features = false } +wasm-bindgen = { version = "=0.2.92", default-features = false, optional = true } leptos_icons = { version = "0.3.0" } icondata = { version = "0.3.0" } dotenv = { version = "0.15.0", optional = true } @@ -48,6 +48,7 @@ hydrate = [ "leptos_meta/hydrate", "leptos_router/hydrate", "console_error_panic_hook", + "wasm-bindgen", ] ssr = [ "dep:leptos_axum", From 7b43906632808ee916de78f8d08d7dc8c2c6b1e5 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Thu, 16 May 2024 19:14:38 -0400 Subject: [PATCH 23/49] Disable default features in diesel --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index cea4b59..71cb8b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ wasm-bindgen = { version = "=0.2.92", default-features = false, optional = true leptos_icons = { version = "0.3.0" } icondata = { version = "0.3.0" } dotenv = { version = "0.15.0", optional = true } -diesel = { version = "2.1.4", features = ["postgres", "r2d2", "time"], optional = true } +diesel = { version = "2.1.4", features = ["postgres", "r2d2", "time"], default-features = false, optional = true } lazy_static = { version = "1.4.0", optional = true } serde = { version = "1.0.195", features = ["derive"] } openssl = { version = "0.10.63", optional = true } From bf9067aa43266d42a4111588c47cd4448f492537 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Thu, 16 May 2024 19:17:21 -0400 Subject: [PATCH 24/49] Disable default features in serde --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 71cb8b0..234e1d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ icondata = { version = "0.3.0" } dotenv = { version = "0.15.0", optional = true } diesel = { version = "2.1.4", features = ["postgres", "r2d2", "time"], default-features = false, optional = true } lazy_static = { version = "1.4.0", optional = true } -serde = { version = "1.0.195", features = ["derive"] } +serde = { version = "1.0.195", features = ["derive"], default-features = false } openssl = { version = "0.10.63", optional = true } time = { version = "0.3.34", features = ["serde"] } diesel_migrations = { version = "2.1.0", optional = true } From 12384b5a7591c92848aa9cf5f05b453301ea87af Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Thu, 16 May 2024 19:18:53 -0400 Subject: [PATCH 25/49] Disable default features in time --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 234e1d7..9814f9a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ diesel = { version = "2.1.4", features = ["postgres", "r2d2", "time"], default-f lazy_static = { version = "1.4.0", optional = true } serde = { version = "1.0.195", features = ["derive"], default-features = false } openssl = { version = "0.10.63", optional = true } -time = { version = "0.3.34", features = ["serde"] } +time = { version = "0.3.34", features = ["serde"], default-features = false } diesel_migrations = { version = "2.1.0", optional = true } pbkdf2 = { version = "0.12.2", features = ["simple"], optional = true } futures = { version = "0.3.30", default-features = false, optional = true } From 8ffe09381cbcc4acee06f1fddf4534d822203fc7 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Thu, 16 May 2024 19:23:48 -0400 Subject: [PATCH 26/49] Remove futures dependency Use tokio::join instead of futures::join --- Cargo.lock | 1 - Cargo.toml | 2 -- src/search.rs | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5b2514e..4b7af41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1576,7 +1576,6 @@ dependencies = [ "diesel_migrations", "dotenv", "flexi_logger", - "futures", "http", "icondata", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index 9814f9a..2e46758 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,6 @@ openssl = { version = "0.10.63", optional = true } time = { version = "0.3.34", features = ["serde"], default-features = false } diesel_migrations = { version = "2.1.0", optional = true } pbkdf2 = { version = "0.12.2", features = ["simple"], optional = true } -futures = { version = "0.3.30", default-features = false, optional = true } tokio = { version = "1", optional = true, features = ["rt-multi-thread"] } axum = { version = "0.7.5", optional = true } tower = { version = "0.4.13", optional = true } @@ -61,7 +60,6 @@ ssr = [ "openssl", "diesel_migrations", "pbkdf2", - "futures", "tokio", "axum", "tower", diff --git a/src/search.rs b/src/search.rs index 3b24f08..dd3aeb8 100644 --- a/src/search.rs +++ b/src/search.rs @@ -102,7 +102,7 @@ pub async fn search(query: String, limit: i64) -> Result<(Vec, Vec Date: Thu, 16 May 2024 19:30:46 -0400 Subject: [PATCH 27/49] Reduce axum features to tokio, http1 --- Cargo.lock | 27 --------------------------- Cargo.toml | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4b7af41..83fa92e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -153,15 +153,11 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", "sync_wrapper 1.0.0", "tokio", "tower", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -182,7 +178,6 @@ dependencies = [ "sync_wrapper 0.1.2", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -2320,16 +2315,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa", - "serde", -] - [[package]] name = "serde_qs" version = "0.12.0" @@ -2359,18 +2344,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - [[package]] name = "server_fn" version = "0.6.10" diff --git a/Cargo.toml b/Cargo.toml index 2e46758..ab25f8f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ time = { version = "0.3.34", features = ["serde"], default-features = false } diesel_migrations = { version = "2.1.0", optional = true } pbkdf2 = { version = "0.12.2", features = ["simple"], optional = true } tokio = { version = "1", optional = true, features = ["rt-multi-thread"] } -axum = { version = "0.7.5", optional = true } +axum = { version = "0.7.5", features = ["tokio", "http1"], default-features = false, optional = true } tower = { version = "0.4.13", optional = true } tower-http = { version = "0.5", optional = true, features = ["fs"] } thiserror = "1.0.57" From 4958d3a881117ef8058803b0ed7f06e6a711eb67 Mon Sep 17 00:00:00 2001 From: dannyzou18 Date: Thu, 16 May 2024 20:58:27 -0400 Subject: [PATCH 28/49] fixed bug --- src/upload.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/upload.rs b/src/upload.rs index b3c48b7..2ca036c 100644 --- a/src/upload.rs +++ b/src/upload.rs @@ -149,8 +149,6 @@ pub async fn upload(data: MultipartData) -> Result<(), ServerFnError> { while let Ok(Some(mut field)) = data.next_field().await { let name = field.name().unwrap_or_default().to_string(); - println!("Field name: {}", name); - match name.as_str() { "title" => { title = Some(extract_field(field).await?); }, "artist_ids" => { artist_ids = Some(validate_artist_ids(field).await?); }, From 3c9ae521b161b933c36d13edcc22bd57b06e8160 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Thu, 16 May 2024 20:59:38 -0400 Subject: [PATCH 29/49] Remove trailing comma from artist id field --- src/upload.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/upload.rs b/src/upload.rs index 2ca036c..00c28d7 100644 --- a/src/upload.rs +++ b/src/upload.rs @@ -35,7 +35,7 @@ async fn validate_artist_ids(artist_ids: Field<'static>) -> Result, Ser // Extract the artist id from the field match artist_ids.text().await { Ok(artist_ids) => { - let artist_ids = artist_ids.split(','); + let artist_ids = artist_ids.trim_end_matches(',').split(','); artist_ids.map(|artist_id| { // Parse the artist id as an integer From 3934a259005ddc979a23734640a9dba57e78827a Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sat, 18 May 2024 16:32:04 -0400 Subject: [PATCH 30/49] Handle present but empty fields --- src/upload.rs | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/src/upload.rs b/src/upload.rs index 00c28d7..6e0a3a4 100644 --- a/src/upload.rs +++ b/src/upload.rs @@ -37,7 +37,7 @@ async fn validate_artist_ids(artist_ids: Field<'static>) -> Result, Ser Ok(artist_ids) => { let artist_ids = artist_ids.trim_end_matches(',').split(','); - artist_ids.map(|artist_id| { + artist_ids.filter(|artist_id| !artist_id.is_empty()).map(|artist_id| { // Parse the artist id as an integer if let Ok(artist_id) = artist_id.parse::() { // Check if the artist exists @@ -64,13 +64,17 @@ async fn validate_artist_ids(artist_ids: Field<'static>) -> Result, Ser /// Validate the album id in a multipart field /// Expects a field with an album id, and ensures it is a valid album id in the database #[cfg(feature = "ssr")] -async fn validate_album_id(album_id: Field<'static>) -> Result { +async fn validate_album_id(album_id: Field<'static>) -> Result, ServerFnError> { use crate::models::Album; use diesel::result::Error::NotFound; // Extract the album id from the field match album_id.text().await { Ok(album_id) => { + if album_id.is_empty() { + return Ok(None); + } + // Parse the album id as an integer if let Ok(album_id) = album_id.parse::() { // Check if the album exists @@ -78,7 +82,7 @@ async fn validate_album_id(album_id: Field<'static>) -> Result(db_con); match album { - Ok(_) => Ok(album_id), + Ok(_) => Ok(Some(album_id)), Err(NotFound) => Err(ServerFnError:::: ServerError("Album does not exist".to_string())), Err(e) => Err(ServerFnError:::: @@ -95,15 +99,19 @@ async fn validate_album_id(album_id: Field<'static>) -> Result) -> Result { +async fn validate_track_number(track_number: Field<'static>) -> Result, ServerFnError> { match track_number.text().await { Ok(track_number) => { + if track_number.is_empty() { + return Ok(None); + } + if let Ok(track_number) = track_number.parse::() { if track_number < 0 { return Err(ServerFnError:::: ServerError("Track number must be positive or 0".to_string())); } else { - Ok(track_number) + Ok(Some(track_number)) } } else { return Err(ServerFnError::::ServerError("Error parsing track number".to_string())); @@ -116,14 +124,18 @@ async fn validate_track_number(track_number: Field<'static>) -> Result) -> Result { +async fn validate_release_date(release_date: Field<'static>) -> Result, ServerFnError> { match release_date.text().await { Ok(release_date) => { + if release_date.trim().is_empty() { + return Ok(None); + } + let date_format = time::macros::format_description!("[year]-[month]-[day]"); let release_date = Date::parse(&release_date.trim(), date_format); match release_date { - Ok(release_date) => Ok(release_date), + Ok(release_date) => Ok(Some(release_date)), Err(_) => Err(ServerFnError::::ServerError("Invalid release date".to_string())), } }, @@ -223,6 +235,10 @@ pub async fn upload(data: MultipartData) -> Result<(), ServerFnError> { let duration = i32::try_from(duration).map_err(|e| ServerFnError:::: ServerError(format!("Error converting duration to i32: {}", e)))?; + let album_id = album_id.unwrap_or(None); + let track = track.unwrap_or(None); + let release_date = release_date.unwrap_or(None); + // Create the song use crate::models::Song; let song = Song { From b4054aa2b79e2cbfcd158a6da06a9272c1f592dc Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sat, 18 May 2024 16:32:31 -0400 Subject: [PATCH 31/49] Ensure track is specified if album is specified --- src/upload.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/upload.rs b/src/upload.rs index 6e0a3a4..ff7d30d 100644 --- a/src/upload.rs +++ b/src/upload.rs @@ -239,6 +239,11 @@ pub async fn upload(data: MultipartData) -> Result<(), ServerFnError> { let track = track.unwrap_or(None); let release_date = release_date.unwrap_or(None); + if album_id.is_some() != track.is_some() { + return Err(ServerFnError:: + ::ServerError("Album id and track number must both be present or both be absent".to_string())); + } + // Create the song use crate::models::Song; let song = Song { From 1633d8c1a525ebcc9de71485cc7950e9d084c411 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sat, 18 May 2024 16:33:48 -0400 Subject: [PATCH 32/49] Fix required/optional form fields --- src/components/upload.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/upload.rs b/src/components/upload.rs index 88612d5..48e68f3 100644 --- a/src/components/upload.rs +++ b/src/components/upload.rs @@ -95,7 +95,7 @@ pub fn Upload(open: RwSignal) -> impl IntoView {
- + Artists
) -> impl IntoView {
- + Album ID
) -> impl IntoView {
- + Track Number
@@ -143,7 +143,7 @@ pub fn Upload(open: RwSignal) -> impl IntoView {
File - +
From 952fb93e1e4e7a59d356b0ac689a68629da79327 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sat, 18 May 2024 16:34:07 -0400 Subject: [PATCH 33/49] Only allow mp3 file upload selections --- src/components/upload.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/upload.rs b/src/components/upload.rs index 48e68f3..8bf593b 100644 --- a/src/components/upload.rs +++ b/src/components/upload.rs @@ -143,7 +143,7 @@ pub fn Upload(open: RwSignal) -> impl IntoView {
File - +
From e7e7a8175eeffe2502db45637b88b307daa9ece9 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sat, 18 May 2024 16:34:48 -0400 Subject: [PATCH 34/49] Add web_sys dependency --- Cargo.lock | 1 + Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index caf61a2..9f4f793 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1612,6 +1612,7 @@ dependencies = [ "tower-sessions", "tower-sessions-redis-store", "wasm-bindgen", + "web-sys", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3ad44c5..638bbe7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,6 +41,7 @@ symphonia = { version = "0.5.4", default-features = false, features = ["mp3"], o multer = { version = "3.0.0", optional = true } log = { version = "0.4.21", optional = true } flexi_logger = { version = "0.28.0", optional = true, default-features = false } +web-sys = "0.3.69" [patch.crates-io] gloo-net = { git = "https://github.com/rustwasm/gloo.git", rev = "a823fab7ecc4068e9a28bd669da5eaf3f0a56380" } From 0adf294cfc02067aa617399fe4bacf926c70dbf4 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sat, 18 May 2024 16:36:37 -0400 Subject: [PATCH 35/49] Display error message when upload song fails --- src/components/upload.rs | 27 ++++++++++++++++++++++++++- style/upload.scss | 15 +++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/components/upload.rs b/src/components/upload.rs index 8bf593b..02e7bf5 100644 --- a/src/components/upload.rs +++ b/src/components/upload.rs @@ -1,7 +1,9 @@ +use std::rc::Rc; use leptos::leptos_dom::*; use leptos::*; use leptos_icons::*; use leptos_router::Form; +use web_sys::Response; use crate::search::search_artists; use crate::search::search_albums; use crate::models::Artist; @@ -32,6 +34,8 @@ pub fn Upload(open: RwSignal) -> impl IntoView { let (albums, set_albums) = create_signal("".to_string()); let (filtered_albums, set_filtered_albums) = create_signal(vec![]); + let (error_msg, set_error_msg) = create_signal::>(Some("Error uploading song".to_string())); + let close_dialog = move |ev: leptos::ev::MouseEvent| { ev.prevent_default(); open.set(false); @@ -81,6 +85,17 @@ pub fn Upload(open: RwSignal) -> impl IntoView { } }) }; + + let handle_response = Rc::new(move |response: &Response| { + if response.ok() { + set_error_msg.update(|value| *value = None); + open.set(false); + } else { + // TODO: Extract error message from response + set_error_msg.update(|value| *value = Some("Error uploading song".to_string())); + } + }); + view! {
@@ -88,7 +103,8 @@ pub fn Upload(open: RwSignal) -> impl IntoView {

Upload Song

-
+
Title @@ -147,6 +163,15 @@ pub fn Upload(open: RwSignal) -> impl IntoView {
+ +
+ + {error_msg.get().as_ref().unwrap()} +
+
} diff --git a/style/upload.scss b/style/upload.scss index 8da99e2..720c427 100644 --- a/style/upload.scss +++ b/style/upload.scss @@ -170,4 +170,19 @@ } } } + + .error-msg { + padding-top: 10px; + color: red; + + display: flex; + justify-content: center; + align-items: center; + + svg { + width: 20px; + height: 20px; + margin-right: 5px; + } + } } \ No newline at end of file From b0edd2174efaf58725045759a41af14fa080f389 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sat, 18 May 2024 18:10:48 -0400 Subject: [PATCH 36/49] Don't initially show upload error message --- src/components/upload.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/upload.rs b/src/components/upload.rs index 02e7bf5..69b6c28 100644 --- a/src/components/upload.rs +++ b/src/components/upload.rs @@ -34,7 +34,7 @@ pub fn Upload(open: RwSignal) -> impl IntoView { let (albums, set_albums) = create_signal("".to_string()); let (filtered_albums, set_filtered_albums) = create_signal(vec![]); - let (error_msg, set_error_msg) = create_signal::>(Some("Error uploading song".to_string())); + let (error_msg, set_error_msg) = create_signal::>(None); let close_dialog = move |ev: leptos::ev::MouseEvent| { ev.prevent_default(); From 355c791ea7677ad689d00924a681c43cce433dff Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sat, 18 May 2024 18:15:50 -0400 Subject: [PATCH 37/49] Reset form fields after sucessful submission --- src/components/upload.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/upload.rs b/src/components/upload.rs index 69b6c28..e94d901 100644 --- a/src/components/upload.rs +++ b/src/components/upload.rs @@ -89,6 +89,10 @@ pub fn Upload(open: RwSignal) -> impl IntoView { let handle_response = Rc::new(move |response: &Response| { if response.ok() { set_error_msg.update(|value| *value = None); + set_filtered_artists.update(|value| *value = vec![]); + set_filtered_albums.update(|value| *value = vec![]); + set_artists.update(|value| *value = "".to_string()); + set_albums.update(|value| *value = "".to_string()); open.set(false); } else { // TODO: Extract error message from response From eb4dcd4776b4882a04dd2afa954f9a30fcf393f2 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sat, 18 May 2024 18:39:14 -0400 Subject: [PATCH 38/49] Remove tower_sessions dependency --- Cargo.lock | 1 - Cargo.toml | 1 - src/main.rs | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83fa92e..ba01566 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1588,7 +1588,6 @@ dependencies = [ "tokio", "tower", "tower-http", - "tower-sessions", "tower-sessions-redis-store", "wasm-bindgen", ] diff --git a/Cargo.toml b/Cargo.toml index ab25f8f..4a0edc3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,6 @@ axum = { version = "0.7.5", features = ["tokio", "http1"], default-features = fa tower = { version = "0.4.13", optional = true } tower-http = { version = "0.5", optional = true, features = ["fs"] } thiserror = "1.0.57" -tower-sessions = { version = "0.11", default-features = false } tower-sessions-redis-store = { version = "0.11", optional = true } async-trait = "0.1.79" axum-login = { version = "0.14.0", optional = true } diff --git a/src/main.rs b/src/main.rs index d0eed6f..9832704 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,7 +19,7 @@ async fn main() { use leptos_axum::{generate_route_list, LeptosRoutes}; use libretunes::app::*; use libretunes::fileserv::{file_and_error_handler, get_static_file}; - use tower_sessions::SessionManagerLayer; + use axum_login::tower_sessions::SessionManagerLayer; use tower_sessions_redis_store::{fred::prelude::*, RedisStore}; use axum_login::AuthManagerLayerBuilder; use libretunes::auth_backend::AuthBackend; From 9a462d5ee974de1e48822d46e89c935dea15a8e8 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sat, 18 May 2024 18:51:59 -0400 Subject: [PATCH 39/49] Make async-trait required for backend only --- Cargo.toml | 3 ++- src/auth_backend.rs | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4a0edc3..1ffeb2c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ tower = { version = "0.4.13", optional = true } tower-http = { version = "0.5", optional = true, features = ["fs"] } thiserror = "1.0.57" tower-sessions-redis-store = { version = "0.11", optional = true } -async-trait = "0.1.79" +async-trait = { version = "0.1.79", optional = true } axum-login = { version = "0.14.0", optional = true } log = { version = "0.4.21", optional = true } flexi_logger = { version = "0.28.0", optional = true, default-features = false } @@ -64,6 +64,7 @@ ssr = [ "tower", "tower-http", "tower-sessions-redis-store", + "async-trait", "axum-login", "log", "flexi_logger", diff --git a/src/auth_backend.rs b/src/auth_backend.rs index 79e5d9c..cf53a40 100644 --- a/src/auth_backend.rs +++ b/src/auth_backend.rs @@ -1,10 +1,17 @@ -use async_trait::async_trait; use axum_login::{AuthnBackend, AuthUser, UserId}; use crate::users::UserCredentials; use leptos::server_fn::error::ServerFnErrorErr; use crate::models::User; +use cfg_if::cfg_if; + +cfg_if! { + if #[cfg(feature = "ssr")] { + use async_trait::async_trait; + } +} + impl AuthUser for User { type Id = i32; From 6ae55d5cfc96e7fff5c589edeae71cc6a40b9224 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sat, 18 May 2024 20:41:02 -0400 Subject: [PATCH 40/49] Add admin column to users table --- migrations/2024-05-18-231505_add_user_admin/down.sql | 1 + migrations/2024-05-18-231505_add_user_admin/up.sql | 1 + src/models.rs | 2 ++ src/pages/signup.rs | 1 + src/schema.rs | 1 + 5 files changed, 6 insertions(+) create mode 100644 migrations/2024-05-18-231505_add_user_admin/down.sql create mode 100644 migrations/2024-05-18-231505_add_user_admin/up.sql diff --git a/migrations/2024-05-18-231505_add_user_admin/down.sql b/migrations/2024-05-18-231505_add_user_admin/down.sql new file mode 100644 index 0000000..8c2de0f --- /dev/null +++ b/migrations/2024-05-18-231505_add_user_admin/down.sql @@ -0,0 +1 @@ +ALTER TABLE users DROP COLUMN admin; diff --git a/migrations/2024-05-18-231505_add_user_admin/up.sql b/migrations/2024-05-18-231505_add_user_admin/up.sql new file mode 100644 index 0000000..58a6e49 --- /dev/null +++ b/migrations/2024-05-18-231505_add_user_admin/up.sql @@ -0,0 +1 @@ +ALTER TABLE users ADD COLUMN admin BOOLEAN DEFAULT FALSE NOT NULL; diff --git a/src/models.rs b/src/models.rs index 442713e..349ed74 100644 --- a/src/models.rs +++ b/src/models.rs @@ -41,6 +41,8 @@ pub struct User { /// The time the user was created #[cfg_attr(feature = "ssr", diesel(deserialize_as = SystemTime))] pub created_at: Option, + /// Whether the user is an admin + pub admin: bool, } /// Model for an artist diff --git a/src/pages/signup.rs b/src/pages/signup.rs index 69f68c7..f02dfab 100644 --- a/src/pages/signup.rs +++ b/src/pages/signup.rs @@ -25,6 +25,7 @@ pub fn Signup() -> impl IntoView { email: email.get(), password: Some(password.get()), created_at: None, + admin: false, }; log!("new user: {:?}", new_user); diff --git a/src/schema.rs b/src/schema.rs index 97de324..e4964b9 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -50,6 +50,7 @@ diesel::table! { email -> Varchar, password -> Varchar, created_at -> Timestamp, + admin -> Bool, } } From c27ad19499c0180fcc16f850a398fc47794cce75 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sat, 18 May 2024 20:43:26 -0400 Subject: [PATCH 41/49] Prevent arbitrary admin user creation --- src/auth.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/auth.rs b/src/auth.rs index 2eda7cf..20de5c3 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -21,9 +21,10 @@ use crate::users::UserCredentials; pub async fn signup(new_user: User) -> Result<(), ServerFnError> { use crate::users::create_user; - // Ensure the user has no id + // Ensure the user has no id, and is not a self-proclaimed admin let new_user = User { id: None, + admin: false, ..new_user }; From fa26ee40ed1ecd3df5ee03cdca728a23489cf270 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sun, 19 May 2024 12:20:50 -0400 Subject: [PATCH 42/49] Add auth functions for checking admin status --- src/auth.rs | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/auth.rs b/src/auth.rs index 20de5c3..8c33347 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -121,3 +121,37 @@ pub async fn require_auth() -> Result<(), ServerFnError> { } }) } + +/// Check if a user is an admin +/// Returns a Result with a boolean indicating if the user is logged in and an admin +#[server(endpoint = "check_admin")] +pub async fn check_admin() -> Result { + let auth_session = extract::>().await + .map_err(|e| ServerFnError::::ServerError(format!("Error getting auth session: {}", e)))?; + + Ok(auth_session.user.as_ref().map(|u| u.admin).unwrap_or(false)) +} + +/// Require that a user is logged in and an admin +/// Returns a Result with the error message if the user is not logged in or is not an admin +/// Intended to be used at the start of a protected route, to ensure the user is logged in and an admin: +/// ```rust +/// use leptos::*; +/// use libretunes::auth::require_admin; +/// #[server(endpoint = "protected_admin_route")] +/// pub async fn protected_admin_route() -> Result<(), ServerFnError> { +/// require_admin().await?; +/// // Continue with protected route +/// Ok(()) +/// } +/// ``` +#[cfg(feature = "ssr")] +pub async fn require_admin() -> Result<(), ServerFnError> { + check_admin().await.and_then(|is_admin| { + if is_admin { + Ok(()) + } else { + Err(ServerFnError::::ServerError(format!("Unauthorized"))) + } + }) +} From 6b8c8d41e494b886ee25312c846e9da8f2b2b3c0 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sun, 21 Jul 2024 13:15:55 -0400 Subject: [PATCH 43/49] Add music placeholder image --- assets/images/placeholders/MusicPlaceholder.svg | 1 + src/playbar.rs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 assets/images/placeholders/MusicPlaceholder.svg diff --git a/assets/images/placeholders/MusicPlaceholder.svg b/assets/images/placeholders/MusicPlaceholder.svg new file mode 100644 index 0000000..4a3917b --- /dev/null +++ b/assets/images/placeholders/MusicPlaceholder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/playbar.rs b/src/playbar.rs index 7bfc1b0..38754c7 100644 --- a/src/playbar.rs +++ b/src/playbar.rs @@ -261,8 +261,8 @@ fn MediaInfo(status: RwSignal) -> impl IntoView { let image = Signal::derive(move || { status.with(|status| { - // TODO Use some default / unknown image? - status.queue.front().map_or("".into(), |song| song.image_path.clone()) + status.queue.front().map_or("/assets/images/placeholders/MusicPlaceholder.svg".into(), + |song| song.image_path.clone()) }) }); From 6202b287f081414034ed70402f2a4eb4f206b902 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Tue, 23 Jul 2024 20:51:12 -0400 Subject: [PATCH 44/49] Fix music placeholder asset path --- src/playbar.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/playbar.rs b/src/playbar.rs index 38754c7..c90df53 100644 --- a/src/playbar.rs +++ b/src/playbar.rs @@ -261,7 +261,7 @@ fn MediaInfo(status: RwSignal) -> impl IntoView { let image = Signal::derive(move || { status.with(|status| { - status.queue.front().map_or("/assets/images/placeholders/MusicPlaceholder.svg".into(), + status.queue.front().map_or("/images/placeholders/MusicPlaceholder.svg".into(), |song| song.image_path.clone()) }) }); From c72d4aee185f363443d0dcd02bba057123d27932 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Tue, 23 Jul 2024 22:57:24 -0400 Subject: [PATCH 45/49] Add Arist::display_list function --- src/models.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/models.rs b/src/models.rs index 349ed74..caa52ed 100644 --- a/src/models.rs +++ b/src/models.rs @@ -164,6 +164,26 @@ impl Artist { Ok(my_songs) } + + /// Display a list of artists as a string. + /// + /// For one artist, displays [artist1]. For two artists, displays [artist1] & [artist2]. + /// For three or more artists, displays [artist1], [artist2], & [artist3]. + pub fn display_list(artists: &Vec) -> String { + let mut artist_list = String::new(); + + for (i, artist) in artists.iter().enumerate() { + if i == 0 { + artist_list.push_str(&artist.name); + } else if i == artists.len() - 1 { + artist_list.push_str(&format!(" & {}", artist.name)); + } else { + artist_list.push_str(&format!(", {}", artist.name)); + } + } + + artist_list + } } /// Model for an album From ffad799f72d3453cab04be7ef1e109ddfad0f5d8 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Tue, 23 Jul 2024 23:30:15 -0400 Subject: [PATCH 46/49] Add function to get song album object --- src/models.rs | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/models.rs b/src/models.rs index caa52ed..d3e4104 100644 --- a/src/models.rs +++ b/src/models.rs @@ -313,4 +313,30 @@ impl Song { Ok(my_artists) } + + /// Get the album for this song from the database + /// + /// # Arguments + /// + /// * `conn` - A mutable reference to a database connection + /// + /// # Returns + /// + /// * `Result, Box>` - A result indicating success with an album, or None if + /// the song does not have an album, or an error + /// + #[cfg(feature = "ssr")] + pub fn get_album(self: &Self, conn: &mut PgPooledConn) -> Result, Box> { + use crate::schema::albums::dsl::*; + + if let Some(album_id) = self.album_id { + let my_album = albums + .filter(id.eq(album_id)) + .first::(conn)?; + + Ok(Some(my_album)) + } else { + Ok(None) + } + } } From f8bbe319bd602ba5553947ca1dda0c54c760d72e Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Tue, 23 Jul 2024 23:31:48 -0400 Subject: [PATCH 47/49] Update SongData for frontend use --- src/playbar.rs | 12 +++++++----- src/queue.rs | 3 ++- src/songdata.rs | 24 +++++++++++++++++++----- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/playbar.rs b/src/playbar.rs index c90df53..7ff2458 100644 --- a/src/playbar.rs +++ b/src/playbar.rs @@ -1,3 +1,4 @@ +use crate::models::Artist; use crate::playstatus::PlayStatus; use leptos::ev::MouseEvent; use leptos::html::{Audio, Div}; @@ -243,19 +244,20 @@ fn PlayDuration(elapsed_secs: MaybeSignal, total_secs: MaybeSignal) -> fn MediaInfo(status: RwSignal) -> impl IntoView { let name = Signal::derive(move || { status.with(|status| { - status.queue.front().map_or("No media playing".into(), |song| song.name.clone()) + status.queue.front().map_or("No media playing".into(), |song| song.title.clone()) }) }); let artist = Signal::derive(move || { status.with(|status| { - status.queue.front().map_or("".into(), |song| song.artist.clone()) + status.queue.front().map_or("".into(), |song| format!("{}", Artist::display_list(&song.artists))) }) }); let album = Signal::derive(move || { status.with(|status| { - status.queue.front().map_or("".into(), |song| song.album.clone()) + status.queue.front().map_or("".into(), |song| + song.album.as_ref().map_or("".into(), |album| album.title.clone())) }) }); @@ -400,7 +402,7 @@ pub fn PlayBar(status: RwSignal) -> impl IntoView { status.with_untracked(|status| { // Start playing the first song in the queue, if available if let Some(song) = status.queue.front() { - log!("Starting playing with song: {}", song.name); + log!("Starting playing with song: {}", song.title); // Don't use the set_play_src / set_playing helper function // here because we already have access to the audio element @@ -453,7 +455,7 @@ pub fn PlayBar(status: RwSignal) -> impl IntoView { let prev_song = status.queue.pop_front(); if let Some(prev_song) = prev_song { - log!("Adding song to history: {}", prev_song.name); + log!("Adding song to history: {}", prev_song.title); status.history.push_back(prev_song); } else { log!("Queue empty, no previous song to add to history"); diff --git a/src/queue.rs b/src/queue.rs index 39f0ee0..8a819b9 100644 --- a/src/queue.rs +++ b/src/queue.rs @@ -1,3 +1,4 @@ +use crate::models::Artist; use crate::playstatus::PlayStatus; use crate::song::Song; use leptos::ev::MouseEvent; @@ -98,7 +99,7 @@ pub fn Queue(status: RwSignal) -> impl IntoView { on:dragenter=move |e: DragEvent| on_drag_enter(e, index) on:dragover=on_drag_over > - + , /// Song album - pub album: String, + pub album: Option, + /// The track number of the song on the album + pub track: Option, + /// The duration of the song in seconds + pub duration: i32, + /// The song's release date + pub release_date: Option, /// Path to song file, relative to the root of the web server. /// For example, `"/assets/audio/Song.mp3"` pub song_path: String, From 76631126de5f554d78aa85cf1090ffb28f32c053 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Tue, 23 Jul 2024 23:32:26 -0400 Subject: [PATCH 48/49] Add Song/SongData conversions --- src/songdata.rs | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/src/songdata.rs b/src/songdata.rs index 52ed37a..6bd6f22 100644 --- a/src/songdata.rs +++ b/src/songdata.rs @@ -28,3 +28,70 @@ pub struct SongData { /// For example, `"/assets/images/Song.jpg"` pub image_path: String, } + +#[cfg(feature = "ssr")] +impl TryInto for Song { + type Error = Box; + + /// Convert a Song object into a SongData object + /// + /// This conversion is expensive, as it requires database queries to get the artist and album objects. + /// The SongData/Song conversions are also not truly reversible, + /// due to the way the image_path, album, and artist data is handled. + fn try_into(self) -> Result { + let mut db_con = database::get_db_conn(); + + let album = self.get_album(&mut db_con)?; + + // Use the song's image path if it exists, otherwise use the album's image path, or fallback to the placeholder + let image_path = self.image_path.clone().unwrap_or_else(|| { + album + .as_ref() + .and_then(|album| album.image_path.clone()) + .unwrap_or_else(|| "/assets/images/placeholder.jpg".to_string()) + }); + + Ok(SongData { + id: self.id.ok_or("Song id must be present (Some) to convert to SongData")?, + title: self.title.clone(), + artists: self.get_artists(&mut db_con)?, + album: album, + track: self.track, + duration: self.duration, + release_date: self.release_date, + // TODO https://gitlab.mregirouard.com/libretunes/libretunes/-/issues/35 + song_path: self.storage_path, + image_path: image_path, + }) + } +} + +impl TryInto for SongData { + type Error = Box; + + /// Convert a SongData object into a Song object + /// + /// The SongData/Song conversions are also not truly reversible, + /// due to the way the image_path, album, and and artist data is handled. + fn try_into(self) -> Result { + Ok(Song { + id: Some(self.id), + title: self.title, + album_id: self.album.map(|album| + album.id.ok_or("Album id must be present (Some) to convert to Song")).transpose()?, + track: self.track, + duration: self.duration, + release_date: self.release_date, + // TODO https://gitlab.mregirouard.com/libretunes/libretunes/-/issues/35 + storage_path: self.song_path, + + // Note that if the source of the image_path was the album, the image_path + // will be set to the album's image_path instead of None + image_path: if self.image_path == "/assets/images/placeholder.jpg" { + None + } else { + Some(self.image_path) + }, + }) + } +} From 21bb2d127fe116a09ab1274f46153c06c17fbe90 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Tue, 23 Jul 2024 23:37:48 -0400 Subject: [PATCH 49/49] Fix unused crate::database import --- src/songdata.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/songdata.rs b/src/songdata.rs index 6bd6f22..23ce415 100644 --- a/src/songdata.rs +++ b/src/songdata.rs @@ -1,4 +1,3 @@ -use crate::database; use crate::models::{Album, Artist, Song}; use time::Date; @@ -39,6 +38,7 @@ impl TryInto for Song { /// The SongData/Song conversions are also not truly reversible, /// due to the way the image_path, album, and artist data is handled. fn try_into(self) -> Result { + use crate::database; let mut db_con = database::get_db_conn(); let album = self.get_album(&mut db_con)?;