Feature/fix catchup (#547)

Catchup fix
Changed allocator to mimalloc

Author: euzu

Cargo.lock

@@ -69,17 +69,22 @@ hyper-util = "0.1"
 socket2 = { version = "0.6", features = ["all"] }
 async-compression = { version = "0.4", features = ["tokio"] }
 crc32fast = "1.5"
-#[cfg(target_os = "macos")]
-libc = "0.2"
-#[cfg(target_os = "windows")]
-winapi = { version = "0.3", features = ["psapi", "minwindef", "processthreadsapi"] }
 chrono-tz = "0.10.4"
 zeroize = "1.8.2"
 sysinfo = { version = "0.37.2", default-features = false, features = ["system"] }
 uuid = { version = "1", features = ["v4"] }
 fancy-regex = "0.17.0"
 mime_guess = "2"
-# [target.'cfg(not(target_env = "msvc"))'.dependencies]
+
+[target.'cfg(target_os = "macos")'.dependencies]
+libc = "0.2"
+[target.'cfg(target_os = "windows")'.dependencies]
+winapi = { version = "0.3", features = ["psapi", "minwindef", "processthreadsapi"] }
+[target.'cfg(target_os = "linux")'.dependencies]
+mimalloc = "0.1"
+
+#[target.'cfg(not(target_env = "msvc"))'.dependencies]
+#tikv-jemallocator =  "0.6"
 # tikv-jemallocator =  { version = "*", features = ["profiling", "unprefixed_malloc_on_supported_platforms"] }
 
 [build-dependencies]

backend/Cargo.toml

@@ -689,34 +689,11 @@ async fn xtream_player_api_timeshift_stream(
     axum::extract::State(app_state): axum::extract::State<Arc<AppState>>,
     axum::extract::Form(api_form_req): axum::extract::Form<UserApiRequest>,
 ) -> impl IntoResponse + Send {
-    let username = get_non_empty(
-        &timeshift_request.username,
-        &api_form_req.username,
-        &api_req.username,
-    )
-        .to_string();
-    let password = get_non_empty(
-        &timeshift_request.password,
-        &api_form_req.password,
-        &api_req.password,
-    )
-        .to_string();
-    let stream_id = get_non_empty(
-        &timeshift_request.stream_id,
-        &api_req.stream_id,
-        &api_form_req.stream_id,
-    )
-        .to_string();
-    let duration = get_non_empty(
-        &timeshift_request.duration,
-        &timeshift_request.duration,
-        &api_form_req.duration,
-    );
-    let start = get_non_empty(
-        &timeshift_request.start,
-        &timeshift_request.start,
-        &api_form_req.start,
-    );
+    let username = get_non_empty(&timeshift_request.username, &api_form_req.username, &api_req.username).to_string();
+    let password = get_non_empty(&timeshift_request.password, &api_form_req.password, &api_req.password).to_string();
+    let stream_id = get_non_empty(&timeshift_request.stream_id, &api_req.stream_id, &api_form_req.stream_id).to_string();
+    let duration = get_non_empty(&timeshift_request.duration, &timeshift_request.duration, &api_form_req.duration);
+    let start = get_non_empty(&timeshift_request.start, &timeshift_request.start, &api_form_req.start);
 
     let action_path = format!("{duration}/{start}");
     api_req.username.clone_from(&username);
@@ -1050,7 +1027,7 @@ async fn xtream_get_catchup_response(
                 &uuid,
                 catchup_provider_id,
                 PlaylistItemType::Catchup,
-                pli.virtual_id,
+                pli.provider_id,
             );
 
             if target.use_memory_cache {
@@ -1059,7 +1036,7 @@ async fn xtream_get_catchup_response(
                         catchup_provider_id,
                         virtual_id,
                         PlaylistItemType::Catchup,
-                        pli.virtual_id,
+                        pli.provider_id,
                         uuid,
                     ),
                 );

backend/src/api/endpoints/xtream_api.rs

@@ -4,6 +4,13 @@
 #![allow(clippy::return_self_not_must_use)]
 #![allow(clippy::missing_errors_doc)]
 
+#[cfg(target_os = "linux")]
+#[global_allocator]
+static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
+// #[cfg(not(target_env = "msvc"))]
+// #[global_allocator]
+// static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+
 #[macro_use]
 mod modules;