Update rust (#99)

* bump: rust

* bump: rust ci

* Updated License

* bump: reqwest

* bump: tokio

* bump: uuid

* bump: icarus_models

* cargo update

* bump: icarus_dm

.github/workflows/rust-ubuntu-latest.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Install Rust version
-      run: rustup install 1.90.0 && rustup default 1.90.0
+      run: rustup install 1.95 && rustup default 1.95
 
     - name: Debug secret
       run: echo "${{ secrets.MYREPO_TOKEN }}" | head -c 10 ; echo "..."
@@ -27,7 +27,7 @@ jobs:
         mkdir -p ~/.ssh
         echo "$EXTREPO_KEY" > ~/.ssh/gitlab_deploy_key
         chmod 600 ~/.ssh/gitlab_deploy_key
-        ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts
+        ssh-keyscan ${{ vars.MYHOST }}= >> ~/.ssh/known_hosts
 
         eval $(ssh-agent -s)
         ssh-add -v ~/.ssh/gitlab_deploy_key

Cargo.toml

@@ -1,17 +1,17 @@
 [package]
 name = "icarus-dm"
-version = "0.8.1"
+version = "0.10.0"
-rust-version = "1.90"
+rust-version = "1.95"
 edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-futures = { version = "0.3.31" }
+futures = { version = "0.3.32" }
-http = { version = "1.3.1" }
+http = { version = "1.4.0" }
-reqwest = { version = "0.12.23", features = ["json", "blocking", "multipart", "stream"] }
+reqwest = { version = "0.13.3", features = ["json", "blocking", "multipart", "stream"] }
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.145"
+serde_json = "1.0.149"
-tokio = { version = "1.47.1", features = ["full"] }
+tokio = { version = "1.52", features = ["full"] }
-tokio-util = { version = "0.7.16", features = ["codec"] }
+tokio-util = { version = "0.7.18", features = ["codec"] }
-uuid = { version = "1.18.1", features = ["v4", "serde"] }
+uuid = { version = "1.23.1", features = ["v4", "serde"] }
-icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.7.0" }
+icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.11.1" }

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Kun Deng
+Copyright (c) 2026 Kun Deng
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/help.rs

@@ -30,7 +30,10 @@ pub fn print_help() {
             -rt retrieve type (songs is only accepted)
 
         Required for deleting a song
-            -D song id"#,
+            -D song id
+
+        Print version
+            -v"#,
     );
 
     println!("{msg}");

src/main.rs

@@ -4,6 +4,7 @@ mod models;
 mod parsers;
 mod syncers;
 mod utilities;
+mod version;
 
 use std::env;
 
@@ -17,17 +18,22 @@ async fn main() {
         utilities::checks::exit_program(-1);
     }
 
-    println!("Argument count: {args_len}");
-
     let mut act_mgr = managers::action_managers::ActionManager::default();
     act_mgr.set_params(&args);
     act_mgr.initialize();
 
     let chosen_act = act_mgr.retrieve_icarus_action();
+    for act in &chosen_act.flags {
+        if act.flag == "-v" {
+            version::print_version();
+            utilities::checks::exit_program(-1);
+        }
+    }
     chosen_act.print_action_and_flags();
 
     let mut cmt_mgr = managers::commit_manager::CommitManager {
         ica_action: chosen_act,
+        ..Default::default()
     };
 
     cmt_mgr.commit_action().await;

src/managers/action_managers.rs

@@ -1,8 +1,6 @@
-use serde::{Deserialize, Serialize};
-
 use crate::{models, utilities};
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug)]
 pub struct ActionManager {
     pub action: String,
     pub flags: Vec<models::flags::Flags>,
@@ -48,6 +46,7 @@ impl ActionManager {
             String::from("-ca"),
             String::from("-smca"),
             String::from("-t"),
+            String::from("-v"),
         ]
     }
 
