From 14fb2fd1224c760ebaa123306c7c08107ae00029 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 2 Jul 2025 18:28:00 -0400 Subject: [PATCH] More warning fixes --- src/managers/commit_manager.rs | 12 ++++++------ src/managers/token_manager.rs | 4 ++-- src/models/api.rs | 13 ++----------- src/models/flags.rs | 10 +--------- src/models/icarus_action.rs | 13 ++----------- src/models/upload_form.rs | 10 +--------- src/parsers/api_parser.rs | 6 +++--- src/syncers/common.rs | 6 +++--- src/syncers/delete.rs | 2 +- src/syncers/download.rs | 2 +- src/syncers/retrieve_records.rs | 4 ++-- src/syncers/upload.rs | 4 ++-- 12 files changed, 26 insertions(+), 60 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 8357384..8c25568 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -136,7 +136,7 @@ impl CommitManager { fn delete_song(&self) { let mut prsr = parsers::api_parser::APIParser { ica_act: self.ica_action.clone(), - api: models::api::API::default(), + api: models::api::Api::default(), }; prsr.parse_api(); let api = prsr.retrieve_api(); @@ -178,7 +178,7 @@ impl CommitManager { let id = uuid::Uuid::from_str(dwn.as_str()).unwrap(); let mut prsr = parsers::api_parser::APIParser { - api: models::api::API::default(), + api: models::api::Api::default(), ica_act: self.ica_action.clone(), }; prsr.parse_api(); @@ -224,7 +224,7 @@ impl CommitManager { } let mut prsr = parsers::api_parser::APIParser { - api: models::api::API::default(), + api: models::api::Api::default(), ica_act: self.ica_action.clone(), }; prsr.parse_api(); @@ -254,7 +254,7 @@ impl CommitManager { panic!("Not supported"); } - fn parse_token(&self, api: &models::api::API) -> icarus_models::token::AccessToken { + fn parse_token(&self, api: &models::api::Api) -> icarus_models::token::AccessToken { println!("Fetching token"); let mut usr_mgr: managers::user_manager::UserManager = @@ -319,7 +319,7 @@ impl CommitManager { cover_path: &String, ) -> Result<()> { let mut prsr = parsers::api_parser::APIParser { - api: models::api::API::default(), + api: models::api::Api::default(), ica_act: self.ica_action.clone(), }; prsr.parse_api(); @@ -458,7 +458,7 @@ impl CommitManager { fn multi_target_upload(&mut self, sourcepath: &String) -> std::io::Result<()> { let mut prsr = parsers::api_parser::APIParser { - api: models::api::API::default(), + api: models::api::Api::default(), ica_act: self.ica_action.clone(), }; prsr.parse_api(); diff --git a/src/managers/token_manager.rs b/src/managers/token_manager.rs index b66b6b8..1dac492 100644 --- a/src/managers/token_manager.rs +++ b/src/managers/token_manager.rs @@ -4,14 +4,14 @@ use crate::models; pub struct TokenManager { pub user: icarus_models::user::User, - pub api: models::api::API, + pub api: models::api::Api, } impl Default for TokenManager { fn default() -> Self { let mut token = TokenManager { user: icarus_models::user::User::default(), - api: models::api::API::default(), + api: models::api::Api::default(), }; token.init(); diff --git a/src/models/api.rs b/src/models/api.rs index aeb9269..8777317 100644 --- a/src/models/api.rs +++ b/src/models/api.rs @@ -2,19 +2,10 @@ use std::default::Default; use serde::{Deserialize, Serialize}; -#[derive(Clone, Debug, Deserialize, Serialize)] -pub struct API { +#[derive(Clone, Debug, Default, Deserialize, Serialize)] +pub struct Api { pub url: String, pub endpoint: String, pub version: String, } -impl Default for API { - fn default() -> Self { - API { - url: String::new(), - endpoint: String::new(), - version: String::new(), - } - } -} diff --git a/src/models/flags.rs b/src/models/flags.rs index d51f2b3..43a5ea0 100644 --- a/src/models/flags.rs +++ b/src/models/flags.rs @@ -2,17 +2,9 @@ use std::default::Default; use serde::{Deserialize, Serialize}; -#[derive(Clone, Debug, Deserialize, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Serialize)] pub struct Flags { pub flag: String, pub value: String, } -impl Default for Flags { - fn default() -> Self { - Flags { - flag: String::new(), - value: String::new(), - } - } -} diff --git a/src/models/icarus_action.rs b/src/models/icarus_action.rs index 4ef6aad..3de451b 100644 --- a/src/models/icarus_action.rs +++ b/src/models/icarus_action.rs @@ -4,21 +4,12 @@ use serde::{Deserialize, Serialize}; use crate::models; -#[derive(Clone, Debug, Deserialize, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Serialize)] pub struct IcarusAction { pub action: String, pub flags: Vec, } -impl Default for IcarusAction { - fn default() -> Self { - IcarusAction { - action: String::new(), - flags: Vec::new(), - } - } -} - impl IcarusAction { pub fn retrieve_flag_value(&self, flag: &String) -> String { let mut val: String = String::new(); @@ -30,7 +21,7 @@ impl IcarusAction { } } - return val; + val } pub fn print_action_and_flags(&self) { diff --git a/src/models/upload_form.rs b/src/models/upload_form.rs index ef90173..a427fab 100644 --- a/src/models/upload_form.rs +++ b/src/models/upload_form.rs @@ -2,17 +2,9 @@ use std::default::Default; use serde::{Deserialize, Serialize}; -#[derive(Debug, Deserialize, Serialize)] +#[derive(Debug, Default, Deserialize, Serialize)] pub struct UploadForm { pub url: Option, pub filepath: Option, } -impl Default for UploadForm { - fn default() -> Self { - UploadForm { - url: None, - filepath: None, - } - } -} diff --git a/src/parsers/api_parser.rs b/src/parsers/api_parser.rs index 7a8396f..b12c232 100644 --- a/src/parsers/api_parser.rs +++ b/src/parsers/api_parser.rs @@ -2,13 +2,13 @@ use crate::models; #[derive(Clone, Debug)] pub struct APIParser { - pub api: models::api::API, + pub api: models::api::Api, pub ica_act: models::icarus_action::IcarusAction, } impl APIParser { - pub fn retrieve_api(&self) -> models::api::API { - return self.api.clone(); + pub fn retrieve_api(&self) -> models::api::Api { + self.api.clone() } pub fn parse_api(&mut self) { diff --git a/src/syncers/common.rs b/src/syncers/common.rs index fe3b362..a2c345a 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: &uuid::Uuid) -> 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 { @@ -8,13 +8,13 @@ pub fn retrieve_url(api: &models::api::API, with_id: bool, id: &uuid::Uuid) -> S } } -fn retrieve_url_reg(api: &models::api::API) -> String { +fn retrieve_url_reg(api: &models::api::Api) -> String { let url = format!("{}/api/{}/{}/", api.url, api.version, api.endpoint); url } -fn retrieve_url_with_id(api: &models::api::API, id: &uuid::Uuid) -> String { +fn retrieve_url_with_id(api: &models::api::Api, id: &uuid::Uuid) -> String { let url = format!("{}/api/{}/{}/{}", api.url, api.version, api.endpoint, id); url diff --git a/src/syncers/delete.rs b/src/syncers/delete.rs index 1420101..101d19f 100644 --- a/src/syncers/delete.rs +++ b/src/syncers/delete.rs @@ -7,7 +7,7 @@ use crate::syncers; #[derive(Clone, Debug, Default)] pub struct Delete { - pub api: models::api::API, + pub api: models::api::Api, } impl Delete { diff --git a/src/syncers/download.rs b/src/syncers/download.rs index 4009ccc..d994e3e 100644 --- a/src/syncers/download.rs +++ b/src/syncers/download.rs @@ -5,7 +5,7 @@ use crate::syncers; #[derive(Default)] pub struct Download { - pub api: models::api::API, + pub api: models::api::Api, } #[derive(Debug)] diff --git a/src/syncers/retrieve_records.rs b/src/syncers/retrieve_records.rs index 59b58c4..dc906b8 100644 --- a/src/syncers/retrieve_records.rs +++ b/src/syncers/retrieve_records.rs @@ -6,7 +6,7 @@ use crate::syncers; #[derive(Default)] pub struct RetrieveRecords { - pub api: models::api::API, + pub api: models::api::Api, } impl RetrieveRecords { @@ -28,7 +28,7 @@ impl RetrieveRecords { match response.status() { reqwest::StatusCode::OK => { - // on success, parse our JSON to an APIResponse + // on success, parse our JSON to an API Response match response.json::>().await { Ok(parsed) => Ok(parsed), Err(err) => Err(std::io::Error::other(err.to_string())), diff --git a/src/syncers/upload.rs b/src/syncers/upload.rs index ca8b7ff..473dd75 100644 --- a/src/syncers/upload.rs +++ b/src/syncers/upload.rs @@ -8,7 +8,7 @@ use crate::syncers; #[derive(Default)] pub struct Upload { - pub api: models::api::API, + pub api: models::api::Api, } impl Upload { @@ -83,7 +83,7 @@ impl Upload { } pub fn set_api(&mut self, host: &str) { - let api = models::api::API { + let api = models::api::Api { url: host.to_owned(), version: String::from("v1"), endpoint: String::new(),