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

Migrating over icarus-model coverart

Browse Source
This commit is contained in:
phoenix
2025-03-22 19:40:30 -04:00
parent 7eaa719c4f
commit 759f00d38c
3 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/managers/commit_manager.rs
+20 -8
View File
@@ -229,10 +229,12 @@ impl CommitManager {
match Runtime::new().unwrap().block_on(result_fut) { match Runtime::new().unwrap().block_on(result_fut) {
Ok(o) => { Ok(o) => {
println!("Success"); println!("Success");
let filename = String::from("audio") + icarus_models::constants::DEFAULTMUSICEXTENSION; let filename =
String::from("audio") + icarus_models::constants::DEFAULTMUSICEXTENSION;
let data = o.as_bytes(); let data = o.as_bytes();
let mut file = std::fs::File::create(filename).expect("Failed to save"); let mut file = std::fs::File::create(filename).expect("Failed to save");
file.write_all(&data).expect("Failed to save downloaded song"); file.write_all(&data)
.expect("Failed to save downloaded song");
} }
Err(er) => { Err(er) => {
println!("Error {:?}", er); println!("Error {:?}", er);
@@ -365,7 +367,12 @@ impl CommitManager {
panic!("Error"); panic!("Error");
} }
let mut cover_art = models::song::CoverArt::default(); let mut cover_art = icarus_models::coverart::CoverArt {
id: 0,
title: String::new(),
path: String::new(),
data: Vec::new(),
};
let mut song = icarus_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();
@@ -398,7 +405,7 @@ impl CommitManager {
_ => {} _ => {}
} }
cover_art.path = Some(cover_path.clone()); cover_art.path = cover_path.clone();
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();
@@ -410,7 +417,7 @@ impl CommitManager {
// s.album = album.title.clone(); // s.album = album.title.clone();
s.data = s.to_data().unwrap(); s.data = s.to_data().unwrap();
cover_art.data = Some(cover_art.to_data().unwrap()); cover_art.data = cover_art.to_data().unwrap();
let mut up = syncers::upload::Upload::default(); let mut up = syncers::upload::Upload::default();
let host = self.ica_action.retrieve_flag_value(&String::from("-h")); let host = self.ica_action.retrieve_flag_value(&String::from("-h"));
@@ -464,7 +471,12 @@ impl CommitManager {
panic!("Directory does not exist"); panic!("Directory does not exist");
} }
let mut cover_art = models::song::CoverArt::default(); let mut cover_art = icarus_models::coverart::CoverArt {
id: 0,
title: String::new(),
path: String::new(),
data: Vec::new(),
};
let mut songs: Vec<icarus_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();
@@ -486,7 +498,7 @@ impl CommitManager {
let directory_part = sourcepath.clone(); let directory_part = sourcepath.clone();
let fname = self.o_to_string(&file_name); let fname = self.o_to_string(&file_name);
let fullpath = directory_part + "/" + &fname.unwrap(); let fullpath = directory_part + "/" + &fname.unwrap();
cover_art.path = Some(fullpath); cover_art.path = fullpath;
} }
En::MetadataFile => { En::MetadataFile => {
let directory_part = sourcepath.clone(); let directory_part = sourcepath.clone();
@@ -525,7 +537,7 @@ impl CommitManager {
let host = self.ica_action.retrieve_flag_value(&String::from("-h")); let host = self.ica_action.retrieve_flag_value(&String::from("-h"));
up.set_api(&host); up.set_api(&host);
cover_art.data = Some(cover_art.to_data().unwrap()); cover_art.data = cover_art.to_data().unwrap();
println!(""); println!("");
src/models/mod.rs
+1 -1
View File
@@ -1,5 +1,5 @@
pub mod api; pub mod api;
pub mod flags; pub mod flags;
pub mod icarus_action; pub mod icarus_action;
pub mod song; // pub mod song;
pub mod upload_form; pub mod upload_form;
src/syncers/upload.rs
+7 -3
View File
@@ -48,7 +48,7 @@ impl Upload {
&mut self, &mut self,
token: &icarus_models::token::AccessToken, token: &icarus_models::token::AccessToken,
song: &icarus_models::song::Song, song: &icarus_models::song::Song,
cover: &models::song::CoverArt, cover: &icarus_models::coverart::CoverArt,
album: &icarus_models::album::collection::Album, album: &icarus_models::album::collection::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");
@@ -132,9 +132,13 @@ impl Upload {
.part("file", file.file_name(song_filename)); .part("file", file.file_name(song_filename));
} }
fn init_form(&self, song: &Song, cover: &models::song::CoverArt) -> reqwest::multipart::Form { fn init_form(
&self,
song: &Song,
cover: &icarus_models::coverart::CoverArt,
) -> reqwest::multipart::Form {
let songpath = song.songpath.clone(); let songpath = song.songpath.clone();
let coverpath = cover.path.clone().unwrap(); let coverpath = cover.path.clone();
let song_detail = song.to_metadata_json().unwrap(); let song_detail = song.to_metadata_json().unwrap();
println!("\n{}\n", song_detail); println!("\n{}\n", song_detail);