phoenix/icarus_models
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 67 Wiki Activity

Song changes #60

Merged
phoenix merged 10 commits from song_changes into main 2025-10-11 19:49:53 +00:00
Conversation 0 Commits 10 Files Changed 5 +25 -38
2 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 85d8f839f1 - Show all commits

28
src/song.rs
View File

@@ -1,4 +1,4 @@
use std::io::{Read,Write};
use std::io::{Read, Write};
use crate::constants;
use crate::init;
@@ -155,24 +155,14 @@ impl Song {
pub fn save_to_filesystem(&self) -> Result<(), std::io::Error> {
match self.song_path() {
Ok(song_path) => {
match std::fs::File::create(&song_path) {
Ok(mut file) => {
match file.write_all(&self.data) {
Ok(_res) => {
Ok(())
}
Err(err) => {
Err(err)
}
}
}
Err(err) => {
Err(err)
}
}
}
Err(err) => Err(err)
Ok(song_path) => match std::fs::File::create(&song_path) {
Ok(mut file) => match file.write_all(&self.data) {
Ok(_res) => Ok(()),
Err(err) => Err(err),
},
Err(err) => Err(err),
},
Err(err) => Err(err),
}
}

35
tests/tests.rs
View File

@@ -158,29 +158,26 @@ mod song_tests {
song.filename = String::from("track02.flac");
match song.song_path() {
Ok(song_path) => {
match utils::extract_data_from_file(&song_path) {
Ok(data) => {
let copied_song = song::Song {
directory: utils::get_tests_directory(),
filename: String::from("track02-coppied.flac"),
data: data,
..Default::default()
};
Ok(song_path) => match utils::extract_data_from_file(&song_path) {
Ok(data) => {
let copied_song = song::Song {
directory: utils::get_tests_directory(),
filename: String::from("track02-coppied.flac"),
data: data,
..Default::default()
};
match copied_song.save_to_filesystem() {
Ok(_) => {
}
Err(err) => {
assert!(false, "Error: {err:?}")
}
match copied_song.save_to_filesystem() {
Ok(_) => {}
Err(err) => {
assert!(false, "Error: {err:?}")
}
}
Err(err) => {
assert!(false, "Error: {err:?}")
}
}
}
Err(err) => {
assert!(false, "Error: {err:?}")
}
},
Err(err) => {
assert!(false, "Error: {err:?}");
}