Language Migration #21

Merged
kdeng00 merged 47 commits from rust-lg into master 2024-06-15 12:22:18 -04:00
13 changed files with 55 additions and 17 deletions
Showing only changes of commit 0e76c6d4c7 - Show all commits
+5 -3
View File
@@ -4,7 +4,8 @@ mod models;
use std::env; use std::env;
use std::process; use std::process;
// use managers::ActionManager; // use managers::{ActionManager};
use crate::src::managers::{ActionManager, CommitManager};
// use models::{user, upload_form}; // use models::{user, upload_form};
// use models:: // use models::
@@ -64,7 +65,8 @@ fn main() {
exit_program(-1); exit_program(-1);
} }
let act_mgr = managers::ActionManager { let act_mgr = ActionManager {
// let act_mgr = crate::src::managers::ActionManager {
action: String::from(""), action: String::from(""),
flags: Vec::new(), flags: Vec::new(),
params: args, params: args,
@@ -75,7 +77,7 @@ fn main() {
chosen_act.print_action_and_flags(); chosen_act.print_action_and_flags();
let cmt_mgr = managers::CommitManager { let cmt_mgr = CommitManager {
}; };
cmt_mgr.commit_action(); cmt_mgr.commit_action();
+4 -1
View File
@@ -1,7 +1,9 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
mod managers {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
struct ActionManager { pub struct ActionManager {
action: String, action: String,
flags: Vec<models::Flags>, flags: Vec<models::Flags>,
params: Vec<String>, params: Vec<String>,
@@ -50,3 +52,4 @@ impl ActionManager {
return Vec::new(); return Vec::new();
} }
} }
}
+5 -2
View File
@@ -2,8 +2,10 @@ use std::collections::HashMap;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
mod managers {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
struct CommitManager { pub struct CommitManager {
action: String, action: String,
flags: Vec<models::Flags>, flags: Vec<models::Flags>,
params: Vec<String>, params: Vec<String>,
@@ -11,7 +13,7 @@ struct CommitManager {
ica_action: models::IcarusAction, ica_action: models::IcarusAction,
} }
struct Album { pub struct Album {
pub title: String, pub title: String,
pub album_artist: String, pub album_artist: String,
pub genre: String, pub genre: String,
@@ -90,3 +92,4 @@ impl CommitManager {
return String::from(""); return String::from("");
} }
} }
}
+4 -1
View File
@@ -1,7 +1,9 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
mod managers {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
struct UserManager { pub struct UserManager {
user: models::User, user: models::User,
ica_action: models::IcarusAction, ica_action: models::IcarusAction,
} }
@@ -19,3 +21,4 @@ impl UserManager {
fn parse_user_from_actions(&self) { fn parse_user_from_actions(&self) {
} }
} }
}
+4 -1
View File
@@ -1,8 +1,11 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
mod models {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
struct API { pub struct API {
pub url: String, pub url: String,
pub endpoint: String, pub endpoint: String,
pub version: String, pub version: String,
} }
}
+3 -1
View File
@@ -1,7 +1,9 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
mod models {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
struct Flags { pub struct Flags {
pub flag: String, pub flag: String,
pub value: String, pub value: String,
} }
}
+4 -1
View File
@@ -1,7 +1,9 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
mod models {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
struct IcarusAction { pub struct IcarusAction {
pub action: String, pub action: String,
pub flags: Vec<models::Flags>, pub flags: Vec<models::Flags>,
} }
@@ -16,3 +18,4 @@ impl IcarusAction {
pub fn print_action_and_flags(&self) { pub fn print_action_and_flags(&self) {
} }
} }
}
+5 -2
View File
@@ -1,7 +1,9 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
mod models {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
struct Song { pub struct Song {
pub id: i32, pub id: i32,
pub title: String, pub title: String,
pub artist: String, pub artist: String,
@@ -41,8 +43,9 @@ impl Song {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
struct CoverArt { pub struct CoverArt {
pub id: i32, pub id: i32,
pub title: String, pub title: String,
pub path: String, pub path: String,
}
} }
+4 -1
View File
@@ -1,8 +1,11 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
mod models {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
struct Token { pub struct Token {
pub access_token: String, pub access_token: String,
pub token_type: String, pub token_type: String,
pub expiration: i32, pub expiration: i32,
} }
}
+4 -1
View File
@@ -1,7 +1,10 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
mod models {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
struct UploadForm { pub struct UploadForm {
pub url: String, pub url: String,
pub filepath: String, pub filepath: String,
}
} }
+4 -1
View File
@@ -1,7 +1,10 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
mod models {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
struct User { pub struct User {
pub username: String, pub username: String,
pub password: String, pub password: String,
}
} }
+4 -1
View File
@@ -1,7 +1,9 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
mod utilities {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
struct Checks { pub struct Checks {
} }
impl Checks { impl Checks {
@@ -22,3 +24,4 @@ impl Checks {
return String::from(""); return String::from("");
} }
} }
}
+5 -1
View File
@@ -1,7 +1,9 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
mod utilities {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
struct Conversions { pub struct Conversions {
} }
impl Conversions { impl Conversions {
@@ -17,3 +19,5 @@ impl Conversions {
pub fn print_value(&self, val: i32) { pub fn print_value(&self, val: i32) {
} }
} }
}