Code cleanup
This commit is contained in:
@@ -406,50 +406,54 @@ impl CommitManager {
|
|||||||
match icarus_models::album::collection::parse_album(metadata_path) {
|
match icarus_models::album::collection::parse_album(metadata_path) {
|
||||||
Ok(albums) => {
|
Ok(albums) => {
|
||||||
let mut songs: Vec<icarus_models::song::Song> = Vec::new();
|
let mut songs: Vec<icarus_models::song::Song> = Vec::new();
|
||||||
/*
|
/*
|
||||||
for entry in read_dir(source_directory)? {
|
for entry in read_dir(source_directory)? {
|
||||||
match entry {
|
match entry {
|
||||||
Ok(dir_entry) => {
|
Ok(dir_entry) => {
|
||||||
match self.find_file_extension(&dir_entry.file_name()) {
|
match self.find_file_extension(&dir_entry.file_name()) {
|
||||||
En::MetadataFile => {
|
En::MetadataFile => {
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(_err) => {
|
||||||
|
// Err(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
_ => {
|
*/
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(_err) => {
|
|
||||||
// Err(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
for track in &albums.tracks {
|
for track in &albums.tracks {
|
||||||
let filename = if track.track < 10 {
|
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 {
|
} 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();
|
// let mut song = icarus_models::song::Song::default();
|
||||||
|
|
||||||
songs.push(icarus_models::song::Song {
|
songs.push(icarus_models::song::Song {
|
||||||
id: -1,
|
id: -1,
|
||||||
title: track.title.clone(),
|
title: track.title.clone(),
|
||||||
artist: track.artist.clone(),
|
artist: track.artist.clone(),
|
||||||
disc: track.disc.clone(),
|
disc: track.disc.clone(),
|
||||||
track: track.track.clone(),
|
track: track.track.clone(),
|
||||||
duration: track.duration.clone() as i32,
|
duration: track.duration.clone() as i32,
|
||||||
year: albums.year.clone(),
|
year: albums.year.clone(),
|
||||||
album_artist: albums.artist.clone(),
|
album_artist: albums.artist.clone(),
|
||||||
genre: albums.genre.clone(),
|
genre: albums.genre.clone(),
|
||||||
disc_count: albums.disc_count.clone(),
|
disc_count: albums.disc_count.clone(),
|
||||||
track_count: albums.track_count.clone(),
|
track_count: albums.track_count.clone(),
|
||||||
album: albums.title.clone(),
|
album: albums.title.clone(),
|
||||||
audio_type: String::from("FLAC"),
|
audio_type: String::from("FLAC"),
|
||||||
directory: source_directory.clone(),
|
directory: source_directory.clone(),
|
||||||
filename: filename,
|
filename: filename,
|
||||||
user_id: -1,
|
user_id: -1,
|
||||||
data: Vec::new(),
|
data: Vec::new(),
|
||||||
date_created: String::new(),
|
date_created: String::new(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
Ok(songs)
|
Ok(songs)
|
||||||
|
|||||||
Reference in New Issue
Block a user