Upload 3 files

src/bin/test_media.rs

@@ -0,0 +1,35 @@
+use dzmedia::api::{APIClient, Format};
+use serde_json::json;
+
+#[tokio::main]
+async fn main() {
+    let arl = std::env::var("ARL").unwrap_or_else(|_| "".to_string());
+    if arl.is_empty() {
+        println!("Please set ARL env var");
+        return;
+    }
+
+    let mut client = APIClient::new_with_arl(arl);
+    
+    // Get tokens from getListData
+    let q_json = json!({
+        "sng_ids": [1563075602], // The problematic track ID
+        "array_default": ["SNG_ID","TRACK_TOKEN","FALLBACK"]
+    });
+    let r: serde_json::Value = client.api_call("song.getListData", &q_json).await.unwrap();
+    let item = r.pointer("/data/0").unwrap();
+    let track_token = item.get("TRACK_TOKEN").and_then(|v| v.as_str()).unwrap_or("");
+    let fallback_token = item.pointer("/FALLBACK/TRACK_TOKEN").and_then(|v| v.as_str()).unwrap_or("");
+    
+    println!("TRACK_TOKEN: {}", track_token);
+    println!("FALLBACK_TOKEN: {}", fallback_token);
+
+    // Call get_media
+    let formats = vec![Format::FLAC, Format::MP3_320, Format::MP3_128];
+    let track_tokens = vec![track_token, fallback_token];
+    
+    let media_resp = client.get_media(&formats, track_tokens).await.unwrap();
+    let text = media_resp.text().await.unwrap();
+    
+    println!("MEDIA RESPONSE:\n{}", text);
+}

src/main.rs

@@ -315,12 +315,12 @@ async fn media_url_for_track(
         return Err("No valid ID".to_string());
     }
 
-    let track_token = track_list.data[0].TRACK_TOKEN.as_deref().unwrap_or("");
+    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.as_deref())
-        .unwrap_or("");
+        .and_then(|f| f.TRACK_TOKEN.clone())
+        .unwrap_or_default();
 
     let fallback_id = track_list.data[0]
         .FALLBACK
@@ -328,14 +328,34 @@ async fn media_url_for_track(
         .and_then(|f| f.SNG_ID.as_ref().and_then(|s| s.parse::<u64>().ok()))
         .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()];
+                    if let Ok((url, fmt, _)) = fetch_media_url(client, formats, tokens).await {
+                        return Ok((url, fmt, fallback_id));
+                    }
+                }
+            }
+        }
+    }
+
     let mut tokens = Vec::new();
     let mut token_ids = Vec::new();
     if !track_token.is_empty() {
-        tokens.push(track_token);
+        tokens.push(track_token.as_str());
         token_ids.push(id);
     }
     if !fallback_token.is_empty() {
-        tokens.push(fallback_token);
+        tokens.push(fallback_token.as_str());
         let fid = if fallback_id > 0 { fallback_id } else { id };
         token_ids.push(fid);
     }