@@ -63,31 +62,24 @@ impl ActionManager {
     }
 
     fn validate_flags(&mut self) {
-        println!("Validating flags");
-
         let flag_vals = self.parsed_flags();
 
         let mut i = 0;
-        println!("Flag count: {}", flag_vals.len());
 
         while i < flag_vals.len() {
             let flag = &flag_vals[i];
-            println!("Index: {i} | Value: {flag}");
-
             let mut flg = models::flags::Flags::default();
 
-            // TODO: Refactor this
+            if self.is_valid_flag(flag) {
-            if self.is_valid_flag(flag) && self.does_flag_have_value(flag) {
+                if self.does_flag_have_value(flag) {
-                println!("Flag has value");
+                    flg.flag = String::from(flag);
-                flg.flag = String::from(flag);
+                    flg.value = String::from(&flag_vals[i + 1]);
-                flg.value = String::from(&flag_vals[i + 1]);
 
-                i += 1;
+                    i += 1;
-            } else if self.is_valid_flag(flag) {
+                } else {
-                println!("Flag does not have a value");
+                    flg.flag = String::from(flag);
-                flg.flag = String::from(flag);
+                }
             } else {
-                println!("Flag {flag} is not valid");
                 utilities::checks::exit_program(-1);
             }
 
@@ -155,9 +147,16 @@ impl ActionManager {
     fn parsed_flags(&self) -> Vec<String> {
         let mut parsed: Vec<String> = Vec::new();
 
-        for i in 2..self.params.len() {
+        if self.param_count <= 2 {
-            let flag = String::from(&self.params[i]);
+            let flag = String::from(&self.params[1]);
-            parsed.push(flag);
+            if flag == "-v" {
+                parsed.push(flag);
+            }
+        } else {
+            for i in 2..self.params.len() {
+                let flag = String::from(&self.params[i]);
+                parsed.push(flag);
+            }
         }
 
         parsed

src/managers/commit_manager.rs

@@ -1,20 +1,20 @@
 use std::collections::HashMap;
 use std::default::Default;
 use std::fs::read_dir;
-use std::io::{Result, Write};
+use std::io::Result;
 use std::str::FromStr;
 
-use serde::{Deserialize, Serialize};
-
 use crate::managers;
 use crate::models::{self};
 use crate::parsers;
 use crate::syncers;
 use crate::utilities;
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Default)]
 pub struct CommitManager {
     pub ica_action: models::icarus_action::IcarusAction,
+    pub api: models::api::Api,
+    pub auth_api: models::api::Api,
 }
 
 #[derive(Clone, Debug)]
@@ -86,27 +86,36 @@ pub fn retrieve_song(
 
 impl CommitManager {
     pub async fn commit_action(&mut self) {
+        self.init_api().await;
+
         let action = &self.ica_action.action;
         println!("Committing {action} action");
 
         let mapped_actions = &self.map_actions();
-        let mapped_action = self.find_mapped_action(mapped_actions, action);
+        let token = self.parse_token(&self.auth_api).await;
 
-        println!("{mapped_action:?}");
+        match self.find_mapped_action(mapped_actions, action) {
-
+            ActionValues::DeleteAct => self.delete_song(&token).await,
-        // TODO: Move code to get token here and then pass it to the respective functions
+            ActionValues::DownloadAct => self.download_song(&token).await,
-
+            ActionValues::RetrieveAct => self.retrieve_object(&token).await,
-        match mapped_action {
+            ActionValues::UploadSongWithMetadata => self.upload_song_with_metadata(&token).await,
-            ActionValues::DeleteAct => self.delete_song().await,
-            ActionValues::DownloadAct => self.download_song().await,
-            ActionValues::RetrieveAct => self.retrieve_object().await,
-            ActionValues::UploadSongWithMetadata => self.upload_song_with_metadata().await,
             _ => {
                 println!("Nothing good here");
             }
         }
     }
 
+    async fn init_api(&mut self) {
+        let mut prsr = parsers::api_parser::APIParser {
+            apis: vec![models::api::Api::default(), models::api::Api::default()],
+            ica_act: self.ica_action.clone(),
+        };
+        prsr.parse_api(parsers::api_parser::APIType::Main);
+        prsr.parse_api(parsers::api_parser::APIType::Auth);
+        self.api = prsr.retrieve_api(parsers::api_parser::APIType::Main);
+        self.auth_api = prsr.retrieve_api(parsers::api_parser::APIType::Auth);
+    }
+
     fn find_mapped_action(
         &self,
         actions: &HashMap<String, ActionValues>,
@@ -122,7 +131,7 @@ impl CommitManager {
     }
 
     fn map_actions(&self) -> HashMap<String, ActionValues> {
-        let actions: HashMap<String, ActionValues> = HashMap::from([
+        HashMap::from([
             ("download".to_string(), ActionValues::DownloadAct),
             ("download".to_string(), ActionValues::DownloadAct),
             (
@@ -131,24 +140,15 @@ impl CommitManager {
             ),
             ("retrieve".to_string(), ActionValues::RetrieveAct),
             ("delete".to_string(), ActionValues::DeleteAct),
-        ]);
+        ])
-
-        actions
     }
 
-    async fn delete_song(&self) {
+    async fn delete_song(&self, token: &icarus_models::token::AccessToken) {
-        let mut prsr = parsers::api_parser::APIParser {
-            apis: vec![models::api::Api::default(), models::api::Api::default()],
-            ica_act: self.ica_action.clone(),
-        };
-        prsr.parse_api(parsers::api_parser::APIType::Main);
-        prsr.parse_api(parsers::api_parser::APIType::Auth);
-        let auth_api = prsr.retrieve_api(parsers::api_parser::APIType::Auth);
-
-        let token = self.parse_token(&auth_api).await;
-
         println!("Deleting song");
 
+        let mut del = syncers::delete::Delete {
+            api: self.api.clone(),
+        };
         let mut song = icarus_models::song::Song::default();
 
         for arg in &self.ica_action.flags {
@@ -160,12 +160,7 @@ impl CommitManager {
             }
         }
 
-        let api = prsr.retrieve_api(parsers::api_parser::APIType::Main);
+        match del.delete_song(token, &song).await {
-        let mut del = syncers::delete::Delete { api: api.clone() };
-
-        println!("Deleting song..");
-
-        match del.delete_song(&token, &song).await {
             Ok((song, _coverart)) => {
                 println!("Song (Id {:?}) has been successfully deleted", song.id);
             }
@@ -175,39 +170,42 @@ impl CommitManager {
         }
     }
 
-    async fn download_song(&self) {
+    async fn download_song(&self, token: &icarus_models::token::AccessToken) {
-        println!("Deleting song");
+        println!("Downloading song");
         let dwn = self.ica_action.retrieve_flag_value(&String::from("-b"));
-        let song_id = uuid::Uuid::from_str(dwn.as_str()).unwrap();
+        let mut dwn_loader = syncers::download::Download {
-
+            api: self.api.clone(),
-        let mut prsr = parsers::api_parser::APIParser {
-            apis: vec![models::api::Api::default(), models::api::Api::default()],
-            ica_act: self.ica_action.clone(),
         };
-        prsr.parse_api(parsers::api_parser::APIType::Main);
+        let mut song = icarus_models::song::Song {
-        prsr.parse_api(parsers::api_parser::APIType::Auth);
+            id: uuid::Uuid::from_str(dwn.as_str()).unwrap(),
-
-        let auth_api = prsr.retrieve_api(parsers::api_parser::APIType::Auth);
-        let token = self.parse_token(&auth_api).await;
-        println!("Message: {}", token.message);
-
-        let api = prsr.retrieve_api(parsers::api_parser::APIType::Main);
-
-        let mut dwn_loader = syncers::download::Download { api: api.clone() };
-        let song = icarus_models::song::Song {
-            id: song_id,
             ..Default::default()
         };
 
-        match dwn_loader.download_song(&token, &song).await {
+        match dwn_loader.download_song(token, &song).await {
             Ok(o) => {
-                println!("Success");
+                println!("Song downloaded");
-                let filename = String::from("audio")
+
-                    + icarus_models::constants::file_extensions::audio::DEFAULTMUSICEXTENSION;
+                song.data = o.as_bytes().to_vec();
-                let data = o.as_bytes();
+                song.directory = String::from(".");
-                let mut file = std::fs::File::create(filename).expect("Failed to save");
+                song.filename = match icarus_models::song::generate_filename(
-                file.write_all(data)
+                    icarus_models::types::MusicType::FlacExtension,
-                    .expect("Failed to save downloaded song");
+                    true,
+                ) {
+                    Ok(filename) => filename,
+                    Err(err) => {
+                        eprintln!("Error generating song filename: {err:?}");
+                        utilities::checks::exit_program(-3);
+                        return;
+                    }
+                };
+                match song.save_to_filesystem() {
+                    Ok(_) => {
+                        println!("Song saved");
+                    }
+                    Err(err) => {
+                        eprintln!("Error saving song: {err:?}");
+                    }
+                }
             }
             Err(er) => {
                 println!("Error {er:?}");
@@ -223,7 +221,7 @@ impl CommitManager {
         }
     }
 
-    async fn retrieve_object(&self) {
+    async fn retrieve_object(&self, token: &icarus_models::token::AccessToken) {
         println!("Retrieving song");
         let rt = self.ica_action.retrieve_flag_value(&String::from("-rt"));
 
@@ -231,22 +229,11 @@ impl CommitManager {
             panic!("Unsupported -rt: {rt}");
         }
 
-        let mut prsr = parsers::api_parser::APIParser {
+        let mut repo = syncers::retrieve_records::RetrieveRecords {
-            apis: vec![models::api::Api::default(), models::api::Api::default()],
+            api: self.api.clone(),
-            ica_act: self.ica_action.clone(),
         };
-        prsr.parse_api(parsers::api_parser::APIType::Main);
-        prsr.parse_api(parsers::api_parser::APIType::Auth);
 
-        let auth_api = prsr.retrieve_api(parsers::api_parser::APIType::Auth);
+        match repo.get_all_songs(token).await {
-        let token = self.parse_token(&auth_api).await;
-        println!("Token {token:?}");
-
-        let api = prsr.retrieve_api(parsers::api_parser::APIType::Main);
-
-        let mut repo = syncers::retrieve_records::RetrieveRecords { api: api.clone() };
-
-        match repo.get_all_songs(&token).await {
             Ok(o) => {
                 println!("Songs");
                 println!("=====");
@@ -285,7 +272,7 @@ impl CommitManager {
         token.unwrap()
     }
 
-    async fn upload_song_with_metadata(&mut self) {
+    async fn upload_song_with_metadata(&mut self, token: &icarus_models::token::AccessToken) {
         println!("Uplodaring song with metadara");
 
         let songpath = self.ica_action.retrieve_flag_value(&String::from("-s"));
@@ -313,12 +300,12 @@ impl CommitManager {
             println!("cover art path: {coverpath}");
 
             let _ = self
-                .sing_target_upload(&songpath, &track_id, &metadata_path, &coverpath)
+                .sing_target_upload(&songpath, &track_id, &metadata_path, &coverpath, token)
                 .await;
         } else if multitarget {
-            let _ = self.multi_target_upload(&uni).await;
+            let _ = self.multi_target_upload(&uni, token).await;
         } else {
-            println!("Single or Multi target has not been chosen");
+            eprintln!("Single or Multi target has not been chosen");
         }
     }
 
@@ -329,19 +316,8 @@ impl CommitManager {
         track_id: &str,
         meta_path: &String,
         cover_path: &str,
+        token: &icarus_models::token::AccessToken,
     ) -> Result<()> {
-        let mut prsr = parsers::api_parser::APIParser {
-            apis: vec![models::api::Api::default(), models::api::Api::default()],
-            ica_act: self.ica_action.clone(),
-        };
-        prsr.parse_api(parsers::api_parser::APIType::Main);
-        prsr.parse_api(parsers::api_parser::APIType::Auth);
-
-        let auth_api = prsr.retrieve_api(parsers::api_parser::APIType::Auth);
-        let token = self.parse_token(&auth_api).await;
-
-        println!("Token: {:?}", token.token);
-
         let song_file = std::path::Path::new(&songpath);
 
         if !song_file.exists() {
@@ -349,11 +325,11 @@ impl CommitManager {
             panic!("Error");
         }
 
+        let pa = std::path::Path::new(&cover_path);
+
         let mut cover_art = icarus_models::coverart::CoverArt {
-            id: uuid::Uuid::nil(),
+            directory: String::from(pa.parent().unwrap().to_str().unwrap()),
-            title: String::new(),
+            filename: String::from(pa.file_name().unwrap().to_str().unwrap()),
-            path: cover_path.to_owned(),
-            data: Vec::new(),
             ..Default::default()
         };
         let file_name = std::ffi::OsString::from(&song_file.file_name().unwrap());
@@ -374,14 +350,13 @@ impl CommitManager {
                             println!("Filename: {:?}", s.filename);
                             println!("Path: {:?}", s.song_path());
                             s.data = icarus_models::song::io::to_data(&s).unwrap();
-
                             cover_art.data =
                                 icarus_models::coverart::io::to_data(&cover_art).unwrap();
 
                             let members = UploadSongMembers {
                                 song: s,
                                 coverart: cover_art,
-                                token,
+                                token: token.clone(),
                                 album,
                             };
 
@@ -459,21 +434,14 @@ impl CommitManager {
                         println!("Queued coverart Id: {id:?}");
                         println!("Linked queued song to queued coverart");
                         println!("Queued status updated");
+                        Ok(())
                     }
-                    Err(err) => {
+                    Err(err) => Err(std::io::Error::other(err.to_string())),
-                        return Err(std::io::Error::other(err.to_string()));
-                    }
                 },
-                Err(err) => {
+                Err(err) => Err(std::io::Error::other(err.to_string())),
-                    return Err(std::io::Error::other(err.to_string()));
-                }
             },
-            Err(err) => {
+            Err(err) => Err(std::io::Error::other(err.to_string())),
-                return Err(std::io::Error::other(err.to_string()));
-            }
         }
-
-        Ok(())
     }
 
     fn get_songs(
@@ -497,7 +465,6 @@ impl CommitManager {
                     };
 
                     songs.push(icarus_models::song::Song {
-                        id: uuid::Uuid::nil(),
                         title: track.title.clone(),
                         artist: track.artist.clone(),
                         disc: track.disc,
@@ -512,36 +479,32 @@ impl CommitManager {
                         audio_type: String::from("FLAC"),
                         directory: source_directory.to_owned(),
                         filename: song_filename,
-                        user_id: uuid::Uuid::nil(),
+                        ..Default::default()
-                        data: Vec::new(),
-                        date_created: String::new(),
                     });
                 }
                 Ok(songs)
             }
-            Err(_) => Ok(Vec::new()),
+            Err(_) => Err(std::io::Error::other("Songs not retrieved")),
         }
     }
 
-    async fn multi_target_upload(&mut self, sourcepath: &String) -> std::io::Result<()> {
+    async fn multi_target_upload(
-        let mut prsr = parsers::api_parser::APIParser {
+        &mut self,
-            apis: vec![models::api::Api::default(), models::api::Api::default()],
+        sourcepath: &String,
-            ica_act: self.ica_action.clone(),
+        token: &icarus_models::token::AccessToken,
-        };
+    ) -> std::io::Result<()> {
-        prsr.parse_api(parsers::api_parser::APIType::Main);
-        prsr.parse_api(parsers::api_parser::APIType::Auth);
-        let auth_api = prsr.retrieve_api(parsers::api_parser::APIType::Auth);
-        let token = self.parse_token(&auth_api).await;
-
         let directory_path = std::path::Path::new(&sourcepath);
 
         if !directory_path.exists() {
             panic!("Directory does not exist");
         }
 
-        let coverart_path = self.get_cover_art_path(sourcepath).unwrap_or_default();
+        let (coverart_directory, coverart_filename) =
-        let mut cover_art =
+            self.get_coverart_dir_and_filename(sourcepath).unwrap();
-            icarus_models::coverart::init::init_coverart_only_path(coverart_path.clone());
+        let mut cover_art = icarus_models::coverart::init::init_coverart_dir_and_filename(
+            &coverart_directory,
+            &coverart_filename,
+        );
         let metadatapath = self.get_metadata_path(sourcepath).unwrap_or_default();
 
         let mut up = syncers::upload::Upload::default();
@@ -566,7 +529,7 @@ impl CommitManager {
                                 println!("Response: {o:?}");
                             }
                             Err(err) => {
-                                println!("Error: {err:?}");
+                                eprintln!("Error: {err:?}");
                                 return Err(err);
                             }
                         }
@@ -575,19 +538,19 @@ impl CommitManager {
                     Ok(())
                 }
                 Err(err) => {
-                    println!("Error: {err:?}");
+                    eprintln!("Error: {err:?}");
                     Err(std::io::Error::other(err.to_string()))
                 }
             },
             Err(error) => {
-                println!("Error: {error:?}");
+                eprintln!("Error: {error:?}");
                 Err(std::io::Error::other(error.to_string()))
             }
         }
     }
 
-    fn get_cover_art_path(&self, directory_path: &String) -> Result<String> {
+    fn get_coverart_dir_and_filename(&self, directory: &str) -> Result<(String, String)> {
-        for entry in read_dir(std::path::Path::new(directory_path))? {
+        for entry in read_dir(std::path::Path::new(directory))? {
             let entry = entry?;
 
             let file_type = entry.file_type();
@@ -597,14 +560,14 @@ impl CommitManager {
             println!("file name: {file_name:?}");
 
             if let En::ImageFile = self.find_file_extension(&file_name) {
-                let directory_part = directory_path.clone();
                 let fname = utilities::string::o_to_string(&file_name);
-                let fullpath = format!("{}/{}", directory_part, &fname.unwrap());
+                return Ok((directory.to_string(), fname.unwrap()));
-                return Ok(fullpath);
             }
         }
 
-        Ok(String::new())
+        Err(std::io::Error::other(
+            "CoverArt directory and filename not found",
+        ))
     }
 
     fn find_file_extension(&self, file_name: &std::ffi::OsString) -> En {
@@ -672,15 +635,6 @@ impl CommitManager {
             }
         }
 
-        Ok(String::new())
+        Err(std::io::Error::other("Metadata path not found"))
-    }
-
-    fn _check_for_no_confirm(&self) -> bool {
-        for flag in self.ica_action.flags.iter() {
-            if flag.flag == "-nc" {
-                return true;
-            }
-        }
-        false
     }
 }

src/managers/token_manager.rs

@@ -23,7 +23,6 @@ impl Default for TokenManager {
             user: icarus_models::user::User::default(),
             api: models::api::Api::default(),
         };
-
         token.init();
 
         token
@@ -35,7 +34,6 @@ impl TokenManager {
         println!("Sending request for a token");
 
         let url = self.retrieve_url();
-
         println!("URL: {url}");
 
         let mut token = icarus_models::token::AccessToken {
@@ -62,19 +60,18 @@ impl TokenManager {
                         token.token_type = login_result.token_type.clone();
                         token.expiration = login_result.expiration;
                         token.message = response.message;
+                        Ok(token)
                     }
-                    Err(_) => println!("Hm, the response didn't match the shape we expected."),
+                    Err(err) => Err(std::io::Error::other(err.to_string())),
-                };
+                }
             }
             reqwest::StatusCode::UNAUTHORIZED => {
-                println!("Need to grab a new token");
+                Err(std::io::Error::other("Need to grab a new token"))
             }
             other => {
                 panic!("Uh oh! Something unexpected happened: {other:?}");
             }
         }
-
-        Ok(token)
     }
 
     pub fn init(&mut self) {
@@ -84,10 +81,6 @@ impl TokenManager {
     }
 
     pub fn retrieve_url(&self) -> String {
-        let api = &self.api;
+        format!("{}{}", self.api.url, self.api.endpoint)
-        let mut url = String::from(&api.url);
-        url += &String::from(&api.endpoint);
-
-        url
     }
 }

src/managers/user_manager.rs

@@ -1,10 +1,8 @@
 use std::default::Default;
 
-use serde::{Deserialize, Serialize};
-
 use crate::models::{self};
 
-#[derive(Debug, Default, Deserialize, Serialize)]
+#[derive(Debug, Default)]
 pub struct UserManager {
     pub user: icarus_models::user::User,
     pub ica_action: models::icarus_action::IcarusAction,

src/models/api.rs

@@ -1,8 +1,6 @@
 use std::default::Default;
 
-use serde::{Deserialize, Serialize};
+#[derive(Clone, Debug, Default)]
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Api {
     pub url: String,
     pub endpoint: String,

src/models/flags.rs

@@ -1,8 +1,6 @@
 use std::default::Default;
 
-use serde::{Deserialize, Serialize};
+#[derive(Clone, Debug, Default)]
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Flags {
     pub flag: String,
     pub value: String,

src/models/icarus_action.rs

@@ -1,10 +1,8 @@
 use std::default::Default;
 
-use serde::{Deserialize, Serialize};
-
 use crate::models;
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default)]
 pub struct IcarusAction {
     pub action: String,
     pub flags: Vec<models::flags::Flags>,

src/syncers/common.rs

@@ -9,22 +9,18 @@ pub fn retrieve_url(api: &models::api::Api, with_id: bool, id: &uuid::Uuid) -> S
 }
 
 fn retrieve_url_reg(api: &models::api::Api) -> String {
-    let url = format!("{}api/{}/{}/", api.url, api.version, api.endpoint);
+    format!("{}api/{}/{}/", api.url, api.version, api.endpoint)
-
-    url
 }
 
 fn retrieve_url_with_id(api: &models::api::Api, id: &uuid::Uuid) -> String {
-    let url = format!("{}api/{}/{}/{}", api.url, api.version, api.endpoint, id);
+    format!("{}api/{}/{}/{}", api.url, api.version, api.endpoint, id)
-
-    url
 }
 
 pub async fn auth_header(
     token: &icarus_models::token::AccessToken,
-) -> (http::HeaderName, http::HeaderValue) {
+) -> Result<(http::HeaderName, http::HeaderValue), http::header::InvalidHeaderValue> {
-    let auth = reqwest::header::AUTHORIZATION;
+    match http::HeaderValue::from_str(&token.bearer_token()) {
-    let auth_value = http::HeaderValue::from_str(&token.bearer_token()).unwrap();
+        Ok(auth_value) => Ok((reqwest::header::AUTHORIZATION, auth_value)),
-
+        Err(err) => Err(err),
-    (auth, auth_value)
+    }
 }

src/syncers/upload.rs

@@ -61,7 +61,7 @@ impl Upload {
         println!("Url: {url:?}");
 
         let mut headers = reqwest::header::HeaderMap::new();
-        let (auth, auth_val) = syncers::common::auth_header(token).await;
+        let (auth, auth_val) = syncers::common::auth_header(token).await.unwrap();
         headers.insert(auth, auth_val);
         headers.insert("Accept", HeaderValue::from_str("*/*").unwrap());
         headers.insert("Connection", HeaderValue::from_str("keep-alive").unwrap());
@@ -99,7 +99,7 @@ impl Upload {
         let url = format!("{}/{endpoint}", self.api.url);
 
         let mut headers = reqwest::header::HeaderMap::new();
-        let (auth, auth_val) = syncers::common::auth_header(token).await;
+        let (auth, auth_val) = syncers::common::auth_header(token).await.unwrap();
         headers.insert(auth, auth_val);
 
         let payload = serde_json::json!({
@@ -132,7 +132,7 @@ impl Upload {
         let url = format!("{}/{endpoint}", self.api.url);
 
         let mut headers = reqwest::header::HeaderMap::new();
-        let (auth, auth_val) = syncers::common::auth_header(token).await;
+        let (auth, auth_val) = syncers::common::auth_header(token).await.unwrap();
         headers.insert(auth, auth_val);
 
         let payload = serde_json::json!({
@@ -176,7 +176,7 @@ impl Upload {
         token: &icarus_models::token::AccessToken,
         coverart: &icarus_models::coverart::CoverArt,
     ) -> Result<uuid::Uuid, reqwest::Error> {
-        let coverartpath = coverart.path.clone();
+        let coverartpath = coverart.get_path().unwrap();
         let file = tokio::fs::File::open(&coverartpath).await.unwrap();
         let stream = tokio_util::codec::FramedRead::new(file, tokio_util::codec::BytesCodec::new());
         let file_body = reqwest::Body::wrap_stream(stream);
@@ -200,7 +200,7 @@ impl Upload {
         println!("Url: {url:?}");
 
         let mut headers = reqwest::header::HeaderMap::new();
-        let (auth, auth_val) = syncers::common::auth_header(token).await;
+        let (auth, auth_val) = syncers::common::auth_header(token).await.unwrap();
         headers.insert(auth, auth_val);
         headers.insert("Accept", HeaderValue::from_str("*/*").unwrap());
         headers.insert("Connection", HeaderValue::from_str("keep-alive").unwrap());
@@ -239,7 +239,7 @@ impl Upload {
         let url = format!("{}/{endpoint}", self.api.url);
 
         let mut headers = reqwest::header::HeaderMap::new();
-        let (auth, auth_val) = syncers::common::auth_header(token).await;
+        let (auth, auth_val) = syncers::common::auth_header(token).await.unwrap();
         headers.insert(auth, auth_val);
 
         let payload = serde_json::json!({
@@ -271,7 +271,7 @@ impl Upload {
         let url = format!("{}/{endpoint}", self.api.url);
 
         let mut headers = reqwest::header::HeaderMap::new();
-        let (auth, auth_val) = syncers::common::auth_header(token).await;
+        let (auth, auth_val) = syncers::common::auth_header(token).await.unwrap();
         headers.insert(auth, auth_val);
 
         let payload = serde_json::json!({

src/utilities/string.rs

@@ -1,6 +1,12 @@
 pub fn o_to_string(val: &std::ffi::OsString) -> Result<std::string::String, std::io::Error> {
     match val.clone().into_string() {
         Ok(value) => Ok(value),
-        Err(_) => Err(std::io::Error::other(String::from("Error"))),
+        Err(err) => match err.into_string() {
+            Ok(res) => Err(std::io::Error::other(res.to_string())),
+            Err(err) => match err.to_str() {
+                Some(err) => Err(std::io::Error::other(err)),
+                None => Err(std::io::Error::other("Undefined error")),
+            },
+        },
     }
 }

src/version.rs

@@ -0,0 +1,6 @@
+pub fn print_version() {
+    let name = env!("CARGO_PKG_NAME");
+    let version = env!("CARGO_PKG_VERSION");
+
+    println!("{name:?} {version:?}");
+}