From b2e246d175a1ebe280672b43f2284a524651847d Mon Sep 17 00:00:00 2001 From: phoenix Date: Thu, 13 Mar 2025 20:49:29 -0400 Subject: [PATCH] Some refactoring --- src/managers/commit_manager.rs | 2 ++ src/managers/token_manager.rs | 2 +- src/models/mod.rs | 3 +-- src/models/user.rs | 26 -------------------------- 4 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 src/models/user.rs diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index a9ce7f5..91918db 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -175,6 +175,7 @@ impl CommitManager { let api = prsr.retrieve_api(); let token = self.parse_token(&api); + println!("Message: {}", token.message.clone().unwrap()); let mut dwn_loader = syncers::download::Download { api: api.clone() }; let mut song = models::song::Song::default(); @@ -248,6 +249,7 @@ impl CommitManager { // new_usr.password = usr_mgr.user.password.clone(); println!("Username: {}", usr_mgr.user.username); + println!("Other: {}", usr_mgr.user.id); let usr = usr_mgr.retrieve_user(); let mut tok_mgr = managers::token_manager::TokenManager { diff --git a/src/managers/token_manager.rs b/src/managers/token_manager.rs index 463471b..240018f 100644 --- a/src/managers/token_manager.rs +++ b/src/managers/token_manager.rs @@ -66,7 +66,7 @@ impl TokenManager { let api = &self.api; let mut url = String::from(&api.url); url += &String::from(&api.endpoint); - url += &String::from("/"); + // url += &String::from("/"); return url; } diff --git a/src/models/mod.rs b/src/models/mod.rs index 986c861..bc27880 100644 --- a/src/models/mod.rs +++ b/src/models/mod.rs @@ -3,5 +3,4 @@ pub mod flags; pub mod icarus_action; pub mod song; pub mod token; -pub mod upload_form; -pub mod user; +pub mod upload_form; \ No newline at end of file diff --git a/src/models/user.rs b/src/models/user.rs deleted file mode 100644 index 3eaeead..0000000 --- a/src/models/user.rs +++ /dev/null @@ -1,26 +0,0 @@ -/* -use std::default::Default; - -use serde::{Deserialize, Serialize}; - -#[derive(Clone, Debug, Deserialize, Serialize)] -pub struct User { - pub username: String, - pub password: String, -} - -impl Default for User { - fn default() -> Self { - User { - username: String::new(), - password: String::new(), - } - } -} - -impl User { - pub fn _to_json(&self) -> Result { - return serde_json::to_string_pretty(&self); - } -} -*/