diff --git a/src/main.rs b/src/main.rs index d23bb23..459620a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,8 @@ mod models; use std::env; use std::process; -// use managers::ActionManager; +// use managers::{ActionManager}; +use crate::src::managers::{ActionManager, CommitManager}; // use models::{user, upload_form}; // use models:: @@ -64,7 +65,8 @@ fn main() { exit_program(-1); } - let act_mgr = managers::ActionManager { + let act_mgr = ActionManager { + // let act_mgr = crate::src::managers::ActionManager { action: String::from(""), flags: Vec::new(), params: args, @@ -75,7 +77,7 @@ fn main() { chosen_act.print_action_and_flags(); - let cmt_mgr = managers::CommitManager { + let cmt_mgr = CommitManager { }; cmt_mgr.commit_action(); diff --git a/src/managers/action_managers.rs b/src/managers/action_managers.rs index 34db17e..6651d9b 100644 --- a/src/managers/action_managers.rs +++ b/src/managers/action_managers.rs @@ -1,7 +1,9 @@ use serde::{Deserialize, Serialize}; +mod managers { + #[derive(Debug, Deserialize, Serialize)] -struct ActionManager { +pub struct ActionManager { action: String, flags: Vec, params: Vec, @@ -50,3 +52,4 @@ impl ActionManager { return Vec::new(); } } +} diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 68c9490..45ce9e7 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -2,8 +2,10 @@ use std::collections::HashMap; use serde::{Deserialize, Serialize}; +mod managers { + #[derive(Debug, Deserialize, Serialize)] -struct CommitManager { +pub struct CommitManager { action: String, flags: Vec, params: Vec, @@ -11,7 +13,7 @@ struct CommitManager { ica_action: models::IcarusAction, } -struct Album { +pub struct Album { pub title: String, pub album_artist: String, pub genre: String, @@ -90,3 +92,4 @@ impl CommitManager { return String::from(""); } } +} diff --git a/src/managers/user_manager.rs b/src/managers/user_manager.rs index 217c374..71fb827 100644 --- a/src/managers/user_manager.rs +++ b/src/managers/user_manager.rs @@ -1,7 +1,9 @@ use serde::{Deserialize, Serialize}; +mod managers { + #[derive(Debug, Deserialize, Serialize)] -struct UserManager { +pub struct UserManager { user: models::User, ica_action: models::IcarusAction, } @@ -19,3 +21,4 @@ impl UserManager { fn parse_user_from_actions(&self) { } } +} diff --git a/src/models/api.rs b/src/models/api.rs index 4df4aa5..c770b20 100644 --- a/src/models/api.rs +++ b/src/models/api.rs @@ -1,8 +1,11 @@ use serde::{Deserialize, Serialize}; +mod models { + #[derive(Debug, Deserialize, Serialize)] -struct API { +pub struct API { pub url: String, pub endpoint: String, pub version: String, } +} diff --git a/src/models/flags.rs b/src/models/flags.rs index 8748262..5090ed6 100644 --- a/src/models/flags.rs +++ b/src/models/flags.rs @@ -1,7 +1,9 @@ use serde::{Deserialize, Serialize}; +mod models { #[derive(Debug, Deserialize, Serialize)] -struct Flags { +pub struct Flags { pub flag: String, pub value: String, } +} diff --git a/src/models/icarus_action.rs b/src/models/icarus_action.rs index 4ea0847..73896b8 100644 --- a/src/models/icarus_action.rs +++ b/src/models/icarus_action.rs @@ -1,7 +1,9 @@ use serde::{Deserialize, Serialize}; +mod models { + #[derive(Debug, Deserialize, Serialize)] -struct IcarusAction { +pub struct IcarusAction { pub action: String, pub flags: Vec, } @@ -16,3 +18,4 @@ impl IcarusAction { pub fn print_action_and_flags(&self) { } } +} diff --git a/src/models/song.rs b/src/models/song.rs index a0fd312..95b268f 100644 --- a/src/models/song.rs +++ b/src/models/song.rs @@ -1,7 +1,9 @@ use serde::{Deserialize, Serialize}; +mod models { + #[derive(Debug, Deserialize, Serialize)] -struct Song { +pub struct Song { pub id: i32, pub title: String, pub artist: String, @@ -41,8 +43,9 @@ impl Song { #[derive(Debug, Deserialize, Serialize)] -struct CoverArt { +pub struct CoverArt { pub id: i32, pub title: String, pub path: String, +} } \ No newline at end of file diff --git a/src/models/token.rs b/src/models/token.rs index 9710ecd..53bca7f 100644 --- a/src/models/token.rs +++ b/src/models/token.rs @@ -1,8 +1,11 @@ use serde::{Deserialize, Serialize}; +mod models { + #[derive(Debug, Deserialize, Serialize)] -struct Token { +pub struct Token { pub access_token: String, pub token_type: String, pub expiration: i32, } +} diff --git a/src/models/upload_form.rs b/src/models/upload_form.rs index 1f78b56..935b835 100644 --- a/src/models/upload_form.rs +++ b/src/models/upload_form.rs @@ -1,7 +1,10 @@ use serde::{Deserialize, Serialize}; +mod models { + #[derive(Debug, Deserialize, Serialize)] -struct UploadForm { +pub struct UploadForm { pub url: String, pub filepath: String, +} } \ No newline at end of file diff --git a/src/models/user.rs b/src/models/user.rs index c352bad..39a9f98 100644 --- a/src/models/user.rs +++ b/src/models/user.rs @@ -1,7 +1,10 @@ use serde::{Deserialize, Serialize}; +mod models { + #[derive(Debug, Deserialize, Serialize)] -struct User { +pub struct User { pub username: String, pub password: String, +} } \ No newline at end of file diff --git a/src/utilities/checks.rs b/src/utilities/checks.rs index e7bca40..1816d94 100644 --- a/src/utilities/checks.rs +++ b/src/utilities/checks.rs @@ -1,7 +1,9 @@ use serde::{Deserialize, Serialize}; +mod utilities { + #[derive(Debug, Deserialize, Serialize)] -struct Checks { +pub struct Checks { } impl Checks { @@ -22,3 +24,4 @@ impl Checks { return String::from(""); } } +} diff --git a/src/utilities/conversions.rs b/src/utilities/conversions.rs index d55ccae..0d18b3f 100644 --- a/src/utilities/conversions.rs +++ b/src/utilities/conversions.rs @@ -1,7 +1,9 @@ use serde::{Deserialize, Serialize}; +mod utilities { + #[derive(Debug, Deserialize, Serialize)] -struct Conversions { +pub struct Conversions { } impl Conversions { @@ -17,3 +19,5 @@ impl Conversions { pub fn print_value(&self, val: i32) { } } + +} \ No newline at end of file