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

Updated icarus-model #33

Merged
kdeng00 merged 28 commits from migrate_song_model into master 2025-03-24 19:34:38 -04:00
Conversation 0 Commits 28 Files Changed 16
+40 -36
1 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fd9500d150 - Show all commits
src/managers/commit_manager.rs
+40 -36
View File
@@ -406,50 +406,54 @@ impl CommitManager {
match icarus_models::album::collection::parse_album(metadata_path) {
Ok(albums) => {
let mut songs: Vec<icarus_models::song::Song> = Vec::new();
/*
for entry in read_dir(source_directory)? {
match entry {
Ok(dir_entry) => {
match self.find_file_extension(&dir_entry.file_name()) {
En::MetadataFile => {
/*
for entry in read_dir(source_directory)? {
match entry {
Ok(dir_entry) => {
match self.find_file_extension(&dir_entry.file_name()) {
En::MetadataFile => {
}
_ => {
}
}
}
Err(_err) => {
// Err(err)
}
}
}
_ => {
}
}
}
Err(_err) => {
// Err(err)
}
}
}
*/
*/
for track in &albums.tracks {
let filename = if track.track < 10 {
"track0".to_owned() + &track.track.to_string() + icarus_models::constants::DEFAULTMUSICEXTENSION
"track0".to_owned()
+ &track.track.to_string()
+ icarus_models::constants::DEFAULTMUSICEXTENSION
} else {
"track".to_owned() + &track.track.to_string() + icarus_models::constants::DEFAULTMUSICEXTENSION
"track".to_owned()
+ &track.track.to_string()
+ icarus_models::constants::DEFAULTMUSICEXTENSION
};
// let mut song = icarus_models::song::Song::default();
songs.push(icarus_models::song::Song {
id: -1,
title: track.title.clone(),
artist: track.artist.clone(),
disc: track.disc.clone(),
track: track.track.clone(),
duration: track.duration.clone() as i32,
year: albums.year.clone(),
album_artist: albums.artist.clone(),
genre: albums.genre.clone(),
disc_count: albums.disc_count.clone(),
track_count: albums.track_count.clone(),
album: albums.title.clone(),
audio_type: String::from("FLAC"),
directory: source_directory.clone(),
filename: filename,
user_id: -1,
data: Vec::new(),
date_created: String::new(),
id: -1,
title: track.title.clone(),
artist: track.artist.clone(),
disc: track.disc.clone(),
track: track.track.clone(),
duration: track.duration.clone() as i32,
year: albums.year.clone(),
album_artist: albums.artist.clone(),
genre: albums.genre.clone(),
disc_count: albums.disc_count.clone(),
track_count: albums.track_count.clone(),
album: albums.title.clone(),
audio_type: String::from("FLAC"),
directory: source_directory.clone(),
filename: filename,
user_id: -1,
data: Vec::new(),
date_created: String::new(),
});
}
Ok(songs)