phoenix/icarus_dm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

Saving changes

Browse Source
This commit is contained in:
phoenix
2025-03-15 18:02:45 -04:00
parent 24d91aa4ff
commit 554be00bce
7 changed files with 76 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+1 -1
View File
@@ -16,4 +16,4 @@ serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.140" serde_json = "1.0.140"
tokio = { version = "1.44.0", features = ["full"] } tokio = { version = "1.44.0", features = ["full"] }
tokio-util = { version = "0.7.13", features = ["codec"] } tokio-util = { version = "0.7.13", features = ["codec"] }
icarus-models = { git = "ssh://git@gitlab.com/kdeng00/icarus-models.git", tag = "dev-v0.1.7-05537a4f6d" } icarus-models = { git = "ssh://git@gitlab.com/kdeng00/icarus-models.git", tag = "v0.1.10" }
src/managers/commit_manager.rs
+41 -62
View File
@@ -51,12 +51,12 @@ impl Album {
println!("Disc Count: {}\n", self.disc_count); println!("Disc Count: {}\n", self.disc_count);
} }
pub fn retrieve_song(&self, track: i32, disc: i32) -> Result<models::song::Song> { pub fn retrieve_song(&self, track: i32, disc: i32) -> Result<icarus_models::song::Song> {
let mut found = false; let mut found = false;
let mut song = models::song::Song::default(); let mut song = icarus_models::song::Song::default();
for song_i in &self.songs { for song_i in &self.songs {
if song_i.track.unwrap() == track && song_i.disc.unwrap() == disc { if song_i.track == track && song_i.disc == disc {
song = song_i.clone(); song = song_i.clone();
found = true; found = true;
} }
@@ -135,14 +135,14 @@ impl CommitManager {
println!("Deleting song"); println!("Deleting song");
let mut song = 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 {
let flag = &arg.flag; let flag = &arg.flag;
let value = &arg.value; let value = &arg.value;
if flag == "-D" { if flag == "-D" {
song.id = Some(value.parse::<i32>().unwrap()); song.id = value.parse::<i32>().unwrap();
} }
} }
@@ -178,8 +178,8 @@ impl CommitManager {
println!("Message: {}", token.message); println!("Message: {}", token.message);
let mut dwn_loader = syncers::download::Download { api: api.clone() }; let mut dwn_loader = syncers::download::Download { api: api.clone() };
let mut song = models::song::Song::default(); let mut song = icarus_models::song::Song::default();
song.id = Some(num); song.id = num;
let result_fut = dwn_loader.download_song(&token, &song); let result_fut = dwn_loader.download_song(&token, &song);
let result = Runtime::new().unwrap().block_on(result_fut); let result = Runtime::new().unwrap().block_on(result_fut);
match result { match result {
@@ -220,7 +220,7 @@ impl CommitManager {
match result { match result {
Ok(o) => { Ok(o) => {
for son in o { for son in o {
son.print_info(); // son.print_info();
} }
} }
Err(er) => { Err(er) => {
@@ -315,7 +315,7 @@ impl CommitManager {
} }
let mut cover_art = models::song::CoverArt::default(); let mut cover_art = models::song::CoverArt::default();
let mut song = models::song::Song::default(); let mut song = icarus_models::song::Song::default();
let mut filenames = Vec::new(); let mut filenames = Vec::new();
let mut fp = String::new(); let mut fp = String::new();
let mut dir = String::new(); let mut dir = String::new();
@@ -337,8 +337,8 @@ impl CommitManager {
filenames.push(s.clone()); filenames.push(s.clone());
fp = s.clone(); fp = s.clone();
dir = song_file.parent().unwrap().display().to_string(); dir = song_file.parent().unwrap().display().to_string();
song.filename = Some(s.clone()); song.filename = s.clone();
song.directory = Some(dir.clone()); song.directory = dir.clone();
self.initialize_disc_and_track(&mut song); self.initialize_disc_and_track(&mut song);
} }
Err(er) => println!("Error: {:?}", er), Err(er) => println!("Error: {:?}", er),
@@ -352,12 +352,12 @@ impl CommitManager {
let album = self.retrieve_metadata(&meta_path); let album = self.retrieve_metadata(&meta_path);
let trck = i32::from_str(track_id).unwrap(); let trck = i32::from_str(track_id).unwrap();
let mut s = album.retrieve_song(trck, 1).unwrap(); let mut s = album.retrieve_song(trck, 1).unwrap();
s.filename = Some(fp); s.filename = (fp);
s.directory = Some(dir); s.directory = (dir);
s.genre = Some(album.genre.clone()); s.genre = (album.genre.clone());
s.year = Some(album.year.clone()); s.year = (album.year.clone());
s.album = Some(album.title.clone()); s.album = (album.title.clone());
s.data = Some(s.to_data().unwrap()); s.data = (s.to_data().unwrap());
cover_art.data = Some(cover_art.to_data().unwrap()); cover_art.data = Some(cover_art.to_data().unwrap());
@@ -396,7 +396,7 @@ impl CommitManager {
} }
let mut cover_art = models::song::CoverArt::default(); let mut cover_art = models::song::CoverArt::default();
let mut songs: Vec<models::song::Song> = Vec::new(); let mut songs: Vec<icarus_models::song::Song> = Vec::new();
let mut filenames: Vec<String> = Vec::new(); let mut filenames: Vec<String> = Vec::new();
let mut metadatapath: String = String::new(); let mut metadatapath: String = String::new();
@@ -425,15 +425,15 @@ impl CommitManager {
metadatapath = directory_part + "/" + &fname.unwrap(); metadatapath = directory_part + "/" + &fname.unwrap();
} }
En::SongFile => { En::SongFile => {
let mut song = models::song::Song::default(); let mut song = icarus_models::song::Song::default();
let fname = self.o_to_string(&file_name); let fname = self.o_to_string(&file_name);
match fname { match fname {
Ok(s) => { Ok(s) => {
filenames.push(s.clone()); filenames.push(s.clone());
song.filename = Some(s.clone()); song.filename = (s.clone());
song.directory = Some(sourcepath.clone()); song.directory = (sourcepath.clone());
song.data = Some(song.to_data().unwrap()); song.data = (song.to_data().unwrap());
self.initialize_disc_and_track(&mut song); self.initialize_disc_and_track(&mut song);
} }
Err(er) => println!("Error: {:?}", er), Err(er) => println!("Error: {:?}", er),
@@ -460,10 +460,12 @@ impl CommitManager {
println!(""); println!("");
for sng in &mut album.songs { for sng in &mut album.songs {
match sng.data { match sng.to_data() {
Some(_) => {} Ok(data) => {
None => { sng.data = data;
sng.data = Some(sng.to_data().unwrap()); }
Err(err) => {
return Err(err);
} }
}; };
} }
@@ -499,43 +501,21 @@ impl CommitManager {
// Apply directory // Apply directory
for song in &mut album.songs { for song in &mut album.songs {
let dir = &song.directory; let dir = &song.directory;
match dir { song.directory = directory.clone();
Some(s) => println!("{}", s),
None => {
song.directory = Some(directory.clone());
}
}
} }
// Apply filename // Apply filename
let mut index = 0; let mut index = 0;
for song in &mut album.songs { for song in &mut album.songs {
let filename = filenames[index].clone(); let filename = filenames[index].clone();
song.filename = Some(filename); song.filename = filename.clone();
index += 1; index += 1;
} }
for song in &mut album.songs { for song in &mut album.songs {
match &mut song.album { song.album = album.title.clone();
Some(_) => {} song.genre = (album.genre.clone());
None => { song.year = (album.year.clone());
song.album = Some(album.title.clone());
}
}
match &mut song.genre {
Some(_) => {}
None => {
song.genre = Some(album.genre.clone());
}
}
match &mut song.year {
Some(_) => {}
None => {
song.year = Some(album.year.clone());
}
}
} }
} }
@@ -591,12 +571,11 @@ impl CommitManager {
// Standards // Standards
// * track01.cdda.wav - Disc 1, Track 1 // * track01.cdda.wav - Disc 1, Track 1
// * track02d02.cdda.wav - Disc 2, Track 2 // * track02d02.cdda.wav - Disc 2, Track 2
fn initialize_disc_and_track(&mut self, song: &mut models::song::Song) { fn initialize_disc_and_track(&mut self, song: &mut icarus_models::song::Song) {
let mut disc = 1; let mut disc = 1;
let mut track = 1; let mut track = 1;
let mut mode = 0; let mut mode = 0;
let filename = let filename = &song.filename;
&<std::option::Option<std::string::String> as Clone>::clone(&song.filename).unwrap();
let trd = filename.contains("trackd"); let trd = filename.contains("trackd");
let tr = filename.contains("track"); let tr = filename.contains("track");
@@ -680,11 +659,11 @@ impl CommitManager {
_ => println!(""), _ => println!(""),
} }
song.disc = Some(disc); song.disc = (disc);
song.track = Some(track); song.track = (track);
} }
fn _parse_disc_and_track(&self, song: &mut models::song::Song, track_id: &String) { fn _parse_disc_and_track(&self, song: &mut icarus_models::song::Song, track_id: &String) {
let sep = |_a: &char, _b: &char| -> bool { let sep = |_a: &char, _b: &char| -> bool {
return false; return false;
}; };
@@ -706,11 +685,11 @@ impl CommitManager {
d_str.push(c); d_str.push(c);
} }
song.disc = Some(d_str.parse::<i32>().unwrap()); song.disc = (d_str.parse::<i32>().unwrap());
song.track = Some(t_str.parse::<i32>().unwrap()); song.track = (t_str.parse::<i32>().unwrap());
} else { } else {
if utilities::checks::Checks::is_numeric(track_id) { if utilities::checks::Checks::is_numeric(track_id) {
song.track = Some(track_id.parse::<i32>().unwrap()); song.track = (track_id.parse::<i32>().unwrap());
} }
} }
} }
src/models/song.rs
+5 -1
View File
@@ -3,6 +3,7 @@ use std::io::Read;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
/*
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
pub struct Song { pub struct Song {
#[serde(alias = "id")] #[serde(alias = "id")]
@@ -24,6 +25,7 @@ pub struct Song {
pub data: Option<Vec<u8>>, pub data: Option<Vec<u8>>,
pub directory: Option<String>, pub directory: Option<String>,
} }
*/
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
pub struct Album { pub struct Album {
@@ -35,7 +37,7 @@ pub struct Album {
pub track_count: i32, pub track_count: i32,
pub disc_count: i32, pub disc_count: i32,
#[serde(alias = "tracks")] #[serde(alias = "tracks")]
pub songs: Vec<Song>, pub songs: Vec<icarus_models::song::Song>,
} }
impl Default for Album { impl Default for Album {
@@ -52,6 +54,7 @@ impl Default for Album {
} }
} }
/*
impl Default for Song { impl Default for Song {
fn default() -> Self { fn default() -> Self {
Song { Song {
@@ -139,6 +142,7 @@ impl Song {
return serde_json::to_string_pretty(&self); return serde_json::to_string_pretty(&self);
} }
} }
*/
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
pub struct CoverArt { pub struct CoverArt {
src/syncers/delete.rs
+6 -6
View File
@@ -21,8 +21,8 @@ impl Delete {
pub async fn delete_song( pub async fn delete_song(
&mut self, &mut self,
token: &icarus_models::token::AccessToken, token: &icarus_models::token::AccessToken,
song: &models::song::Song, song: &icarus_models::song::Song,
) -> Result<models::song::Song, std::io::Error> { ) -> Result<icarus_models::song::Song, std::io::Error> {
self.api.endpoint = "song/data/delete".to_owned(); self.api.endpoint = "song/data/delete".to_owned();
let url = self.retrieve_url(&song); let url = self.retrieve_url(&song);
let client = reqwest::Client::builder().build().unwrap(); let client = reqwest::Client::builder().build().unwrap();
@@ -33,12 +33,12 @@ impl Delete {
.send() .send()
.await .await
.unwrap(); .unwrap();
let mut sng = models::song::Song::default(); let mut sng = icarus_models::song::Song::default();
match response.status() { match response.status() {
reqwest::StatusCode::OK => { reqwest::StatusCode::OK => {
println!("Success!"); println!("Success!");
let s = response.json::<models::song::Song>().await; let s = response.json::<icarus_models::song::Song>().await;
match s { match s {
// //
Ok(parsed) => { Ok(parsed) => {
@@ -57,7 +57,7 @@ impl Delete {
return Ok(sng); return Ok(sng);
} }
fn retrieve_url(&self, song: &models::song::Song) -> String { fn retrieve_url(&self, song: &icarus_models::song::Song) -> String {
let api = &self.api; let api = &self.api;
let mut url: String = String::from(&api.url); let mut url: String = String::from(&api.url);
url += &String::from("api/"); url += &String::from("api/");
@@ -65,7 +65,7 @@ impl Delete {
url += &String::from("/"); url += &String::from("/");
url += &String::from(&api.endpoint); url += &String::from(&api.endpoint);
url += &String::from("/"); url += &String::from("/");
url += &song.id.unwrap().to_string(); url += &song.id.to_string();
return url; return url;
} }
src/syncers/download.rs
+3 -3
View File
@@ -24,7 +24,7 @@ impl Download {
pub async fn download_song( pub async fn download_song(
&mut self, &mut self,
token: &icarus_models::token::AccessToken, token: &icarus_models::token::AccessToken,
song: &models::song::Song, song: &icarus_models::song::Song,
) -> Result<String, MyError> { ) -> Result<String, MyError> {
self.api.endpoint = String::from("song/data/download"); self.api.endpoint = String::from("song/data/download");
let url = self.retrieve_url(&song); let url = self.retrieve_url(&song);
@@ -67,7 +67,7 @@ impl Download {
return Err(MyError::Other(String::from("Error downloading"))); return Err(MyError::Other(String::from("Error downloading")));
} }
fn retrieve_url(&self, song: &models::song::Song) -> String { fn retrieve_url(&self, song: &icarus_models::song::Song) -> String {
let api = &self.api; let api = &self.api;
let mut url: String = String::from(&api.url); let mut url: String = String::from(&api.url);
url += &String::from("api/"); url += &String::from("api/");
@@ -75,7 +75,7 @@ impl Download {
url += &String::from("/"); url += &String::from("/");
url += &String::from(&api.endpoint); url += &String::from(&api.endpoint);
url += &String::from("/"); url += &String::from("/");
url += &song.id.unwrap().to_string(); url += &song.id.to_string();
return url; return url;
} }
src/syncers/retrieve_records.rs
+3 -3
View File
@@ -19,9 +19,9 @@ impl RetrieveRecords {
pub async fn get_all_songs( pub async fn get_all_songs(
&mut self, &mut self,
token: &icarus_models::token::AccessToken, token: &icarus_models::token::AccessToken,
) -> Result<Vec<models::song::Song>, Error> { ) -> Result<Vec<icarus_models::song::Song>, Error> {
self.api.endpoint = String::from("song"); self.api.endpoint = String::from("song");
let mut songs: Vec<models::song::Song> = Vec::new(); let mut songs: Vec<icarus_models::song::Song> = Vec::new();
let url = self.retrieve_url(); let url = self.retrieve_url();
let access_token = token.bearer_token(); let access_token = token.bearer_token();
@@ -46,7 +46,7 @@ impl RetrieveRecords {
match response.status() { match response.status() {
reqwest::StatusCode::OK => { reqwest::StatusCode::OK => {
// on success, parse our JSON to an APIResponse // on success, parse our JSON to an APIResponse
let s = response.json::<Vec<models::song::Song>>().await; let s = response.json::<Vec<icarus_models::song::Song>>().await;
match s { match s {
// //
Ok(parsed) => { Ok(parsed) => {
src/syncers/upload.rs
+17 -9
View File
@@ -47,14 +47,21 @@ impl Upload {
pub async fn upload_song_with_metadata( pub async fn upload_song_with_metadata(
&mut self, &mut self,
token: &icarus_models::token::AccessToken, token: &icarus_models::token::AccessToken,
song: &models::song::Song, song: &icarus_models::song::Song,
cover: &models::song::CoverArt, cover: &models::song::CoverArt,
album: &models::song::Album, album: &models::song::Album,
) -> Result<reqwest::Response, std::io::Error> { ) -> Result<reqwest::Response, std::io::Error> {
self.api.endpoint = String::from("song/data/upload/with/data"); self.api.endpoint = String::from("song/data/upload/with/data");
let url = self.retrieve_url(); let url = self.retrieve_url();
let mut new_song = self.initialize_song(&song, &album); let mut new_song = self.initialize_song(&song, &album);
new_song.songpath = song.song_path(); match song.song_path() {
Ok(p) => {
new_song.songpath = p;
}
Err(er) => {
return Err(std::io::Error::new(std::io::ErrorKind::Other, "Error with song path"));
}
}
let access_token = token.bearer_token(); let access_token = token.bearer_token();
if url.is_empty() { if url.is_empty() {
@@ -172,21 +179,22 @@ impl Upload {
return url; return url;
} }
fn initialize_song(&self, song: &models::song::Song, album: &models::song::Album) -> Song { fn initialize_song(&self, song: &icarus_models::song::Song, album: &models::song::Album) -> Song {
let dur = song.duration.clone().unwrap(); let dur = song.duration.clone();
println!("Duration: {}", dur); println!("Duration: {}", dur);
return Song { return Song {
title: String::from(&song.title.clone().unwrap()), title: String::from(&song.title.clone()),
album: album.title.clone(), album: album.title.clone(),
artist: String::from(&song.artist.clone().unwrap().clone()), artist: String::from(&song.artist.clone().clone()),
album_artist: album.album_artist.clone(), album_artist: album.album_artist.clone(),
year: album.year.clone(), year: album.year.clone(),
genre: album.genre.clone(), genre: album.genre.clone(),
duration: f64::round(dur) as i32, // duration: f64::round(dur) as i32,
track: (song.track.clone().unwrap()), duration: dur,
track: (song.track.clone()),
track_count: album.track_count.clone(), track_count: album.track_count.clone(),
disc: song.disc.clone().unwrap(), disc: song.disc.clone(),
disc_count: album.disc_count.clone(), disc_count: album.disc_count.clone(),
songpath: String::new(), songpath: String::new(),
}; };