Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 489d13227b | |||
| 0e6438cf0d | |||
| 00615532ce | |||
| abd16eeba2 | |||
| 5c9fcf2ec5 | |||
| 6bedab0d88 | |||
| 686e0d8f1f | |||
| 05a9134aaa | |||
| 3cadac4efd |
@@ -17,7 +17,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v5
|
||||||
- name: Install Rust version
|
- 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
|
- name: Debug secret
|
||||||
run: echo "${{ secrets.MYREPO_TOKEN }}" | head -c 10 ; echo "..."
|
run: echo "${{ secrets.MYREPO_TOKEN }}" | head -c 10 ; echo "..."
|
||||||
@@ -27,7 +27,7 @@ jobs:
|
|||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
echo "$EXTREPO_KEY" > ~/.ssh/gitlab_deploy_key
|
echo "$EXTREPO_KEY" > ~/.ssh/gitlab_deploy_key
|
||||||
chmod 600 ~/.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)
|
eval $(ssh-agent -s)
|
||||||
ssh-add -v ~/.ssh/gitlab_deploy_key
|
ssh-add -v ~/.ssh/gitlab_deploy_key
|
||||||
|
|||||||
Generated
+833
-399
File diff suppressed because it is too large
Load Diff
+10
-10
@@ -1,17 +1,17 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "icarus-dm"
|
name = "icarus-dm"
|
||||||
version = "0.8.4"
|
version = "0.10.0"
|
||||||
rust-version = "1.90"
|
rust-version = "1.95"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
[dependencies]
|
[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 = { 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.8.0" }
|
icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.11.1" }
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
MIT License
|
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
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ async fn main() {
|
|||||||
|
|
||||||
let mut cmt_mgr = managers::commit_manager::CommitManager {
|
let mut cmt_mgr = managers::commit_manager::CommitManager {
|
||||||
ica_action: chosen_act,
|
ica_action: chosen_act,
|
||||||
|
..Default::default()
|
||||||
};
|
};
|
||||||
|
|
||||||
cmt_mgr.commit_action().await;
|
cmt_mgr.commit_action().await;
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
use crate::{models, utilities};
|
use crate::{models, utilities};
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
#[derive(Debug)]
|
||||||
pub struct ActionManager {
|
pub struct ActionManager {
|
||||||
pub action: String,
|
pub action: String,
|
||||||
pub flags: Vec<models::flags::Flags>,
|
pub flags: Vec<models::flags::Flags>,
|
||||||
@@ -70,17 +68,17 @@ impl ActionManager {
|
|||||||
|
|
||||||
while i < flag_vals.len() {
|
while i < flag_vals.len() {
|
||||||
let flag = &flag_vals[i];
|
let flag = &flag_vals[i];
|
||||||
|
|
||||||
let mut flg = models::flags::Flags::default();
|
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) {
|
||||||
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 {
|
||||||
flg.flag = String::from(flag);
|
flg.flag = String::from(flag);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
utilities::checks::exit_program(-1);
|
utilities::checks::exit_program(-1);
|
||||||
}
|
}
|
||||||
|
|||||||
+90
-134
@@ -1,20 +1,20 @@
|
|||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::default::Default;
|
use std::default::Default;
|
||||||
use std::fs::read_dir;
|
use std::fs::read_dir;
|
||||||
use std::io::{Result, Write};
|
use std::io::Result;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
use crate::managers;
|
use crate::managers;
|
||||||
use crate::models::{self};
|
use crate::models::{self};
|
||||||
use crate::parsers;
|
use crate::parsers;
|
||||||
use crate::syncers;
|
use crate::syncers;
|
||||||
use crate::utilities;
|
use crate::utilities;
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
#[derive(Debug, Default)]
|
||||||
pub struct CommitManager {
|
pub struct CommitManager {
|
||||||
pub ica_action: models::icarus_action::IcarusAction,
|
pub ica_action: models::icarus_action::IcarusAction,
|
||||||
|
pub api: models::api::Api,
|
||||||
|
pub auth_api: models::api::Api,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
@@ -86,27 +86,36 @@ pub fn retrieve_song(
|
|||||||
|
|
||||||
impl CommitManager {
|
impl CommitManager {
|
||||||
pub async fn commit_action(&mut self) {
|
pub async fn commit_action(&mut self) {
|
||||||
|
self.init_api().await;
|
||||||
|
|
||||||
let action = &self.ica_action.action;
|
let action = &self.ica_action.action;
|
||||||
println!("Committing {action} action");
|
println!("Committing {action} action");
|
||||||
|
|
||||||
let mapped_actions = &self.map_actions();
|
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");
|
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(
|
fn find_mapped_action(
|
||||||
&self,
|
&self,
|
||||||
actions: &HashMap<String, ActionValues>,
|
actions: &HashMap<String, ActionValues>,
|
||||||
@@ -122,7 +131,7 @@ impl CommitManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn map_actions(&self) -> HashMap<String, ActionValues> {
|
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),
|
||||||
("download".to_string(), ActionValues::DownloadAct),
|
("download".to_string(), ActionValues::DownloadAct),
|
||||||
(
|
(
|
||||||
@@ -131,24 +140,15 @@ impl CommitManager {
|
|||||||
),
|
),
|
||||||
("retrieve".to_string(), ActionValues::RetrieveAct),
|
("retrieve".to_string(), ActionValues::RetrieveAct),
|
||||||
("delete".to_string(), ActionValues::DeleteAct),
|
("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");
|
println!("Deleting song");
|
||||||
|
|
||||||
|
let mut del = syncers::delete::Delete {
|
||||||
|
api: self.api.clone(),
|
||||||
|
};
|
||||||
let mut song = icarus_models::song::Song::default();
|
let mut song = icarus_models::song::Song::default();
|
||||||
|
|
||||||
for arg in &self.ica_action.flags {
|
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)) => {
|
Ok((song, _coverart)) => {
|
||||||
println!("Song (Id {:?}) has been successfully deleted", song.id);
|
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 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()
|
..Default::default()
|
||||||
};
|
};
|
||||||
|
|
||||||
match dwn_loader.download_song(&token, &song).await {
|
match dwn_loader.download_song(token, &song).await {
|
||||||
Ok(o) => {
|
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) => {
|
Err(er) => {
|
||||||
println!("Error {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");
|
println!("Retrieving song");
|
||||||
let rt = self.ica_action.retrieve_flag_value(&String::from("-rt"));
|
let rt = self.ica_action.retrieve_flag_value(&String::from("-rt"));
|
||||||
|
|
||||||
@@ -231,22 +229,11 @@ impl CommitManager {
|
|||||||
panic!("Unsupported -rt: {rt}");
|
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) => {
|
Ok(o) => {
|
||||||
println!("Songs");
|
println!("Songs");
|
||||||
println!("=====");
|
println!("=====");
|
||||||
@@ -285,7 +272,7 @@ impl CommitManager {
|
|||||||
token.unwrap()
|
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");
|
println!("Uplodaring song with metadara");
|
||||||
|
|
||||||
let songpath = self.ica_action.retrieve_flag_value(&String::from("-s"));
|
let songpath = self.ica_action.retrieve_flag_value(&String::from("-s"));
|
||||||
@@ -313,12 +300,12 @@ impl CommitManager {
|
|||||||
println!("cover art path: {coverpath}");
|
println!("cover art path: {coverpath}");
|
||||||
|
|
||||||
let _ = self
|
let _ = self
|
||||||
.sing_target_upload(&songpath, &track_id, &metadata_path, &coverpath)
|
.sing_target_upload(&songpath, &track_id, &metadata_path, &coverpath, token)
|
||||||
.await;
|
.await;
|
||||||
} else if multitarget {
|
} else if multitarget {
|
||||||
let _ = self.multi_target_upload(&uni).await;
|
let _ = self.multi_target_upload(&uni, token).await;
|
||||||
} else {
|
} 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,
|
track_id: &str,
|
||||||
meta_path: &String,
|
meta_path: &String,
|
||||||
cover_path: &str,
|
cover_path: &str,
|
||||||
|
token: &icarus_models::token::AccessToken,
|
||||||
) -> Result<()> {
|
) -> 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);
|
let song_file = std::path::Path::new(&songpath);
|
||||||
|
|
||||||
if !song_file.exists() {
|
if !song_file.exists() {
|
||||||
@@ -374,14 +350,13 @@ impl CommitManager {
|
|||||||
println!("Filename: {:?}", s.filename);
|
println!("Filename: {:?}", s.filename);
|
||||||
println!("Path: {:?}", s.song_path());
|
println!("Path: {:?}", s.song_path());
|
||||||
s.data = icarus_models::song::io::to_data(&s).unwrap();
|
s.data = icarus_models::song::io::to_data(&s).unwrap();
|
||||||
|
|
||||||
cover_art.data =
|
cover_art.data =
|
||||||
icarus_models::coverart::io::to_data(&cover_art).unwrap();
|
icarus_models::coverart::io::to_data(&cover_art).unwrap();
|
||||||
|
|
||||||
let members = UploadSongMembers {
|
let members = UploadSongMembers {
|
||||||
song: s,
|
song: s,
|
||||||
coverart: cover_art,
|
coverart: cover_art,
|
||||||
token,
|
token: token.clone(),
|
||||||
album,
|
album,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -459,22 +434,15 @@ impl CommitManager {
|
|||||||
println!("Queued coverart Id: {id:?}");
|
println!("Queued coverart Id: {id:?}");
|
||||||
println!("Linked queued song to queued coverart");
|
println!("Linked queued song to queued coverart");
|
||||||
println!("Queued status updated");
|
println!("Queued status updated");
|
||||||
}
|
|
||||||
Err(err) => {
|
|
||||||
return Err(std::io::Error::other(err.to_string()));
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Err(err) => {
|
|
||||||
return Err(std::io::Error::other(err.to_string()));
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Err(err) => {
|
|
||||||
return Err(std::io::Error::other(err.to_string()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
Err(err) => Err(std::io::Error::other(err.to_string())),
|
||||||
|
},
|
||||||
|
Err(err) => Err(std::io::Error::other(err.to_string())),
|
||||||
|
},
|
||||||
|
Err(err) => Err(std::io::Error::other(err.to_string())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn get_songs(
|
fn get_songs(
|
||||||
&self,
|
&self,
|
||||||
@@ -516,20 +484,15 @@ impl CommitManager {
|
|||||||
}
|
}
|
||||||
Ok(songs)
|
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);
|
let directory_path = std::path::Path::new(&sourcepath);
|
||||||
|
|
||||||
if !directory_path.exists() {
|
if !directory_path.exists() {
|
||||||
@@ -566,7 +529,7 @@ impl CommitManager {
|
|||||||
println!("Response: {o:?}");
|
println!("Response: {o:?}");
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
println!("Error: {err:?}");
|
eprintln!("Error: {err:?}");
|
||||||
return Err(err);
|
return Err(err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -575,12 +538,12 @@ impl CommitManager {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
println!("Error: {err:?}");
|
eprintln!("Error: {err:?}");
|
||||||
Err(std::io::Error::other(err.to_string()))
|
Err(std::io::Error::other(err.to_string()))
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
Err(error) => {
|
Err(error) => {
|
||||||
println!("Error: {error:?}");
|
eprintln!("Error: {error:?}");
|
||||||
Err(std::io::Error::other(error.to_string()))
|
Err(std::io::Error::other(error.to_string()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -602,7 +565,9 @@ impl CommitManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok((String::new(), String::new()))
|
Err(std::io::Error::other(
|
||||||
|
"CoverArt directory and filename not found",
|
||||||
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn find_file_extension(&self, file_name: &std::ffi::OsString) -> En {
|
fn find_file_extension(&self, file_name: &std::ffi::OsString) -> En {
|
||||||
@@ -670,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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ impl Default for TokenManager {
|
|||||||
user: icarus_models::user::User::default(),
|
user: icarus_models::user::User::default(),
|
||||||
api: models::api::Api::default(),
|
api: models::api::Api::default(),
|
||||||
};
|
};
|
||||||
|
|
||||||
token.init();
|
token.init();
|
||||||
|
|
||||||
token
|
token
|
||||||
@@ -35,7 +34,6 @@ impl TokenManager {
|
|||||||
println!("Sending request for a token");
|
println!("Sending request for a token");
|
||||||
|
|
||||||
let url = self.retrieve_url();
|
let url = self.retrieve_url();
|
||||||
|
|
||||||
println!("URL: {url}");
|
println!("URL: {url}");
|
||||||
|
|
||||||
let mut token = icarus_models::token::AccessToken {
|
let mut token = icarus_models::token::AccessToken {
|
||||||
@@ -62,19 +60,18 @@ impl TokenManager {
|
|||||||
token.token_type = login_result.token_type.clone();
|
token.token_type = login_result.token_type.clone();
|
||||||
token.expiration = login_result.expiration;
|
token.expiration = login_result.expiration;
|
||||||
token.message = response.message;
|
token.message = response.message;
|
||||||
|
Ok(token)
|
||||||
|
}
|
||||||
|
Err(err) => Err(std::io::Error::other(err.to_string())),
|
||||||
}
|
}
|
||||||
Err(_) => println!("Hm, the response didn't match the shape we expected."),
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
reqwest::StatusCode::UNAUTHORIZED => {
|
reqwest::StatusCode::UNAUTHORIZED => {
|
||||||
println!("Need to grab a new token");
|
Err(std::io::Error::other("Need to grab a new token"))
|
||||||
}
|
}
|
||||||
other => {
|
other => {
|
||||||
panic!("Uh oh! Something unexpected happened: {other:?}");
|
panic!("Uh oh! Something unexpected happened: {other:?}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(token)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn init(&mut self) {
|
pub fn init(&mut self) {
|
||||||
@@ -84,10 +81,6 @@ impl TokenManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn retrieve_url(&self) -> String {
|
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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
use std::default::Default;
|
use std::default::Default;
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
use crate::models::{self};
|
use crate::models::{self};
|
||||||
|
|
||||||
#[derive(Debug, Default, Deserialize, Serialize)]
|
#[derive(Debug, Default)]
|
||||||
pub struct UserManager {
|
pub struct UserManager {
|
||||||
pub user: icarus_models::user::User,
|
pub user: icarus_models::user::User,
|
||||||
pub ica_action: models::icarus_action::IcarusAction,
|
pub ica_action: models::icarus_action::IcarusAction,
|
||||||
|
|||||||
+1
-3
@@ -1,8 +1,6 @@
|
|||||||
use std::default::Default;
|
use std::default::Default;
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
#[derive(Clone, Debug, Default)]
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
|
||||||
pub struct Api {
|
pub struct Api {
|
||||||
pub url: String,
|
pub url: String,
|
||||||
pub endpoint: String,
|
pub endpoint: String,
|
||||||
|
|||||||
+1
-3
@@ -1,8 +1,6 @@
|
|||||||
use std::default::Default;
|
use std::default::Default;
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
#[derive(Clone, Debug, Default)]
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
|
||||||
pub struct Flags {
|
pub struct Flags {
|
||||||
pub flag: String,
|
pub flag: String,
|
||||||
pub value: String,
|
pub value: String,
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
use std::default::Default;
|
use std::default::Default;
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
use crate::models;
|
use crate::models;
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Default)]
|
||||||
pub struct IcarusAction {
|
pub struct IcarusAction {
|
||||||
pub action: String,
|
pub action: String,
|
||||||
pub flags: Vec<models::flags::Flags>,
|
pub flags: Vec<models::flags::Flags>,
|
||||||
|
|||||||
+7
-11
@@ -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 {
|
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 {
|
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(
|
pub async fn auth_header(
|
||||||
token: &icarus_models::token::AccessToken,
|
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)
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ impl Upload {
|
|||||||
println!("Url: {url:?}");
|
println!("Url: {url:?}");
|
||||||
|
|
||||||
let mut headers = reqwest::header::HeaderMap::new();
|
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(auth, auth_val);
|
||||||
headers.insert("Accept", HeaderValue::from_str("*/*").unwrap());
|
headers.insert("Accept", HeaderValue::from_str("*/*").unwrap());
|
||||||
headers.insert("Connection", HeaderValue::from_str("keep-alive").unwrap());
|
headers.insert("Connection", HeaderValue::from_str("keep-alive").unwrap());
|
||||||
@@ -99,7 +99,7 @@ impl Upload {
|
|||||||
let url = format!("{}/{endpoint}", self.api.url);
|
let url = format!("{}/{endpoint}", self.api.url);
|
||||||
|
|
||||||
let mut headers = reqwest::header::HeaderMap::new();
|
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(auth, auth_val);
|
||||||
|
|
||||||
let payload = serde_json::json!({
|
let payload = serde_json::json!({
|
||||||
@@ -132,7 +132,7 @@ impl Upload {
|
|||||||
let url = format!("{}/{endpoint}", self.api.url);
|
let url = format!("{}/{endpoint}", self.api.url);
|
||||||
|
|
||||||
let mut headers = reqwest::header::HeaderMap::new();
|
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(auth, auth_val);
|
||||||
|
|
||||||
let payload = serde_json::json!({
|
let payload = serde_json::json!({
|
||||||
@@ -200,7 +200,7 @@ impl Upload {
|
|||||||
println!("Url: {url:?}");
|
println!("Url: {url:?}");
|
||||||
|
|
||||||
let mut headers = reqwest::header::HeaderMap::new();
|
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(auth, auth_val);
|
||||||
headers.insert("Accept", HeaderValue::from_str("*/*").unwrap());
|
headers.insert("Accept", HeaderValue::from_str("*/*").unwrap());
|
||||||
headers.insert("Connection", HeaderValue::from_str("keep-alive").unwrap());
|
headers.insert("Connection", HeaderValue::from_str("keep-alive").unwrap());
|
||||||
@@ -239,7 +239,7 @@ impl Upload {
|
|||||||
let url = format!("{}/{endpoint}", self.api.url);
|
let url = format!("{}/{endpoint}", self.api.url);
|
||||||
|
|
||||||
let mut headers = reqwest::header::HeaderMap::new();
|
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(auth, auth_val);
|
||||||
|
|
||||||
let payload = serde_json::json!({
|
let payload = serde_json::json!({
|
||||||
@@ -271,7 +271,7 @@ impl Upload {
|
|||||||
let url = format!("{}/{endpoint}", self.api.url);
|
let url = format!("{}/{endpoint}", self.api.url);
|
||||||
|
|
||||||
let mut headers = reqwest::header::HeaderMap::new();
|
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(auth, auth_val);
|
||||||
|
|
||||||
let payload = serde_json::json!({
|
let payload = serde_json::json!({
|
||||||
|
|||||||
@@ -1,6 +1,12 @@
|
|||||||
pub fn o_to_string(val: &std::ffi::OsString) -> Result<std::string::String, std::io::Error> {
|
pub fn o_to_string(val: &std::ffi::OsString) -> Result<std::string::String, std::io::Error> {
|
||||||
match val.clone().into_string() {
|
match val.clone().into_string() {
|
||||||
Ok(value) => Ok(value),
|
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")),
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user