Remove song #64

Merged
phoenix merged 4 commits from remove_song into song_changes 2025-10-11 19:46:00 +00:00
4 changed files with 27 additions and 8 deletions

2
Cargo.lock generated
View File

@@ -142,7 +142,7 @@ checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
[[package]] [[package]]
name = "icarus_models" name = "icarus_models"
version = "0.6.2" version = "0.6.3"
dependencies = [ dependencies = [
"josekit", "josekit",
"rand", "rand",

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "icarus_models" name = "icarus_models"
version = "0.6.2" version = "0.6.3"
edition = "2024" edition = "2024"
rust-version = "1.88" rust-version = "1.88"
description = "models used for the icarus project" description = "models used for the icarus project"

View File

@@ -7,6 +7,7 @@ use crate::constants;
use crate::init; use crate::init;
use crate::types; use crate::types;
/// Length of characters of a filename to be generated
const FILENAME_LENGTH: i32 = 16; const FILENAME_LENGTH: i32 = 16;
#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)] #[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
@@ -92,7 +93,6 @@ impl Song {
} }
} }
/// Saves the song to the filesystem using the song's data /// Saves the song to the filesystem using the song's data
pub fn save_to_filesystem(&self) -> Result<(), std::io::Error> { pub fn save_to_filesystem(&self) -> Result<(), std::io::Error> {
match self.song_path() { match self.song_path() {
@@ -107,10 +107,25 @@ impl Song {
} }
} }
// TODO: Add function to remove file from the filesystem /// Removes the song from the filesystem
pub fn remove_from_filesystem(&self) -> Result<(), std::io::Error> {
match self.song_path() {
Ok(song_path) => {
let p = std::path::Path::new(&song_path);
if p.exists() {
match std::fs::remove_file(&p) {
Ok(_) => Ok(()),
Err(err) => Err(err),
}
} else {
Ok(())
}
}
Err(err) => Err(err),
}
}
} }
/// Generates a filename. In order to save a song to the filesystem, the song must have /// Generates a filename. In order to save a song to the filesystem, the song must have
/// a directory and filename /// a directory and filename
pub fn generate_filename(typ: types::MusicTypes, randomize: bool) -> String { pub fn generate_filename(typ: types::MusicTypes, randomize: bool) -> String {

View File

@@ -120,7 +120,7 @@ mod song_tests {
} }
#[test] #[test]
fn test_save_song_to_filesystem() { fn test_save_song_to_filesystem_and_remove() {
let mut song = song::Song::default(); let mut song = song::Song::default();
song.directory = utils::get_tests_directory(); song.directory = utils::get_tests_directory();
song.filename = String::from("track02.flac"); song.filename = String::from("track02.flac");
@@ -132,17 +132,21 @@ mod song_tests {
}; };
match song::io::copy_song(&song, &mut copied_song) { match song::io::copy_song(&song, &mut copied_song) {
Ok(_) => match copied_song.remove_from_filesystem() {
Ok(_) => {} Ok(_) => {}
Err(err) => { Err(err) => {
assert!(false, "Error: {err:?}") assert!(false, "Error: {err:?}")
} }
},
Err(err) => {
assert!(false, "Error: {err:?}")
}
} }
} }
} }
#[cfg(test)] #[cfg(test)]
mod album_tests { mod album_tests {
use crate::utils; use crate::utils;
use icarus_models::album; use icarus_models::album;