phoenix/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

icarus_models version bump (#210)

Browse Source 
* icarus_models version bump

* icarus_models related changes

* Code formatting

* Test changeS:

* Test changes

* Migration changes

* Migration changes

* Warning fix

* Cleanup

* Updated readme

* Removed line from migrations

* Code cleanup

* Version bump

* cargo update

* icarus_models version bump
This commit was merged in pull request #210.
This commit is contained in:
KD
2025-10-20 11:19:06 -04:00
committed by GitHub
parent 2023fc81f8
commit e461e78661
9 changed files with 240 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.rs
+27 -42
View File
@@ -1770,8 +1770,6 @@ mod tests {
song
);
eprintln!("Song: {:?}", song);
match sequence_flow::queue_coverart_flow(&app, &song_queue_id).await {
Ok(response) => {
let resp = get_resp_data::<
@@ -2171,14 +2169,13 @@ mod tests {
}
}
pub async fn other_song_id() -> Result<(uuid::Uuid, String, String, String), uuid::Error>
{
pub async fn other_song_id()
-> Result<(uuid::Uuid, (String, String), (String, String)), uuid::Error> {
match uuid::Uuid::parse_str("94cf7940-34ff-489f-9124-d0ec90a55af4") {
Ok(id) => Ok((
id,
String::from("tests/I/"),
String::from("track02.flac"),
String::from("tests/I/Coverart-2.jpg"),
(String::from("tests/I/"), String::from("track02.flac")),
(String::from("tests/I/"), String::from("Coverart-2.jpg")),
)),
Err(err) => Err(err),
}
@@ -2371,7 +2368,8 @@ mod tests {
async fn get_test_data(
song_directory: &String,
song_filename: &String,
coverart_path: &String,
coverart_directory: &String,
coverart_filename: &String,
) -> Result<(Vec<u8>, Vec<u8>), std::io::Error> {
let song = icarus_models::song::Song {
directory: song_directory.clone(),
@@ -2380,7 +2378,8 @@ mod tests {
};
let coverart = icarus_models::coverart::CoverArt {
path: coverart_path.clone(),
directory: coverart_directory.clone(),
filename: coverart_filename.clone(),
..Default::default()
};
@@ -2397,45 +2396,26 @@ mod tests {
song_directory: &String,
song_filename: &String,
song_data: Vec<u8>,
coverart_path: &String,
coverart_directory: &String,
coverart_filename: &String,
coverart_data: Vec<u8>,
) -> Result<(), std::io::Error> {
let song = icarus_models::song::Song {
directory: song_directory.clone(),
filename: song_filename.clone(),
data: song_data,
..Default::default()
};
let coverart = icarus_models::coverart::CoverArt {
path: coverart_path.clone(),
directory: coverart_directory.clone(),
filename: coverart_filename.clone(),
data: coverart_data,
..Default::default()
};
use std::io::Write;
match song.song_path() {
Ok(song_path) => {
let song_p = std::path::Path::new(&song_path);
match std::fs::File::create(song_p) {
Ok(mut song_file) => match song_file.write_all(&song_data) {
Ok(_) => {}
Err(err) => {
return Err(err);
}
},
Err(err) => {
return Err(err);
}
}
}
Err(err) => {
return Err(err);
}
}
let coverart_p = std::path::Path::new(&coverart.path);
match std::fs::File::create(coverart_p) {
Ok(mut coverart_file) => match coverart_file.write_all(&coverart_data) {
match song.save_to_filesystem() {
Ok(_) => match coverart.save_to_filesystem() {
Ok(_) => Ok(()),
Err(err) => Err(err),
},
@@ -2462,12 +2442,16 @@ mod tests {
let app = super::init::app(pool).await;
let (id, song_directory, song_filename, coverart_path) =
let (id, (song_directory, song_filename), (cover_directory, cover_filename)) =
test_data::other_song_id().await.unwrap();
let (song_data, coverart_data) =
get_test_data(&song_directory, &song_filename, &coverart_path)
.await
.unwrap();
let (song_data, coverart_data) = get_test_data(
&song_directory,
&song_filename,
&cover_directory,
&cover_filename,
)
.await
.unwrap();
let uri =
super::format_url_with_value(crate::callers::endpoints::DELETESONG, &id).await;
@@ -2505,7 +2489,8 @@ mod tests {
&song_directory,
&song_filename,
song_data,
&coverart_path,
&cover_directory,
&cover_filename,
coverart_data,
)
.await