Upload 2 files

src/main.rs

@@ -303,44 +303,32 @@ async fn media_url_for_track(
         }
     }
 
-    let resp: Result<DeezerTrackList, APIError> = client
-        .api_call(
-            "song.getListData",
-            &json!({"sng_ids":[id],"array_default":["SNG_ID","TRACK_TOKEN","FALLBACK"]}),
-        )
-        .await;
+    let q_json = serde_json::json!({"sng_ids":[id],"array_default":["SNG_ID","TRACK_TOKEN","FALLBACK"]});
+    let r: serde_json::Value = client.api_call("song.getListData", &q_json).await.map_err(|e| e.to_string())?;
 
-    let track_list = resp.map_err(|e| e.to_string())?;
-    if track_list.data.is_empty() {
-        return Err("No valid ID".to_string());
-    }
+    let item = r.pointer("/data/0").ok_or_else(|| "No valid ID".to_string())?;
 
-    let track_token = track_list.data[0].TRACK_TOKEN.clone().unwrap_or_default();
-    let fallback_token = track_list.data[0]
-        .FALLBACK
-        .as_ref()
-        .and_then(|f| f.TRACK_TOKEN.clone())
-        .unwrap_or_default();
+    let track_token = item.get("TRACK_TOKEN").and_then(|v| v.as_str()).unwrap_or("").to_string();
+    let fallback = item.get("FALLBACK");
+    let fallback_token = fallback.and_then(|f| f.get("TRACK_TOKEN")).and_then(|v| v.as_str()).unwrap_or("").to_string();
 
-    let fallback_id = track_list.data[0]
-        .FALLBACK
-        .as_ref()
-        .and_then(|f| f.SNG_ID.as_ref().and_then(|s| s.parse::<u64>().ok()))
-        .unwrap_or(0);
+    let fallback_id = fallback.and_then(|f| {
+        f.get("SNG_ID").and_then(|v| {
+            if let Some(s) = v.as_str() { s.parse::<u64>().ok() }
+            else if let Some(n) = v.as_u64() { Some(n) }
+            else { None }
+        })
+    }).unwrap_or(0);
 
     if fallback_id > 0 {
-        let resp_fb: Result<DeezerTrackList, APIError> = client
-            .api_call(
-                "song.getListData",
-                &serde_json::json!({"sng_ids":[fallback_id],"array_default":["SNG_ID","TRACK_TOKEN","FALLBACK"]}),
-            )
-            .await;
-        
-        if let Ok(list_fb) = resp_fb {
-            if !list_fb.data.is_empty() {
-                if let Some(real_tk) = &list_fb.data[0].TRACK_TOKEN {
-                    let tokens = vec![real_tk.as_str()];
+        let q_fb = serde_json::json!({"sng_ids":[fallback_id],"array_default":["SNG_ID","TRACK_TOKEN","FALLBACK"]});
+        if let Ok(r_fb) = client.api_call::<serde_json::Value, serde_json::Value>("song.getListData", &q_fb).await {
+            if let Some(item_fb) = r_fb.pointer("/data/0") {
+                if let Some(real_tk) = item_fb.get("TRACK_TOKEN").and_then(|v| v.as_str()) {
+                    let tokens = vec![real_tk];
                     if let Ok((url, fmt, _)) = fetch_media_url(client, formats, tokens).await {
+                        // Ensure we return the high quality one if found, else let it fall through? 
+                        // Wait, no. If it succeeds at all, we should just return it.
                         return Ok((url, fmt, fallback_id));
                     }
                 }