From ce3452f0fdfbb82877519c94aafbdbf20cf0d89d Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 25 Mar 2025 21:17:50 -0400 Subject: [PATCH 1/7] Code refactoring --- src/managers/commit_manager.rs | 214 ++++++++++++++++++--------------- src/syncers/upload.rs | 101 ++-------------- 2 files changed, 127 insertions(+), 188 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 57768a3..0afa123 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -337,59 +337,72 @@ impl CommitManager { let mut cover_art = icarus_models::coverart::CoverArt { id: 0, title: String::new(), - path: String::new(), + path: cover_path.clone(), data: Vec::new(), }; - let mut filenames = Vec::new(); let file_name = std::ffi::OsString::from(&song_file.file_name().unwrap()); - let mut directory: String = String::new(); - let mut filename: String = String::new(); match self.find_file_extension(&file_name) { - En::ImageFile => {} - En::MetadataFile => {} En::SongFile => match utilities::string::o_to_string(&file_name) { Ok(s) => { println!("file name: {:?}", file_name); - filenames.push(s.clone()); - filename = s.clone(); - directory = song_file.parent().unwrap().display().to_string(); + + match icarus_models::album::collection::parse_album(&meta_path) { + Ok(album) => { + let filename = s.clone(); + let directory = song_file.parent().unwrap().display().to_string(); + let trck = i32::from_str(track_id).unwrap(); + let mut s = + retrieve_song(&album, trck, 1, &directory, &filename).unwrap(); + println!("Directory: {:?}", s.directory); + println!("Filename: {:?}", s.filename); + println!("Path: {:?}", s.song_path()); + s.data = s.to_data().unwrap(); + + cover_art.data = cover_art.to_data().unwrap(); + + let mut up = syncers::upload::Upload::default(); + let host = self.ica_action.retrieve_flag_value(&String::from("-h")); + up.set_api(&host); + + let res = up.upload_song_with_metadata(&token, &s, &cover_art); + + match Runtime::new().unwrap().block_on(res) { + Ok(o) => { + println!("Successfully sent {:?}", o); + Ok(()) + } + Err(er) => { + println!("Some error {:?}", er); + Err(std::io::Error::new( + std::io::ErrorKind::Other, + er.to_string(), + )) + } + } + } + Err(err) => { + println!("Error: {:?}", err); + Err(std::io::Error::new( + std::io::ErrorKind::Other, + err.to_string(), + )) + } + } + } + Err(er) => { + println!("Error: {:?}", er); + return Err(std::io::Error::new( + std::io::ErrorKind::Other, + er.to_string(), + )); } - Err(er) => println!("Error: {:?}", er), }, - _ => {} - } - - cover_art.path = cover_path.clone(); - - let album = self.retrieve_metadata(&meta_path); - let trck = i32::from_str(track_id).unwrap(); - let mut s = retrieve_song(&album, trck, 1, &directory, &filename).unwrap(); - println!("Directory: {:?}", s.directory); - println!("Filename: {:?}", s.filename); - println!("Path: {:?}", s.song_path()); - s.data = s.to_data().unwrap(); - - cover_art.data = cover_art.to_data().unwrap(); - - let mut up = syncers::upload::Upload::default(); - let host = self.ica_action.retrieve_flag_value(&String::from("-h")); - up.set_api(&host); - - let res = up.upload_song_with_metadata(&token, &s, &cover_art, &album); - let tken = Runtime::new().unwrap().block_on(res); - - match &tken { - Ok(o) => { - println!("Successfully sent {:?}", o); - Ok(()) - } - Err(er) => { - println!("Some error {:?}", er); - Err(std::io::Error::new( + _ => { + return Err(std::io::Error::new( std::io::ErrorKind::Other, - er.to_string(), - )) + "No sutitable file found".to_owned(), + )); } } } @@ -459,43 +472,16 @@ impl CommitManager { let mut cover_art = icarus_models::coverart::CoverArt { id: 0, title: String::new(), - path: String::new(), + path: match self.get_cover_art_path(&sourcepath) { + Ok(o) => o, + Err(_) => String::new(), + }, data: Vec::new(), }; - let mut filenames: Vec = Vec::new(); - let mut metadatapath: String = String::new(); - - // iterate files in metadatapath - let path = std::path::Path::new(directory_path); - - for entry in read_dir(path)? { - let entry = entry?; - - let file_type = entry.file_type(); - let file_name = entry.file_name(); - - println!("file type: {:?}", file_type); - println!("file name: {:?}", file_name); - - match self.find_file_extension(&file_name) { - En::ImageFile => { - let directory_part = sourcepath.clone(); - let fname = utilities::string::o_to_string(&file_name); - let fullpath = directory_part + "/" + &fname.unwrap(); - cover_art.path = fullpath; - } - En::MetadataFile => { - let directory_part = sourcepath.clone(); - let fname = utilities::string::o_to_string(&file_name); - metadatapath = directory_part + "/" + &fname.unwrap(); - } - _ => {} - } - } - - filenames.sort(); - let songs = self.get_songs(&metadatapath, &sourcepath); - let album = self.retrieve_metadata(&metadatapath); + let metadatapath = match self.get_metadata_path(&sourcepath) { + Ok(o) => o, + Err(_) => String::new(), + }; let mut up = syncers::upload::Upload::default(); let host = self.ica_action.retrieve_flag_value(&String::from("-h")); @@ -505,13 +491,13 @@ impl CommitManager { println!(""); - match songs { + match self.get_songs(&metadatapath, &sourcepath) { Ok(sngs) => { for song in sngs { - println!("Title: {:?}", song.title); - println!("Path: {:?}", song.song_path()); - let res = up.upload_song_with_metadata(&token, &song, &cover_art, &album); - match Runtime::new().unwrap().block_on(res) { + match Runtime::new() + .unwrap() + .block_on(up.upload_song_with_metadata(&token, &song, &cover_art)) + { Ok(o) => { println!("Response: {:?}", o); } @@ -575,6 +561,53 @@ impl CommitManager { return En::Other; } + fn get_cover_art_path(&self, directory_path: &String) -> Result { + for entry in read_dir(std::path::Path::new(directory_path))? { + let entry = entry?; + + let file_type = entry.file_type(); + let file_name = entry.file_name(); + + println!("file type: {:?}", file_type); + println!("file name: {:?}", file_name); + + match self.find_file_extension(&file_name) { + En::ImageFile => { + let directory_part = directory_path.clone(); + let fname = utilities::string::o_to_string(&file_name); + let fullpath = directory_part + "/" + &fname.unwrap(); + return Ok(fullpath); + } + _ => {} + } + } + + Ok(String::new()) + } + + fn get_metadata_path(&self, directory_path: &String) -> Result { + for entry in read_dir(std::path::Path::new(directory_path))? { + let entry = entry?; + + let file_type = entry.file_type(); + let file_name = entry.file_name(); + + println!("file type: {:?}", file_type); + println!("file name: {:?}", file_name); + + match self.find_file_extension(&file_name) { + En::MetadataFile => { + let directory_part = directory_path.clone(); + let fname = utilities::string::o_to_string(&file_name); + return Ok(directory_part + "/" + &fname.unwrap()); + } + _ => {} + } + } + + Ok(String::new()) + } + fn _check_for_no_confirm(&self) -> bool { for flag in self.ica_action.flags.iter() { if flag.flag == "-nc" { @@ -583,21 +616,4 @@ impl CommitManager { } return false; } - - fn retrieve_metadata(&self, path: &String) -> icarus_models::album::collection::Album { - let content = self.retrieve_file_content(&path); - let val = content.unwrap(); - - let converted = serde_json::from_str(&val); - - match &converted { - Ok(_) => println!("Good!"), - Err(er) => println!("Error {:?}", er), - } - return converted.unwrap(); - } - - fn retrieve_file_content(&self, path: &String) -> Result { - return std::fs::read_to_string(path); - } } diff --git a/src/syncers/upload.rs b/src/syncers/upload.rs index 2d558ca..a440208 100644 --- a/src/syncers/upload.rs +++ b/src/syncers/upload.rs @@ -1,9 +1,7 @@ use std::default::Default; -use http::HeaderMap; use http::HeaderValue; use reqwest; -use serde::{Deserialize, Serialize}; use crate::models; @@ -11,29 +9,6 @@ pub struct Upload { pub api: models::api::API, } -#[derive(Debug, Deserialize, Serialize)] -struct Song { - title: String, - album: String, - artist: String, - album_artist: String, - year: i32, - genre: String, - duration: i32, - track: i32, - track_count: i32, - disc: i32, - disc_count: i32, - #[serde(skip_serializing)] - songpath: String, -} - -impl Song { - pub fn to_metadata_json(&self) -> Result { - return serde_json::to_string_pretty(&self); - } -} - impl Default for Upload { fn default() -> Self { Upload { @@ -48,11 +23,10 @@ impl Upload { token: &icarus_models::token::AccessToken, song: &icarus_models::song::Song, cover: &icarus_models::coverart::CoverArt, - album: &icarus_models::album::collection::Album, ) -> Result { self.api.endpoint = String::from("song/data/upload/with/data"); let url = self.retrieve_url(); - let new_song = self.initialize_song(&song, &album); + // let new_song = self.initialize_song(&song, &album); let access_token = token.bearer_token(); if url.is_empty() { @@ -61,7 +35,7 @@ impl Upload { println!("Url: {}", url); println!("Token: {}", access_token); - println!("Path: {:?}", new_song.songpath); + println!("Path: {:?}", song.song_path()); let mut headers = reqwest::header::HeaderMap::new(); headers.insert( @@ -70,7 +44,7 @@ impl Upload { ); headers.insert(reqwest::header::ACCEPT, HeaderValue::from_static("*/*")); - let form = self.init_form(&new_song, &cover); + let form = self.init_form(&song, &cover); let client = reqwest::Client::builder().build().unwrap(); match client .post(url) @@ -88,47 +62,21 @@ impl Upload { } } - fn _initialize_form( - &self, - song_raw_data: Vec, - cover_raw_data: Vec, - song_detail: String, - ) -> reqwest::multipart::Form { - let mut headers = HeaderMap::new(); - headers.insert( - http::header::CONTENT_TYPE, - http::HeaderValue::from_static("application/octet-stream"), - ); - - let file = reqwest::multipart::Part::bytes(song_raw_data).headers(headers); - let mut headers_i = HeaderMap::new(); - headers_i.insert( - http::header::CONTENT_TYPE, - http::HeaderValue::from_static("image/jpeg"), - ); - - let cover = reqwest::multipart::Part::bytes(cover_raw_data).headers(headers_i); - - let mut song_filename = String::from("audio"); - song_filename += icarus_models::constants::DEFAULTMUSICEXTENSION; - let mut cover_filename = String::from("cover"); - cover_filename += icarus_models::constants::JPGEXTENSION; - - return reqwest::multipart::Form::new() - .part("cover", cover.file_name(cover_filename)) - .text("metadata", song_detail) - .part("file", file.file_name(song_filename)); - } - fn init_form( &self, - song: &Song, + song: &icarus_models::song::Song, cover: &icarus_models::coverart::CoverArt, ) -> reqwest::multipart::Form { - let songpath = song.songpath.clone(); + let songpath = match song.song_path() { + Ok(s) => s, + Err(_) => String::new(), + }; let coverpath = cover.path.clone(); println!("Cover path: {:?}", coverpath); - let song_detail = song.to_metadata_json().unwrap(); + let song_detail = match song.to_metadata_json(true) { + Ok(s) => s, + Err(_) => String::new(), + }; println!("\n{}\n", song_detail); @@ -177,29 +125,4 @@ impl Upload { return url; } - - fn initialize_song( - &self, - song: &icarus_models::song::Song, - album: &icarus_models::album::collection::Album, - ) -> Song { - let dur = song.duration.clone(); - println!("Duration: {}", dur); - - return Song { - title: String::from(&song.title.clone()), - album: album.title.clone(), - artist: String::from(&song.artist.clone().clone()), - album_artist: album.artist.clone(), - year: album.year.clone(), - genre: album.genre.clone(), - // duration: f64::round(dur) as i32, - duration: dur, - track: (song.track.clone()), - track_count: album.track_count.clone(), - disc: song.disc.clone(), - disc_count: album.disc_count.clone(), - songpath: song.directory.clone() + "/" + &song.filename.clone(), - }; - } } -- 2.47.3 From 63bc041f0b9f86a04285edecfd9f4c63397eada0 Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 25 Mar 2025 21:20:35 -0400 Subject: [PATCH 2/7] Cleanup --- src/syncers/delete.rs | 1 - src/syncers/upload.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/src/syncers/delete.rs b/src/syncers/delete.rs index d5eb5e5..7370b49 100644 --- a/src/syncers/delete.rs +++ b/src/syncers/delete.rs @@ -40,7 +40,6 @@ impl Delete { println!("Success!"); let s = response.json::().await; match s { - // Ok(parsed) => { sng = parsed; } diff --git a/src/syncers/upload.rs b/src/syncers/upload.rs index a440208..a7666d2 100644 --- a/src/syncers/upload.rs +++ b/src/syncers/upload.rs @@ -26,7 +26,6 @@ impl Upload { ) -> Result { self.api.endpoint = String::from("song/data/upload/with/data"); let url = self.retrieve_url(); - // let new_song = self.initialize_song(&song, &album); let access_token = token.bearer_token(); if url.is_empty() { -- 2.47.3 From f70359c04d9a40ec253047fbbc107b0aa526be20 Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 25 Mar 2025 22:13:50 -0400 Subject: [PATCH 3/7] Added test and moved test files --- src/main.rs | 1 + src/managers/action_managers.rs | 3 +- src/tests/mod.rs | 1 + .../tests}/sample2_tracks/album.json | 0 .../tests}/sample2_tracks/coverart.jpg | Bin .../tests}/sample2_tracks/track01.flac | Bin .../tests}/sample2_tracks/track02.flac | Bin .../tests}/sample2_tracks/track03.flac | Bin src/tests/tests.rs | 59 ++++++++++++++++++ 9 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 src/tests/mod.rs rename {tests => src/tests}/sample2_tracks/album.json (100%) rename {tests => src/tests}/sample2_tracks/coverart.jpg (100%) rename {tests => src/tests}/sample2_tracks/track01.flac (100%) rename {tests => src/tests}/sample2_tracks/track02.flac (100%) rename {tests => src/tests}/sample2_tracks/track03.flac (100%) create mode 100644 src/tests/tests.rs diff --git a/src/main.rs b/src/main.rs index 5c9e438..54e38c3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,6 +3,7 @@ mod managers; mod models; mod parsers; mod syncers; +mod tests; mod utilities; use std::env; diff --git a/src/managers/action_managers.rs b/src/managers/action_managers.rs index b4d3553..867687e 100644 --- a/src/managers/action_managers.rs +++ b/src/managers/action_managers.rs @@ -207,7 +207,6 @@ mod tests { && action != "upload-meta") ); - let mut all_flags_found = false; let mut found_count = 0; let mut flags_already_read = Vec::new(); @@ -228,7 +227,7 @@ mod tests { } } - all_flags_found = found_count == 3; + let all_flags_found = found_count == 3; assert_eq!(found_count, 3, "Three flags are required: -u, -p, -h"); assert!(all_flags_found, "All flags have not been found"); diff --git a/src/tests/mod.rs b/src/tests/mod.rs new file mode 100644 index 0000000..15ab560 --- /dev/null +++ b/src/tests/mod.rs @@ -0,0 +1 @@ +pub mod tests; diff --git a/tests/sample2_tracks/album.json b/src/tests/sample2_tracks/album.json similarity index 100% rename from tests/sample2_tracks/album.json rename to src/tests/sample2_tracks/album.json diff --git a/tests/sample2_tracks/coverart.jpg b/src/tests/sample2_tracks/coverart.jpg similarity index 100% rename from tests/sample2_tracks/coverart.jpg rename to src/tests/sample2_tracks/coverart.jpg diff --git a/tests/sample2_tracks/track01.flac b/src/tests/sample2_tracks/track01.flac similarity index 100% rename from tests/sample2_tracks/track01.flac rename to src/tests/sample2_tracks/track01.flac diff --git a/tests/sample2_tracks/track02.flac b/src/tests/sample2_tracks/track02.flac similarity index 100% rename from tests/sample2_tracks/track02.flac rename to src/tests/sample2_tracks/track02.flac diff --git a/tests/sample2_tracks/track03.flac b/src/tests/sample2_tracks/track03.flac similarity index 100% rename from tests/sample2_tracks/track03.flac rename to src/tests/sample2_tracks/track03.flac diff --git a/src/tests/tests.rs b/src/tests/tests.rs new file mode 100644 index 0000000..58bc2ca --- /dev/null +++ b/src/tests/tests.rs @@ -0,0 +1,59 @@ +// mod managers; +// mod tests; + +// use i +// use crate::icarus_dm::managers; +// use icarus-dm; +// use managers; + +mod tests { + + #[cfg(test)] + fn test_song_prep_upload() { + use crate::managers; + + let meta_path = String::from("tests/sample2_tracks/album.json"); + + if !std::path::Path::new(&meta_path).exists() { + assert!(false, "File does not exists: {:?}", meta_path); + } + + match icarus_models::album::collection::parse_album(&meta_path) { + Ok(album) => { + for track in 1..3 { + let directory_path = std::path::Path::new(&meta_path); + let directory: String = directory_path.parent().unwrap().display().to_string(); + // let track = 1; + let filename: String = if track < 10 { + String::from("track0") + + &track.to_string() + + icarus_models::constants::DEFAULTMUSICEXTENSION + } else { + String::from("track") + + &track.to_string() + + icarus_models::constants::DEFAULTMUSICEXTENSION + }; + let disc = 1; + match managers::commit_manager::retrieve_song( + &album, track, disc, &directory, &filename, + ) { + Ok(song) => match song.to_data() { + Ok(_) => { + print!("Success"); + } + Err(err) => { + assert!(false, "Error: {:?}", err.to_string()); + } + }, + Err(err) => { + assert!(false, "Error: {:?}", err.to_string()); + } + } + } + } + Err(err) => { + assert!(false, "Error: {:?}", err.to_string()); + } + } + } +} -- 2.47.3 From 9c3833f1c46cd8251537ee7617410deb7926a088 Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 25 Mar 2025 22:15:22 -0400 Subject: [PATCH 4/7] Cleanup --- src/tests/tests.rs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/tests/tests.rs b/src/tests/tests.rs index 58bc2ca..b020a27 100644 --- a/src/tests/tests.rs +++ b/src/tests/tests.rs @@ -1,11 +1,3 @@ -// mod managers; -// mod tests; - -// use i -// use crate::icarus_dm::managers; -// use icarus-dm; -// use managers; - mod tests { #[cfg(test)] -- 2.47.3 From 949b3e7d8ca58bdd30c92359cc94023707a06f5e Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 25 Mar 2025 22:17:30 -0400 Subject: [PATCH 5/7] Removed test mod file --- src/main.rs | 1 - src/tests/mod.rs | 1 - 2 files changed, 2 deletions(-) delete mode 100644 src/tests/mod.rs diff --git a/src/main.rs b/src/main.rs index 54e38c3..5c9e438 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,7 +3,6 @@ mod managers; mod models; mod parsers; mod syncers; -mod tests; mod utilities; use std::env; diff --git a/src/tests/mod.rs b/src/tests/mod.rs deleted file mode 100644 index 15ab560..0000000 --- a/src/tests/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod tests; -- 2.47.3 From 3cf50a13444b718b0bda8ba893c906ec84c23a7d Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 25 Mar 2025 22:27:36 -0400 Subject: [PATCH 6/7] Tests reorganizing --- src/main.rs | 113 ++++++++++++++++++ src/managers/action_managers.rs | 67 ----------- src/tests/tests.rs | 4 +- .../tests => tests}/sample2_tracks/album.json | 0 .../sample2_tracks/coverart.jpg | Bin .../sample2_tracks/track01.flac | Bin .../sample2_tracks/track02.flac | Bin .../sample2_tracks/track03.flac | Bin 8 files changed, 115 insertions(+), 69 deletions(-) rename {src/tests => tests}/sample2_tracks/album.json (100%) rename {src/tests => tests}/sample2_tracks/coverart.jpg (100%) rename {src/tests => tests}/sample2_tracks/track01.flac (100%) rename {src/tests => tests}/sample2_tracks/track02.flac (100%) rename {src/tests => tests}/sample2_tracks/track03.flac (100%) diff --git a/src/main.rs b/src/main.rs index 5c9e438..69039e8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -31,3 +31,116 @@ fn main() { cmt_mgr.commit_action(); } + +#[cfg(test)] +mod tests { + use crate::managers; + + #[test] + fn test_song_prep_upload() { + let meta_path = String::from("tests/sample2_tracks/album.json"); + + if !std::path::Path::new(&meta_path).exists() { + assert!(false, "File does not exists: {:?}", meta_path); + } + + match icarus_models::album::collection::parse_album(&meta_path) { + Ok(album) => { + for track in 1..3 { + let directory_path = std::path::Path::new(&meta_path); + let directory: String = directory_path.parent().unwrap().display().to_string(); + let filename: String = if track < 10 { + String::from("track0") + + &track.to_string() + + icarus_models::constants::DEFAULTMUSICEXTENSION + } else { + String::from("track") + + &track.to_string() + + icarus_models::constants::DEFAULTMUSICEXTENSION + }; + let disc = 1; + match managers::commit_manager::retrieve_song( + &album, track, disc, &directory, &filename, + ) { + Ok(song) => match song.to_data() { + Ok(_) => { + print!("Success"); + } + Err(err) => { + assert!(false, "Error: {:?}", err.to_string()); + } + }, + Err(err) => { + assert!(false, "Error: {:?}", err.to_string()); + } + } + } + } + Err(err) => { + assert!(false, "Error: {:?}", err.to_string()); + } + } + } + + #[test] + fn test_minimum_action_and_args() { + let args: Vec = vec![ + "icarus-dm".to_string(), + "download".to_string(), + "-u".to_string(), + "jamborie".to_string(), + "-p".to_string(), + "somethingsecr3t!".to_string(), + "-h".to_string(), + "https://music-server.com".to_string(), + ]; + let arg_count = args.len() as i32; + let minimum_arg_count = 8; + assert!(arg_count >= minimum_arg_count); + + let mut act_mgr = managers::action_managers::ActionManager { + action: String::new(), + flags: Vec::new(), + params: args, + param_count: arg_count, + }; + act_mgr.initialize(); + let ica = act_mgr.retrieve_icarus_action(); + let action = &ica.action; + let flags = &ica.flags; + + assert!(action != ""); + assert!(flags.len() > 2); + assert!( + !(action != "download" + && action != "upload" + && action != "retrieve" + && action != "upload-meta") + ); + + let mut found_count = 0; + let mut flags_already_read = Vec::new(); + + for flag in flags { + if flags_already_read.contains(&flag.flag) { + continue; + } + + if flag.flag == "-u" { + found_count += 1; + flags_already_read.push(flag.flag.clone()); + } else if flag.flag == "-p" { + found_count += 1; + flags_already_read.push(flag.flag.clone()); + } else if flag.flag == "-h" { + found_count += 1; + flags_already_read.push(flag.flag.clone()); + } + } + + let all_flags_found = found_count == 3; + + assert_eq!(found_count, 3, "Three flags are required: -u, -p, -h"); + assert!(all_flags_found, "All flags have not been found"); + } +} diff --git a/src/managers/action_managers.rs b/src/managers/action_managers.rs index 867687e..42ed6ca 100644 --- a/src/managers/action_managers.rs +++ b/src/managers/action_managers.rs @@ -166,70 +166,3 @@ impl ActionManager { return parsed; } } - -#[cfg(test)] -mod tests { - use crate::managers::action_managers::ActionManager; - - #[test] - fn minimum_action_and_args() { - let args: Vec = vec![ - "icarus-dm".to_string(), - "download".to_string(), - "-u".to_string(), - "jamborie".to_string(), - "-p".to_string(), - "somethingsecr3t!".to_string(), - "-h".to_string(), - "https://music-server.com".to_string(), - ]; - let arg_count = args.len() as i32; - let minimum_arg_count = 8; - assert!(arg_count >= minimum_arg_count); - - let mut act_mgr = ActionManager { - action: String::new(), - flags: Vec::new(), - params: args, - param_count: arg_count, - }; - act_mgr.initialize(); - let ica = act_mgr.retrieve_icarus_action(); - let action = &ica.action; - let flags = &ica.flags; - - assert!(action != ""); - assert!(flags.len() > 2); - assert!( - !(action != "download" - && action != "upload" - && action != "retrieve" - && action != "upload-meta") - ); - - let mut found_count = 0; - let mut flags_already_read = Vec::new(); - - for flag in flags { - if flags_already_read.contains(&flag.flag) { - continue; - } - - if flag.flag == "-u" { - found_count += 1; - flags_already_read.push(flag.flag.clone()); - } else if flag.flag == "-p" { - found_count += 1; - flags_already_read.push(flag.flag.clone()); - } else if flag.flag == "-h" { - found_count += 1; - flags_already_read.push(flag.flag.clone()); - } - } - - let all_flags_found = found_count == 3; - - assert_eq!(found_count, 3, "Three flags are required: -u, -p, -h"); - assert!(all_flags_found, "All flags have not been found"); - } -} diff --git a/src/tests/tests.rs b/src/tests/tests.rs index b020a27..85fbf8c 100644 --- a/src/tests/tests.rs +++ b/src/tests/tests.rs @@ -1,6 +1,7 @@ + #[cfg(test)] mod tests { - #[cfg(test)] + #[test] fn test_song_prep_upload() { use crate::managers; @@ -15,7 +16,6 @@ mod tests { for track in 1..3 { let directory_path = std::path::Path::new(&meta_path); let directory: String = directory_path.parent().unwrap().display().to_string(); - // let track = 1; let filename: String = if track < 10 { String::from("track0") + &track.to_string() diff --git a/src/tests/sample2_tracks/album.json b/tests/sample2_tracks/album.json similarity index 100% rename from src/tests/sample2_tracks/album.json rename to tests/sample2_tracks/album.json diff --git a/src/tests/sample2_tracks/coverart.jpg b/tests/sample2_tracks/coverart.jpg similarity index 100% rename from src/tests/sample2_tracks/coverart.jpg rename to tests/sample2_tracks/coverart.jpg diff --git a/src/tests/sample2_tracks/track01.flac b/tests/sample2_tracks/track01.flac similarity index 100% rename from src/tests/sample2_tracks/track01.flac rename to tests/sample2_tracks/track01.flac diff --git a/src/tests/sample2_tracks/track02.flac b/tests/sample2_tracks/track02.flac similarity index 100% rename from src/tests/sample2_tracks/track02.flac rename to tests/sample2_tracks/track02.flac diff --git a/src/tests/sample2_tracks/track03.flac b/tests/sample2_tracks/track03.flac similarity index 100% rename from src/tests/sample2_tracks/track03.flac rename to tests/sample2_tracks/track03.flac -- 2.47.3 From d3e4a7783c8874cda8ed55955cfe7e0925461ed2 Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 25 Mar 2025 22:29:14 -0400 Subject: [PATCH 7/7] Removed test file --- src/tests/tests.rs | 51 ---------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 src/tests/tests.rs diff --git a/src/tests/tests.rs b/src/tests/tests.rs deleted file mode 100644 index 85fbf8c..0000000 --- a/src/tests/tests.rs +++ /dev/null @@ -1,51 +0,0 @@ - #[cfg(test)] -mod tests { - - #[test] - fn test_song_prep_upload() { - use crate::managers; - - let meta_path = String::from("tests/sample2_tracks/album.json"); - - if !std::path::Path::new(&meta_path).exists() { - assert!(false, "File does not exists: {:?}", meta_path); - } - - match icarus_models::album::collection::parse_album(&meta_path) { - Ok(album) => { - for track in 1..3 { - let directory_path = std::path::Path::new(&meta_path); - let directory: String = directory_path.parent().unwrap().display().to_string(); - let filename: String = if track < 10 { - String::from("track0") - + &track.to_string() - + icarus_models::constants::DEFAULTMUSICEXTENSION - } else { - String::from("track") - + &track.to_string() - + icarus_models::constants::DEFAULTMUSICEXTENSION - }; - let disc = 1; - match managers::commit_manager::retrieve_song( - &album, track, disc, &directory, &filename, - ) { - Ok(song) => match song.to_data() { - Ok(_) => { - print!("Success"); - } - Err(err) => { - assert!(false, "Error: {:?}", err.to_string()); - } - }, - Err(err) => { - assert!(false, "Error: {:?}", err.to_string()); - } - } - } - } - Err(err) => { - assert!(false, "Error: {:?}", err.to_string()); - } - } - } -} -- 2.47.3