From a4d026e41f95d45d633906973b606190be46f20c Mon Sep 17 00:00:00 2001 From: KD Date: Tue, 18 Feb 2025 20:09:11 -0500 Subject: [PATCH 1/5] Updating song model (#26) --- src/models/song.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/models/song.rs b/src/models/song.rs index 1d5d19c..29b8581 100644 --- a/src/models/song.rs +++ b/src/models/song.rs @@ -12,11 +12,17 @@ pub struct Song { pub title: Option, pub artist: Option, pub album: Option, + pub album_artist: Option, pub genre: Option, pub year: Option, pub duration: Option, pub track: Option, pub disc: Option, + pub disc_count: Option, + pub track_count: Option, + pub date_created: Option, + pub filename: Option, + pub user_id: Option, pub data: Option>, pub filepath: Option, pub directory: Option, @@ -56,11 +62,17 @@ impl Default for Song { title: None, artist: None, album: None, + album_artist: None, genre: None, year: None, duration: None, track: None, disc: None, + disc_count: None, + track_count: None, + date_created: None, + filename: None, + user_id: None, data: None, filepath: None, directory: None, From c3718c5add8b94fd906dd4d15ee64afe770c781c Mon Sep 17 00:00:00 2001 From: KD Date: Tue, 18 Feb 2025 20:09:49 -0500 Subject: [PATCH 2/5] Added constant for flac file extension (#25) --- src/constants/file_extensions.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/constants/file_extensions.rs b/src/constants/file_extensions.rs index edf058e..3a217ce 100644 --- a/src/constants/file_extensions.rs +++ b/src/constants/file_extensions.rs @@ -1,3 +1,4 @@ pub const WAV_FILE_EXTENSION: &str = ".wav"; +pub const FLAC_FILE_EXTENSION: &str = ".flac"; pub const _MP3_FILE_EXTENSION: &str = ".mp3"; pub const JPG_FILE_EXTENSION: &str = ".jpg"; From 4c99f88baf28ea914003be8ecba6ae313c92c9b2 Mon Sep 17 00:00:00 2001 From: KD Date: Sun, 2 Mar 2025 20:52:33 -0500 Subject: [PATCH 3/5] Updating packages (#24) * Updating packages * Updated serde packages --- Cargo.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4f4458b..5f457bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,10 +9,10 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -futures = { version = "0.3.30" } -http = { version = "1.1.0" } -reqwest = { version = "0.12.4", features = ["json", "blocking", "multipart", "stream"] } -serde = { version = "1.0.197", features = ["derive"] } -serde_json = "1.0.115" -tokio = { version = "1.37", features = ["full"] } -tokio-util = { version = "0.7.11", features = ["codec"] } +futures = { version = "0.3.31" } +http = { version = "1.2.0" } +reqwest = { version = "0.12.12", features = ["json", "blocking", "multipart", "stream"] } +serde = { version = "1.0.218", features = ["derive"] } +serde_json = "1.0.139" +tokio = { version = "1.43", features = ["full"] } +tokio-util = { version = "0.7.13", features = ["codec"] } From 772641a8c48ff4e191753128458d5f076c87711a Mon Sep 17 00:00:00 2001 From: KD Date: Sun, 2 Mar 2025 20:53:14 -0500 Subject: [PATCH 4/5] Targeting rust 2024 (#27) --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 5f457bb..0aa18e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "icarus-dm" version = "0.4.0" -edition = "2021" +edition = "2024" From 7391b1db68db99ae20629de3f43c32d0af64bae0 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 10 Mar 2025 20:08:04 -0400 Subject: [PATCH 5/5] Removing fields not used --- src/managers/commit_manager.rs | 10 +++++----- src/models/song.rs | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 400f0a3..c4112a6 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -339,7 +339,7 @@ impl CommitManager { filenames.push(s.clone()); fp = s.clone(); dir = song_file.parent().unwrap().display().to_string(); - song.filepath = Some(s.clone()); + song.filename = Some(s.clone()); song.directory = Some(dir.clone()); self.initialize_disc_and_track(&mut song); } @@ -354,7 +354,7 @@ impl CommitManager { let album = self.retrieve_metadata(&meta_path); let trck = i32::from_str(track_id).unwrap(); let mut s = album.retrieve_song(trck, 1).unwrap(); - s.filepath = Some(fp); + s.filename = Some(fp); s.directory = Some(dir); s.genre = Some(album.genre.clone()); s.year = Some(album.year.clone()); @@ -433,7 +433,7 @@ impl CommitManager { match fname { Ok(s) => { filenames.push(s.clone()); - song.filepath = Some(s.clone()); + song.filename = Some(s.clone()); song.directory = Some(sourcepath.clone()); song.data = Some(song.to_data().unwrap()); self.initialize_disc_and_track(&mut song); @@ -513,7 +513,7 @@ impl CommitManager { let mut index = 0; for song in &mut album.songs { let filename = filenames[index].clone(); - song.filepath = Some(filename); + song.filename = Some(filename); index += 1; } @@ -598,7 +598,7 @@ impl CommitManager { let mut track = 1; let mut mode = 0; let filename = - & as Clone>::clone(&song.filepath).unwrap(); + & as Clone>::clone(&song.filename).unwrap(); let trd = filename.contains("trackd"); let tr = filename.contains("track"); diff --git a/src/models/song.rs b/src/models/song.rs index 29b8581..1f23852 100644 --- a/src/models/song.rs +++ b/src/models/song.rs @@ -24,7 +24,6 @@ pub struct Song { pub filename: Option, pub user_id: Option, pub data: Option>, - pub filepath: Option, pub directory: Option, } @@ -74,7 +73,6 @@ impl Default for Song { filename: None, user_id: None, data: None, - filepath: None, directory: None, } } @@ -98,7 +96,7 @@ impl Song { } let filename = - & as Clone>::clone(&self.filepath).unwrap(); + & as Clone>::clone(&self.filename).unwrap(); buffer += filename; return buffer; @@ -134,7 +132,7 @@ impl Song { filename += constants::file_extensions::WAV_FILE_EXTENSION; } - self.filepath = Some(filename); + self.filename = Some(filename); return 0; }