Code formatting
This commit is contained in:
@@ -388,7 +388,7 @@ pub mod cov_db {
|
|||||||
.try_get("song_id")
|
.try_get("song_id")
|
||||||
.map_err(|_e| sqlx::Error::RowNotFound)
|
.map_err(|_e| sqlx::Error::RowNotFound)
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
}),
|
}),
|
||||||
Err(_) => Err(sqlx::Error::RowNotFound),
|
Err(_) => Err(sqlx::Error::RowNotFound),
|
||||||
}
|
}
|
||||||
@@ -718,7 +718,9 @@ pub mod endpoint {
|
|||||||
let filename = format!("{}-coverart.jpeg", &song.filename[..8]);
|
let filename = format!("{}-coverart.jpeg", &song.filename[..8]);
|
||||||
|
|
||||||
let mut coverart =
|
let mut coverart =
|
||||||
icarus_models::coverart::init::init_coverart_dir_and_filename(&directory, &filename);
|
icarus_models::coverart::init::init_coverart_dir_and_filename(
|
||||||
|
&directory, &filename,
|
||||||
|
);
|
||||||
coverart.title = song.album.clone();
|
coverart.title = song.album.clone();
|
||||||
coverart.data = data;
|
coverart.data = data;
|
||||||
|
|
||||||
|
|||||||
+6
-5
@@ -1498,12 +1498,13 @@ pub mod endpoint {
|
|||||||
Ok(coverart) => {
|
Ok(coverart) => {
|
||||||
// let coverart_path = std::path::Path::new(&coverart.path);
|
// let coverart_path = std::path::Path::new(&coverart.path);
|
||||||
let coverart_path_str = match coverart.get_path() {
|
let coverart_path_str = match coverart.get_path() {
|
||||||
Ok(path) => {
|
Ok(path) => path,
|
||||||
path
|
|
||||||
}
|
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
response.message = err.to_string();
|
response.message = err.to_string();
|
||||||
return (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response));
|
return (
|
||||||
|
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
axum::Json(response),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let coverart_path = std::path::Path::new(&coverart_path_str);
|
let coverart_path = std::path::Path::new(&coverart_path_str);
|
||||||
@@ -1522,7 +1523,7 @@ pub mod endpoint {
|
|||||||
Ok(deleted_coverart) => {
|
Ok(deleted_coverart) => {
|
||||||
match std::fs::remove_file(song_path) {
|
match std::fs::remove_file(song_path) {
|
||||||
Ok(_) => match std::fs::remove_file(
|
Ok(_) => match std::fs::remove_file(
|
||||||
&coverart_path
|
&coverart_path,
|
||||||
) {
|
) {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
response.message = String::from(super::super::response::SUCCESSFUL);
|
response.message = String::from(super::super::response::SUCCESSFUL);
|
||||||
|
|||||||
Reference in New Issue
Block a user