Upload 2 files

src/main.rs

@@ -242,12 +242,8 @@ async fn fetch_media_url(
         format!("media_bad_json:{}:{}", status.as_u16(), snip)
     })?;
 
-    let format_strs: Vec<&str> = formats.iter().map(|f| match f {
-        Format::FLAC => "FLAC",
-        Format::MP3_320 => "MP3_320",
-        Format::MP3_MISC => "MP3_MISC",
-        Format::MP3_128 => "MP3_128",
-    }).collect();
+    let format_strings: Vec<String> = formats.iter().map(|f| format!("{:?}", f)).collect();
+    let format_strs: Vec<&str> = format_strings.iter().map(|s| s.as_str()).collect();
 
     let (url, fmt, idx) = extract_media_url_and_format(&media_json, &format_strs);
     if !url.is_empty() {
@@ -405,12 +401,8 @@ async fn upstream_get_url_text(formats: &Vec<Format>, ids: &Vec<u64>) -> Result<
 async fn upstream_media_url(id: u64, formats: &Vec<Format>) -> Result<String, String> {
     let text = upstream_get_url_text(formats, &vec![id]).await?;
     let v: serde_json::Value = serde_json::from_str(&text).map_err(|_| "upstream:parse".to_string())?;
-    let format_strs: Vec<&str> = formats.iter().map(|f| match f {
-        Format::FLAC => "FLAC",
-        Format::MP3_320 => "MP3_320",
-        Format::MP3_MISC => "MP3_MISC",
-        Format::MP3_128 => "MP3_128",
-    }).collect();
+    let format_strings: Vec<String> = formats.iter().map(|f| format!("{:?}", f)).collect();
+    let format_strs: Vec<&str> = format_strings.iter().map(|s| s.as_str()).collect();
     let (url, _, _) = extract_media_url_and_format(&v, &format_strs);
     if url.is_empty() {
         return Err("upstream:no_url".to_string());
@@ -622,12 +614,8 @@ async fn stream_info(State(state): State<AppState>, Query(q): Query<StreamParams
     // Upstream (опционально — если DZMEDIA_UPSTREAM задан)
     if let Ok(text) = upstream_get_url_text(&formats, &vec![q.id]).await {
         if let Ok(v) = serde_json::from_str::<serde_json::Value>(&text) {
-            let format_strs: Vec<&str> = formats.iter().map(|f| match f {
-                Format::FLAC => "FLAC",
-                Format::MP3_320 => "MP3_320",
-                Format::MP3_MISC => "MP3_MISC",
-                Format::MP3_128 => "MP3_128",
-            }).collect();
+            let format_strings: Vec<String> = formats.iter().map(|f| format!("{:?}", f)).collect();
+            let format_strs: Vec<&str> = format_strings.iter().map(|s| s.as_str()).collect();
             let (u, f, _) = extract_media_url_and_format(&v, &format_strs);
             url  = u;
             used = f;
@@ -759,7 +747,7 @@ async fn stream(
         };
 
         match res {
-            Ok((u, id_used)) => { url = Some(u); decrypt_id = id_used; break; }
+            Ok((u, _, id_used)) => { url = Some(u); decrypt_id = id_used; break; }
             Err(e) => { last_err = Some(e); }
         }
     }