Upload 2 files

src/main.rs

@@ -25,6 +25,10 @@ type BoxErr = Box<dyn std::error::Error + Send + Sync + 'static>;
 mod api;
 use api::{APIClient, APIError, Format};
 
+fn json_error(status: StatusCode, message: impl Into<String>) -> axum::response::Response {
+    (status, Json(json!({ "error": message.into() }))).into_response()
+}
+
 #[derive(Deserialize)]
 struct DeezerTrackList {
     data: Vec<DeezerTrack>
@@ -271,13 +275,13 @@ struct UserDataReq {
 async fn user_data(Json(req): Json<UserDataReq>) -> impl IntoResponse {
     let arl = req.arl.trim().to_string();
     if arl.is_empty() {
-        return (StatusCode::BAD_REQUEST, "ARL required".to_string()).into_response();
+        return json_error(StatusCode::BAD_REQUEST, "ARL required");
     }
 
     let mut client = APIClient::new_with_arl(arl);
     let data = match client.user_data().await {
         Ok(v) => v,
-        Err(e) => return (StatusCode::BAD_GATEWAY, e.to_string()).into_response(),
+        Err(e) => return json_error(StatusCode::BAD_GATEWAY, e.to_string()),
     };
 
     let token = data["checkForm"].as_str().unwrap_or("").to_string();
@@ -296,18 +300,18 @@ struct PlaylistsReq {
 async fn playlists(Json(req): Json<PlaylistsReq>) -> impl IntoResponse {
     let arl = req.arl.trim().to_string();
     if arl.is_empty() {
-        return (StatusCode::BAD_REQUEST, "ARL required".to_string()).into_response();
+        return json_error(StatusCode::BAD_REQUEST, "ARL required");
     }
 
     let mut client = APIClient::new_with_arl(arl);
     let ud = match client.user_data().await {
         Ok(v) => v,
-        Err(e) => return (StatusCode::BAD_GATEWAY, e.to_string()).into_response(),
+        Err(e) => return json_error(StatusCode::BAD_GATEWAY, e.to_string()),
     };
 
     let uid = ud["USER"]["USER_ID"].as_i64().unwrap_or(0);
     if uid <= 0 {
-        return (StatusCode::BAD_GATEWAY, "No USER_ID".to_string()).into_response();
+        return json_error(StatusCode::BAD_GATEWAY, "No USER_ID");
     }
 
     let start = req.start.unwrap_or(0);
@@ -319,7 +323,7 @@ async fn playlists(Json(req): Json<PlaylistsReq>) -> impl IntoResponse {
 
     match res {
         Ok(v) => (StatusCode::OK, Json(v)).into_response(),
-        Err(e) => (StatusCode::BAD_GATEWAY, e.to_string()).into_response(),
+        Err(e) => json_error(StatusCode::BAD_GATEWAY, e.to_string()),
     }
 }
 
@@ -334,7 +338,7 @@ struct PlaylistTracksReq {
 async fn playlist_tracks(Json(req): Json<PlaylistTracksReq>) -> impl IntoResponse {
     let arl = req.arl.trim().to_string();
     if arl.is_empty() {
-        return (StatusCode::BAD_REQUEST, "ARL required".to_string()).into_response();
+        return json_error(StatusCode::BAD_REQUEST, "ARL required");
     }
 
     let mut client = APIClient::new_with_arl(arl);
@@ -356,7 +360,7 @@ async fn playlist_tracks(Json(req): Json<PlaylistTracksReq>) -> impl IntoRespons
 
     match res {
         Ok(v) => (StatusCode::OK, Json(v)).into_response(),
-        Err(e) => (StatusCode::BAD_GATEWAY, e.to_string()).into_response(),
+        Err(e) => json_error(StatusCode::BAD_GATEWAY, e.to_string()),
     }
 }
 
@@ -409,7 +413,7 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
     let pass = req.password_md5.trim().to_string();
 
     if email.is_empty() || pass.is_empty() {
-        return (StatusCode::BAD_REQUEST, "Email and password_md5 required".to_string()).into_response();
+        return json_error(StatusCode::BAD_REQUEST, "Email and password_md5 required");
     }
     let jar = Jar::default();
     let client = reqwest::Client::builder()
@@ -420,12 +424,12 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
 
     let ud = match gw_light_call(&client, "deezer.getUserData", "null", json!({})).await {
         Ok(v) => v,
-        Err(e) => return (StatusCode::BAD_GATEWAY, e).into_response(),
+        Err(e) => return json_error(StatusCode::BAD_GATEWAY, e),
     };
 
     let token = ud["checkForm"].as_str().unwrap_or("").to_string();
     if token.is_empty() {
-        return (StatusCode::BAD_GATEWAY, "no checkForm".to_string()).into_response();
+        return json_error(StatusCode::BAD_GATEWAY, "no checkForm");
     }
 
     let cred = match gw_light_call(
@@ -441,19 +445,19 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
     .await
     {
         Ok(v) => v,
-        Err(e) => return (StatusCode::UNAUTHORIZED, e).into_response(),
+        Err(e) => return json_error(StatusCode::UNAUTHORIZED, e),
     };
 
     let uid = cred["USER"]["USER_ID"].as_i64().map(|n| n.to_string()).unwrap_or_default();
 
     let arl_v = match gw_light_call(&client, "user.getArl", &token, json!({})).await {
         Ok(v) => v,
-        Err(e) => return (StatusCode::BAD_GATEWAY, e).into_response(),
+        Err(e) => return json_error(StatusCode::BAD_GATEWAY, e),
     };
 
     let arl = arl_v.as_str().unwrap_or("").to_string();
     if arl.len() < 20 {
-        return (StatusCode::BAD_GATEWAY, "no arl".to_string()).into_response();
+        return json_error(StatusCode::BAD_GATEWAY, "no arl");
     }
 
     (StatusCode::OK, Json(json!({ "arl": arl, "token": token, "uid": uid }))).into_response()