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

Updating name of dependency

Browse Source
This commit is contained in:
phoenix
2026-07-16 13:37:54 -04:00
parent f3a0d90af3
commit 44e7b36db7
10 changed files with 70 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+1 -1
View File
@@ -13,4 +13,4 @@ serde_json = "1.0.150"
tokio = { version = "1.52.3", features = ["full"] } tokio = { version = "1.52.3", features = ["full"] }
tokio-util = { version = "0.7.18", features = ["codec"] } tokio-util = { version = "0.7.18", features = ["codec"] }
uuid = { version = "1.23.4", features = ["v4", "serde"] } uuid = { version = "1.23.4", features = ["v4", "serde"] }
icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.11.3" } simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.3-main-fe9d101bd0-111" }
src/main.rs
+4 -4
View File
@@ -51,7 +51,7 @@ mod tests {
assert!(false, "File does not exists: {meta_path:?}"); assert!(false, "File does not exists: {meta_path:?}");
} }
match icarus_models::album::collection::parse_album(&meta_path) { match simodels::album::collection::parse_album(&meta_path) {
Ok(album) => { Ok(album) => {
for track in 1..3 { for track in 1..3 {
let directory_path = std::path::Path::new(&meta_path); let directory_path = std::path::Path::new(&meta_path);
@@ -59,17 +59,17 @@ mod tests {
let filename: String = if track < 10 { let filename: String = if track < 10 {
String::from("track0") String::from("track0")
+ &track.to_string() + &track.to_string()
+ icarus_models::constants::file_extensions::audio::DEFAULTMUSICEXTENSION + simodels::constants::file_extensions::audio::DEFAULTMUSICEXTENSION
} else { } else {
String::from("track") String::from("track")
+ &track.to_string() + &track.to_string()
+ icarus_models::constants::file_extensions::audio::DEFAULTMUSICEXTENSION + simodels::constants::file_extensions::audio::DEFAULTMUSICEXTENSION
}; };
let disc = 1; let disc = 1;
match managers::commit_manager::retrieve_song( match managers::commit_manager::retrieve_song(
&album, track, disc, &directory, &filename, &album, track, disc, &directory, &filename,
) { ) {
Ok(song) => match icarus_models::song::io::to_data(&song) { Ok(song) => match simodels::song::io::to_data(&song) {
Ok(_) => { Ok(_) => {
print!("Success"); print!("Success");
} }
src/managers/commit_manager.rs
+37 -40
View File
@@ -36,21 +36,21 @@ enum En {
#[derive(Debug)] #[derive(Debug)]
struct UploadSongMembers { struct UploadSongMembers {
pub song: icarus_models::song::Song, pub song: simodels::song::Song,
pub coverart: icarus_models::coverart::CoverArt, pub coverart: simodels::coverart::CoverArt,
pub token: icarus_models::token::AccessToken, pub token: simodels::token::AccessToken,
pub album: icarus_models::album::collection::Album, pub album: simodels::album::collection::Album,
} }
pub fn retrieve_song( pub fn retrieve_song(
album: &icarus_models::album::collection::Album, album: &simodels::album::collection::Album,
track: i32, track: i32,
disc: i32, disc: i32,
directory: &str, directory: &str,
filename: &str, filename: &str,
) -> Result<icarus_models::song::Song> { ) -> Result<simodels::song::Song> {
let mut found = false; let mut found = false;
let mut song = icarus_models::song::Song::default(); let mut song = simodels::song::Song::default();
for song_i in &album.tracks { for song_i in &album.tracks {
if song_i.track == track && song_i.disc == disc { if song_i.track == track && song_i.disc == disc {
@@ -58,9 +58,8 @@ pub fn retrieve_song(
song.album = album.title.clone(); song.album = album.title.clone();
song.album_artist = album.artist.clone(); song.album_artist = album.artist.clone();
song.artist = track.artist.clone(); song.artist = track.artist.clone();
song.audio_type = String::from( song.audio_type =
icarus_models::constants::file_extensions::audio::DEFAULTMUSICEXTENSION, String::from(simodels::constants::file_extensions::audio::DEFAULTMUSICEXTENSION);
);
song.disc = track.disc; song.disc = track.disc;
song.disc_count = album.disc_count; song.disc_count = album.disc_count;
song.duration = track.duration as i32; song.duration = track.duration as i32;
@@ -143,13 +142,13 @@ impl CommitManager {
]) ])
} }
async fn delete_song(&self, token: &icarus_models::token::AccessToken) { async fn delete_song(&self, token: &simodels::token::AccessToken) {
println!("Deleting song"); println!("Deleting song");
let mut del = syncers::delete::Delete { let mut del = syncers::delete::Delete {
api: self.api.clone(), api: self.api.clone(),
}; };
let mut song = icarus_models::song::Song::default(); let mut song = simodels::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;
@@ -170,13 +169,13 @@ impl CommitManager {
} }
} }
async fn download_song(&self, token: &icarus_models::token::AccessToken) { async fn download_song(&self, token: &simodels::token::AccessToken) {
println!("Downloading 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 mut dwn_loader = syncers::download::Download { let mut dwn_loader = syncers::download::Download {
api: self.api.clone(), api: self.api.clone(),
}; };
let mut song = icarus_models::song::Song { let mut song = simodels::song::Song {
id: uuid::Uuid::from_str(dwn.as_str()).unwrap(), id: uuid::Uuid::from_str(dwn.as_str()).unwrap(),
..Default::default() ..Default::default()
}; };
@@ -187,8 +186,8 @@ impl CommitManager {
song.data = o.as_bytes().to_vec(); song.data = o.as_bytes().to_vec();
song.directory = String::from("."); song.directory = String::from(".");
song.filename = match icarus_models::song::generate_filename( song.filename = match simodels::song::generate_filename(
icarus_models::types::MusicType::FlacExtension, simodels::types::MusicType::FlacExtension,
true, true,
) { ) {
Ok(filename) => filename, Ok(filename) => filename,
@@ -221,7 +220,7 @@ impl CommitManager {
} }
} }
async fn retrieve_object(&self, token: &icarus_models::token::AccessToken) { async fn retrieve_object(&self, token: &simodels::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"));
@@ -250,12 +249,12 @@ impl CommitManager {
} }
} }
async fn parse_token(&self, api: &models::api::Api) -> icarus_models::token::AccessToken { async fn parse_token(&self, api: &models::api::Api) -> simodels::token::AccessToken {
println!("Fetching token"); println!("Fetching token");
let mut usr_mgr: managers::user_manager::UserManager = let mut usr_mgr: managers::user_manager::UserManager =
managers::user_manager::UserManager { managers::user_manager::UserManager {
user: icarus_models::user::User::default(), user: simodels::user::User::default(),
ica_action: self.ica_action.clone(), ica_action: self.ica_action.clone(),
}; };
usr_mgr.parse_user_from_actions(); usr_mgr.parse_user_from_actions();
@@ -272,7 +271,7 @@ impl CommitManager {
token.unwrap() token.unwrap()
} }
async fn upload_song_with_metadata(&mut self, token: &icarus_models::token::AccessToken) { async fn upload_song_with_metadata(&mut self, token: &simodels::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"));
@@ -316,7 +315,7 @@ 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, token: &simodels::token::AccessToken,
) -> Result<()> { ) -> Result<()> {
let song_file = std::path::Path::new(&songpath); let song_file = std::path::Path::new(&songpath);
@@ -327,7 +326,7 @@ impl CommitManager {
let pa = std::path::Path::new(&cover_path); let pa = std::path::Path::new(&cover_path);
let mut cover_art = icarus_models::coverart::CoverArt { let mut cover_art = simodels::coverart::CoverArt {
directory: String::from(pa.parent().unwrap().to_str().unwrap()), directory: String::from(pa.parent().unwrap().to_str().unwrap()),
filename: String::from(pa.file_name().unwrap().to_str().unwrap()), filename: String::from(pa.file_name().unwrap().to_str().unwrap()),
..Default::default() ..Default::default()
@@ -339,7 +338,7 @@ impl CommitManager {
Ok(s) => { Ok(s) => {
println!("file name: {file_name:?}"); println!("file name: {file_name:?}");
match icarus_models::album::collection::parse_album(meta_path) { match simodels::album::collection::parse_album(meta_path) {
Ok(album) => { Ok(album) => {
let filename = s.clone(); let filename = s.clone();
let directory = song_file.parent().unwrap().display().to_string(); let directory = song_file.parent().unwrap().display().to_string();
@@ -349,9 +348,8 @@ impl CommitManager {
println!("Directory: {:?}", s.directory); println!("Directory: {:?}", s.directory);
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 = simodels::song::io::to_data(&s).unwrap();
cover_art.data = cover_art.data = simodels::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,
@@ -448,23 +446,23 @@ impl CommitManager {
&self, &self,
metadata_path: &String, metadata_path: &String,
source_directory: &str, source_directory: &str,
) -> Result<Vec<icarus_models::song::Song>> { ) -> Result<Vec<simodels::song::Song>> {
match icarus_models::album::collection::parse_album(metadata_path) { match simodels::album::collection::parse_album(metadata_path) {
Ok(albums) => { Ok(albums) => {
let mut songs: Vec<icarus_models::song::Song> = Vec::new(); let mut songs: Vec<simodels::song::Song> = Vec::new();
for track in &albums.tracks { for track in &albums.tracks {
let song_filename = if track.track < 10 { let song_filename = if track.track < 10 {
"track0".to_owned() "track0".to_owned()
+ &track.track.to_string() + &track.track.to_string()
+ icarus_models::constants::file_extensions::audio::DEFAULTMUSICEXTENSION + simodels::constants::file_extensions::audio::DEFAULTMUSICEXTENSION
} else { } else {
"track".to_owned() "track".to_owned()
+ &track.track.to_string() + &track.track.to_string()
+ icarus_models::constants::file_extensions::audio::DEFAULTMUSICEXTENSION + simodels::constants::file_extensions::audio::DEFAULTMUSICEXTENSION
}; };
songs.push(icarus_models::song::Song { songs.push(simodels::song::Song {
title: track.title.clone(), title: track.title.clone(),
artist: track.artist.clone(), artist: track.artist.clone(),
disc: track.disc, disc: track.disc,
@@ -491,7 +489,7 @@ impl CommitManager {
async fn multi_target_upload( async fn multi_target_upload(
&mut self, &mut self,
sourcepath: &String, sourcepath: &String,
token: &icarus_models::token::AccessToken, token: &simodels::token::AccessToken,
) -> std::io::Result<()> { ) -> std::io::Result<()> {
let directory_path = std::path::Path::new(&sourcepath); let directory_path = std::path::Path::new(&sourcepath);
@@ -501,7 +499,7 @@ impl CommitManager {
let (coverart_directory, coverart_filename) = let (coverart_directory, coverart_filename) =
self.get_coverart_dir_and_filename(sourcepath).unwrap(); self.get_coverart_dir_and_filename(sourcepath).unwrap();
let mut cover_art = icarus_models::coverart::init::init_coverart_dir_and_filename( let mut cover_art = simodels::coverart::init::init_coverart_dir_and_filename(
&coverart_directory, &coverart_directory,
&coverart_filename, &coverart_filename,
); );
@@ -511,10 +509,10 @@ 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 = icarus_models::coverart::io::to_data(&cover_art).unwrap(); cover_art.data = simodels::coverart::io::to_data(&cover_art).unwrap();
match self.get_songs(&metadatapath, sourcepath) { match self.get_songs(&metadatapath, sourcepath) {
Ok(sngs) => match icarus_models::album::collection::parse_album(&metadatapath) { Ok(sngs) => match simodels::album::collection::parse_album(&metadatapath) {
Ok(album) => { Ok(album) => {
for song in sngs { for song in sngs {
let members = UploadSongMembers { let members = UploadSongMembers {
@@ -595,15 +593,14 @@ impl CommitManager {
index += 1; index += 1;
} }
if extension == icarus_models::constants::file_extensions::audio::WAVEXTENSION[1..] if extension == simodels::constants::file_extensions::audio::WAVEXTENSION[1..]
|| extension || extension == simodels::constants::file_extensions::audio::FLACEXTENSION[1..]
== icarus_models::constants::file_extensions::audio::FLACEXTENSION[1..]
{ {
return En::SongFile; return En::SongFile;
} else if extension == "json" { } else if extension == "json" {
return En::MetadataFile; return En::MetadataFile;
} else if extension } else if extension
== icarus_models::constants::file_extensions::image::JPGEXTENSION[1..] == simodels::constants::file_extensions::image::JPGEXTENSION[1..]
|| extension == "jpeg" || extension == "jpeg"
|| extension == "png" || extension == "png"
{ {
src/managers/token_manager.rs
+5 -5
View File
@@ -7,20 +7,20 @@ mod response {
#[derive(Debug, serde::Deserialize, serde::Serialize)] #[derive(Debug, serde::Deserialize, serde::Serialize)]
pub struct Response { pub struct Response {
pub message: String, pub message: String,
pub data: Vec<icarus_models::login_result::LoginResult>, pub data: Vec<simodels::login_result::LoginResult>,
} }
} }
} }
pub struct TokenManager { pub struct TokenManager {
pub user: icarus_models::user::User, pub user: simodels::user::User,
pub api: models::api::Api, pub api: models::api::Api,
} }
impl Default for TokenManager { impl Default for TokenManager {
fn default() -> Self { fn default() -> Self {
let mut token = TokenManager { let mut token = TokenManager {
user: icarus_models::user::User::default(), user: simodels::user::User::default(),
api: models::api::Api::default(), api: models::api::Api::default(),
}; };
token.init(); token.init();
@@ -30,13 +30,13 @@ impl Default for TokenManager {
} }
impl TokenManager { impl TokenManager {
pub async fn request_token(&self) -> Result<icarus_models::token::AccessToken, std::io::Error> { pub async fn request_token(&self) -> Result<simodels::token::AccessToken, std::io::Error> {
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 = simodels::token::AccessToken {
user_id: uuid::Uuid::nil(), user_id: uuid::Uuid::nil(),
username: String::new(), username: String::new(),
token: String::new(), token: String::new(),
src/managers/user_manager.rs
+2 -2
View File
@@ -4,12 +4,12 @@ use crate::models::{self};
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct UserManager { pub struct UserManager {
pub user: icarus_models::user::User, pub user: simodels::user::User,
pub ica_action: models::icarus_action::IcarusAction, pub ica_action: models::icarus_action::IcarusAction,
} }
impl UserManager { impl UserManager {
pub fn retrieve_user(&self) -> icarus_models::user::User { pub fn retrieve_user(&self) -> simodels::user::User {
self.user.clone() self.user.clone()
} }
src/syncers/common.rs
+1 -1
View File
@@ -17,7 +17,7 @@ fn retrieve_url_with_id(api: &models::api::Api, id: &uuid::Uuid) -> String {
} }
pub async fn auth_header( pub async fn auth_header(
token: &icarus_models::token::AccessToken, token: &simodels::token::AccessToken,
) -> Result<(http::HeaderName, http::HeaderValue), http::header::InvalidHeaderValue> { ) -> Result<(http::HeaderName, http::HeaderValue), http::header::InvalidHeaderValue> {
match http::HeaderValue::from_str(&token.bearer_token()) { match http::HeaderValue::from_str(&token.bearer_token()) {
Ok(auth_value) => Ok((reqwest::header::AUTHORIZATION, auth_value)), Ok(auth_value) => Ok((reqwest::header::AUTHORIZATION, auth_value)),
src/syncers/delete.rs
+5 -6
View File
@@ -13,8 +13,8 @@ mod response {
pub mod delete_song { pub mod delete_song {
#[derive(Debug, serde::Deserialize)] #[derive(Debug, serde::Deserialize)]
pub struct SongAndCoverArt { pub struct SongAndCoverArt {
pub song: icarus_models::song::Song, pub song: simodels::song::Song,
pub coverart: icarus_models::coverart::CoverArt, pub coverart: simodels::coverart::CoverArt,
} }
#[derive(Debug, serde::Deserialize)] #[derive(Debug, serde::Deserialize)]
@@ -28,10 +28,9 @@ mod response {
impl Delete { impl Delete {
pub async fn delete_song( pub async fn delete_song(
&mut self, &mut self,
token: &icarus_models::token::AccessToken, token: &simodels::token::AccessToken,
song: &icarus_models::song::Song, song: &simodels::song::Song,
) -> Result<(icarus_models::song::Song, icarus_models::coverart::CoverArt), std::io::Error> ) -> Result<(simodels::song::Song, simodels::coverart::CoverArt), std::io::Error> {
{
self.api.endpoint = "api/v2/song".to_owned(); self.api.endpoint = "api/v2/song".to_owned();
let url = format!("{}{}/{}", self.api.url, self.api.endpoint, song.id); let url = format!("{}{}/{}", self.api.url, self.api.endpoint, song.id);
println!("Url: {url:?}"); println!("Url: {url:?}");
src/syncers/download.rs
+2 -2
View File
@@ -17,8 +17,8 @@ pub enum MyError {
impl Download { impl Download {
pub async fn download_song( pub async fn download_song(
&mut self, &mut self,
token: &icarus_models::token::AccessToken, token: &simodels::token::AccessToken,
song: &icarus_models::song::Song, song: &simodels::song::Song,
) -> Result<String, MyError> { ) -> Result<String, MyError> {
self.api.endpoint = String::from("song/download"); self.api.endpoint = String::from("song/download");
let url = syncers::common::retrieve_url(&self.api, true, &song.id); let url = syncers::common::retrieve_url(&self.api, true, &song.id);
src/syncers/retrieve_records.rs
+3 -3
View File
@@ -13,7 +13,7 @@ mod response {
#[derive(Debug, serde::Deserialize)] #[derive(Debug, serde::Deserialize)]
pub struct Response { pub struct Response {
pub message: String, pub message: String,
pub data: Vec<icarus_models::song::Song>, pub data: Vec<simodels::song::Song>,
} }
} }
} }
@@ -21,8 +21,8 @@ mod response {
impl RetrieveRecords { impl RetrieveRecords {
pub async fn get_all_songs( pub async fn get_all_songs(
&mut self, &mut self,
token: &icarus_models::token::AccessToken, token: &simodels::token::AccessToken,
) -> Result<Vec<icarus_models::song::Song>, Error> { ) -> Result<Vec<simodels::song::Song>, Error> {
self.api.endpoint = String::from("api/v2/song/all"); self.api.endpoint = String::from("api/v2/song/all");
let url = format!("{}{}", self.api.url, self.api.endpoint); let url = format!("{}{}", self.api.url, self.api.endpoint);
let access_token = token.bearer_token(); let access_token = token.bearer_token();
src/syncers/upload.rs
+10 -10
View File
@@ -40,8 +40,8 @@ mod response {
impl Upload { impl Upload {
pub async fn queue_song( pub async fn queue_song(
&self, &self,
token: &icarus_models::token::AccessToken, token: &simodels::token::AccessToken,
song: &icarus_models::song::Song, song: &simodels::song::Song,
) -> Result<uuid::Uuid, reqwest::Error> { ) -> Result<uuid::Uuid, reqwest::Error> {
let songpath = song.song_path().unwrap(); let songpath = song.song_path().unwrap();
let file = tokio::fs::File::open(&songpath).await.unwrap(); let file = tokio::fs::File::open(&songpath).await.unwrap();
@@ -92,7 +92,7 @@ impl Upload {
pub async fn link_user_to_queued_song( pub async fn link_user_to_queued_song(
&self, &self,
token: &icarus_models::token::AccessToken, token: &simodels::token::AccessToken,
queued_song_id: &uuid::Uuid, queued_song_id: &uuid::Uuid,
) -> Result<(), reqwest::Error> { ) -> Result<(), reqwest::Error> {
let endpoint = String::from("api/v2/song/queue/link"); let endpoint = String::from("api/v2/song/queue/link");
@@ -123,9 +123,9 @@ impl Upload {
pub async fn queue_metadata( pub async fn queue_metadata(
&self, &self,
token: &icarus_models::token::AccessToken, token: &simodels::token::AccessToken,
album: &icarus_models::album::collection::Album, album: &simodels::album::collection::Album,
song: &icarus_models::song::Song, song: &simodels::song::Song,
queued_song_id: &uuid::Uuid, queued_song_id: &uuid::Uuid,
) -> Result<uuid::Uuid, reqwest::Error> { ) -> Result<uuid::Uuid, reqwest::Error> {
let endpoint = String::from("api/v2/song/metadata/queue"); let endpoint = String::from("api/v2/song/metadata/queue");
@@ -173,8 +173,8 @@ impl Upload {
pub async fn queue_coverart( pub async fn queue_coverart(
&self, &self,
token: &icarus_models::token::AccessToken, token: &simodels::token::AccessToken,
coverart: &icarus_models::coverart::CoverArt, coverart: &simodels::coverart::CoverArt,
) -> Result<uuid::Uuid, reqwest::Error> { ) -> Result<uuid::Uuid, reqwest::Error> {
let coverartpath = coverart.get_path().unwrap(); let coverartpath = coverart.get_path().unwrap();
let file = tokio::fs::File::open(&coverartpath).await.unwrap(); let file = tokio::fs::File::open(&coverartpath).await.unwrap();
@@ -231,7 +231,7 @@ impl Upload {
pub async fn link_queued_song_to_queued_coverart( pub async fn link_queued_song_to_queued_coverart(
&self, &self,
token: &icarus_models::token::AccessToken, token: &simodels::token::AccessToken,
queued_song_id: &uuid::Uuid, queued_song_id: &uuid::Uuid,
queued_coverart_id: &uuid::Uuid, queued_coverart_id: &uuid::Uuid,
) -> Result<(), reqwest::Error> { ) -> Result<(), reqwest::Error> {
@@ -263,7 +263,7 @@ impl Upload {
pub async fn update_queued_song_status( pub async fn update_queued_song_status(
&self, &self,
token: &icarus_models::token::AccessToken, token: &simodels::token::AccessToken,
queued_song_id: &uuid::Uuid, queued_song_id: &uuid::Uuid,
status: &str, status: &str,
) -> Result<(), reqwest::Error> { ) -> Result<(), reqwest::Error> {