From a04163ee675104c49c4fdec267970725968dbd53 Mon Sep 17 00:00:00 2001 From: phoenix Date: Thu, 3 Apr 2025 22:31:26 -0400 Subject: [PATCH] Saving changes --- src/managers/commit_manager.rs | 44 ++++++--------------------------- src/managers/token_manager.rs | 2 +- src/syncers/common.rs | 4 +-- src/syncers/delete.rs | 2 +- src/syncers/download.rs | 2 +- src/syncers/retrieve_records.rs | 2 +- src/syncers/upload.rs | 2 +- 7 files changed, 14 insertions(+), 44 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index b464977..3286db3 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -152,7 +152,8 @@ impl CommitManager { let value = &arg.value; if flag == "-D" { - song.id = value.parse::().unwrap(); + song.id = uuid::Uuid::from_str(value.as_str()).unwrap(); + // value.parse::().unwrap(); } } @@ -175,7 +176,7 @@ impl CommitManager { fn download_song(&self) { println!("Deleting song"); let dwn = self.ica_action.retrieve_flag_value(&String::from("-b")); - let id: i32 = dwn.parse::().unwrap(); + let id = uuid::Uuid::from_str(dwn.as_str()).unwrap(); let mut prsr = parsers::api_parser::APIParser { api: models::api::API::default(), @@ -337,7 +338,7 @@ impl CommitManager { } let mut cover_art = icarus_models::coverart::CoverArt { - id: 0, + id: uuid::Uuid::nil(), title: String::new(), path: cover_path.clone(), data: Vec::new(), @@ -430,7 +431,7 @@ impl CommitManager { }; songs.push(icarus_models::song::Song { - id: -1, + id: uuid::Uuid::nil(), title: track.title.clone(), artist: track.artist.clone(), disc: track.disc.clone(), @@ -471,15 +472,8 @@ impl CommitManager { panic!("Directory does not exist"); } - let mut cover_art = icarus_models::coverart::CoverArt { - id: 0, - title: String::new(), - path: match self.get_cover_art_path(&sourcepath) { - Ok(o) => o, - Err(_) => String::new(), - }, - data: Vec::new(), - }; + let mut cover_art = + icarus_models::coverart::init::init_coverart_only_path(sourcepath.clone()); let metadatapath = match self.get_metadata_path(&sourcepath) { Ok(o) => o, Err(_) => String::new(), @@ -565,30 +559,6 @@ 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?; diff --git a/src/managers/token_manager.rs b/src/managers/token_manager.rs index ef65c81..b66b6b8 100644 --- a/src/managers/token_manager.rs +++ b/src/managers/token_manager.rs @@ -29,7 +29,7 @@ impl TokenManager { println!("URL: {}", url); let mut token = icarus_models::token::AccessToken { - user_id: -1, + user_id: uuid::Uuid::nil(), username: String::new(), token: String::new(), token_type: String::new(), diff --git a/src/syncers/common.rs b/src/syncers/common.rs index 9fde0dd..f960074 100644 --- a/src/syncers/common.rs +++ b/src/syncers/common.rs @@ -1,6 +1,6 @@ use crate::models; -pub fn retrieve_url(api: &models::api::API, with_id: bool, id: i32) -> String { +pub fn retrieve_url(api: &models::api::API, with_id: bool, id: &uuid::Uuid) -> String { if with_id { retrieve_url_with_id(&api, id) } else { @@ -19,7 +19,7 @@ fn retrieve_url_reg(api: &models::api::API) -> String { return url; } -fn retrieve_url_with_id(api: &models::api::API, id: i32) -> String { +fn retrieve_url_with_id(api: &models::api::API, id: &uuid::Uuid) -> String { let mut url: String = String::from(&api.url); url += &String::from("api/"); url += &String::from(&api.version); diff --git a/src/syncers/delete.rs b/src/syncers/delete.rs index f72561b..a62f24b 100644 --- a/src/syncers/delete.rs +++ b/src/syncers/delete.rs @@ -25,7 +25,7 @@ impl Delete { song: &icarus_models::song::Song, ) -> Result { self.api.endpoint = "song/data/delete".to_owned(); - let url = syncers::common::retrieve_url(&self.api, true, song.id); + let url = syncers::common::retrieve_url(&self.api, true, &song.id); let client = reqwest::Client::builder().build().unwrap(); let access_token = token.bearer_token(); let response = client diff --git a/src/syncers/download.rs b/src/syncers/download.rs index a3a4629..ba1116b 100644 --- a/src/syncers/download.rs +++ b/src/syncers/download.rs @@ -28,7 +28,7 @@ impl Download { song: &icarus_models::song::Song, ) -> Result { self.api.endpoint = String::from("song/data/download"); - let url = syncers::common::retrieve_url(&self.api, true, song.id); + let url = syncers::common::retrieve_url(&self.api, true, &song.id); let access_token = token.bearer_token(); let client = reqwest::Client::builder().build().unwrap(); diff --git a/src/syncers/retrieve_records.rs b/src/syncers/retrieve_records.rs index 84df6eb..f018337 100644 --- a/src/syncers/retrieve_records.rs +++ b/src/syncers/retrieve_records.rs @@ -22,7 +22,7 @@ impl RetrieveRecords { token: &icarus_models::token::AccessToken, ) -> Result, Error> { self.api.endpoint = String::from("song"); - let url = syncers::common::retrieve_url(&self.api, false, 0); + let url = syncers::common::retrieve_url(&self.api, false, &uuid::Uuid::nil()); let access_token = token.bearer_token(); let client = reqwest::Client::builder().build().unwrap(); diff --git a/src/syncers/upload.rs b/src/syncers/upload.rs index f17a6ef..f0ef628 100644 --- a/src/syncers/upload.rs +++ b/src/syncers/upload.rs @@ -26,7 +26,7 @@ impl Upload { cover: &icarus_models::coverart::CoverArt, ) -> Result { self.api.endpoint = String::from("song/data/upload/with/data"); - let url = syncers::common::retrieve_url(&self.api, false, 0); + let url = syncers::common::retrieve_url(&self.api, false, &uuid::Uuid::new_v4()); let access_token = token.bearer_token(); if url.is_empty() {