Upload main.rs

src/main.rs

@@ -1,13 +1,12 @@
 use axum::{
     routing::{get, post},
     http::StatusCode,
-    http::{HeaderMap, header::{RANGE, CONTENT_RANGE, ACCEPT_RANGES, CONTENT_LENGTH}},
+    http::{HeaderMap, Method, header::{RANGE, CONTENT_RANGE, ACCEPT_RANGES, CONTENT_LENGTH, CONTENT_TYPE}},
     response::{IntoResponse, Html},
     extract::{Json, State, Query, Form},
     Router,
 };
 use tower_http::{cors::{CorsLayer, Any}, compression::CompressionLayer, trace::TraceLayer};
-use http::{Method, header::CONTENT_TYPE};
 use serde_json::json;
 use serde::Deserialize;
 use std::collections::HashMap;
@@ -409,7 +408,7 @@ async fn stream_info(State(state): State<AppState>, Query(q): Query<StreamParams
     if url.is_empty() {
         if let Some(arl) = q.arl.clone().filter(|s| !s.trim().is_empty()) {
             let client = api_client_for_arl(&state, Some(arl)).await;
-            let res = {
+            let res = async {
                 let mut client = client.lock().await;
                 let resp: Result<DeezerTrackList, APIError> = client
                     .api_call(
@@ -462,24 +461,24 @@ async fn stream_info(State(state): State<AppState>, Query(q): Query<StreamParams
         .unwrap();
     let r = http
         .get(url.clone())
-        .header(RANGE, "bytes=0-0")
+        .header(reqwest::header::RANGE, "bytes=0-0")
         .send()
         .await;
 
     let mut total_bytes: u64 = 0;
     let mut mime: String = String::new();
     if let Ok(r) = r {
-        if let Some(ct) = r.headers().get(CONTENT_TYPE).and_then(|v| v.to_str().ok()) {
+        if let Some(ct) = r.headers().get(reqwest::header::CONTENT_TYPE).and_then(|v| v.to_str().ok()) {
             mime = ct.to_string();
         }
         if let Some(cr) = r
             .headers()
-            .get(CONTENT_RANGE)
+            .get(reqwest::header::CONTENT_RANGE)
             .and_then(|v| v.to_str().ok())
             .and_then(total_from_content_range)
         {
             total_bytes = cr;
-        } else if let Some(cl) = r.headers().get(CONTENT_LENGTH).and_then(|v| v.to_str().ok()) {
+        } else if let Some(cl) = r.headers().get(reqwest::header::CONTENT_LENGTH).and_then(|v| v.to_str().ok()) {
             total_bytes = cl.parse::<u64>().unwrap_or(0);
         }
     }
@@ -639,9 +638,9 @@ async fn stream(
             if e >= start {
                 remaining = Some(e - start + 1);
             }
-            req = req.header(RANGE, format!("bytes={}-{}", aligned_start, e));
+            req = req.header(reqwest::header::RANGE, format!("bytes={}-{}", aligned_start, e));
         } else {
-            req = req.header(RANGE, format!("bytes={}-", aligned_start));
+            req = req.header(reqwest::header::RANGE, format!("bytes={}-", aligned_start));
         }
     }
 
@@ -665,7 +664,7 @@ async fn stream(
     let mut carry: Vec<u8> = Vec::with_capacity(4096);
     let upstream_headers = upstream.headers().clone();
     let upstream_total = upstream_headers
-        .get(CONTENT_RANGE)
+        .get(reqwest::header::CONTENT_RANGE)
         .and_then(|v| v.to_str().ok())
         .and_then(parse_total_from_content_range);