File cleanup post-parsing #37

Merged
phoenix merged 3 commits from cleanup_files into devel 2025-07-23 20:25:06 +00:00
2 changed files with 22 additions and 16 deletions
Showing only changes of commit 2b83906cd1 - Show all commits

View File

@@ -107,20 +107,20 @@ async fn wipe_data_from_queues(
}
}
async fn cleanup(song_queue_path: &String, coverart_queue_path: &String) -> Result<(), std::io::Error> {
async fn cleanup(
song_queue_path: &String,
coverart_queue_path: &String,
) -> Result<(), std::io::Error> {
match the_rest::cleanup::clean_song_queue(song_queue_path) {
Ok(_) => {
}
Ok(_) => {}
Err(err) => {
eprintln!("Error: Problem cleaning up SongQueue files {err:?}");
}
}
match the_rest::cleanup::clean_coverart_queue(coverart_queue_path) {
Ok(_) => {
Ok(())
}
Err(err) => Err(err)
Ok(_) => Ok(()),
Err(err) => Err(err),
}
}

View File

@@ -131,15 +131,19 @@ pub mod cleanup {
match std::fs::remove_file(file_path) {
Ok(_) => {
if check_file_existence(song_queue_path) {
Err(std::io::Error::other(String::from("SongQueue file exists after a deletion")))
Err(std::io::Error::other(String::from(
"SongQueue file exists after a deletion",
)))
} else {
Ok(())
}
},
Err(err) => Err(std::io::Error::other(err.to_string()))
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
} else {
Err(std::io::Error::other(String::from("SongQueue file path does not exists")))
Err(std::io::Error::other(String::from(
"SongQueue file path does not exists",
)))
}
}
@@ -151,15 +155,17 @@ pub mod cleanup {
if !check_file_existence(coverart_queue_path) {
Ok(())
} else {
Err(std::io::Error::other(String::from("CoverArt file stil exists")))
Err(std::io::Error::other(String::from(
"CoverArt file stil exists",
)))
}
},
Err(err) => {
Err(std::io::Error::other(err.to_string()))
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
} else {
Err(std::io::Error::other(String::from("CoverArt file does not exists")))
Err(std::io::Error::other(String::from(
"CoverArt file does not exists",
)))
}
}