Merge branch 'rewrite-stream'

1 files changed, 19 insertions, 26 deletions

diff --git a/server/src/routes/compat/jellyfin/mod.rs b/server/src/routes/compat/jellyfin/mod.rs
index ab36a8c..7393c5f 100644
--- a/server/src/routes/compat/jellyfin/mod.rs
+++ b/server/src/routes/compat/jellyfin/mod.rs
@@ -5,23 +5,19 @@
 */
 pub mod models;
 
-use crate::routes::{
-    stream::rocket_uri_macro_r_stream,
-    ui::{
-        account::{login_logic, session::Session},
-        assets::{
-            rocket_uri_macro_r_asset, rocket_uri_macro_r_item_backdrop,
-            rocket_uri_macro_r_item_poster,
-        },
-        error::MyResult,
-        node::{aspect_class, DatabaseNodeUserDataExt},
-        sort::{filter_and_sort_nodes, FilterProperty, NodeFilterSort, SortOrder, SortProperty},
+use crate::routes::ui::{
+    account::{login_logic, session::Session},
+    assets::{
+        rocket_uri_macro_r_asset, rocket_uri_macro_r_item_backdrop, rocket_uri_macro_r_item_poster,
     },
+    error::MyResult,
+    node::{aspect_class, DatabaseNodeUserDataExt},
+    sort::{filter_and_sort_nodes, FilterProperty, NodeFilterSort, SortOrder, SortProperty},
 };
 use anyhow::{anyhow, Context};
 use jellybase::{database::Database, CONF};
 use jellycommon::{
-    stream::{StreamFormat, StreamSpec},
+    stream::{StreamContainer, StreamSpec},
     user::{NodeUserData, WatchedState},
     MediaInfo, Node, NodeID, NodeKind, SourceTrack, SourceTrackKind, Visibility,
 };
@@ -446,16 +442,12 @@ pub fn r_jellyfin_video_stream(
         .get_node_slug(id)?
         .ok_or(anyhow!("node does not exist"))?;
     let media = node.media.as_ref().ok_or(anyhow!("node has no media"))?;
-    Ok(Redirect::temporary(rocket::uri!(r_stream(
-        id,
-        StreamSpec {
-            format: StreamFormat::Matroska,
-            webm: Some(true),
-            track: (0..media.tracks.len()).collect(),
-            index: None,
-            profile: None,
-        }
-    ))))
+    let params = StreamSpec::Remux {
+        tracks: (0..media.tracks.len()).collect(),
+        container: StreamContainer::WebM,
+    }
+    .to_query();
+    Ok(Redirect::temporary(format!("/n/{id}/stream{params}")))
 }
 
 #[derive(Deserialize)]
@@ -498,9 +490,7 @@ pub fn r_jellyfin_playback_bitratetest(_session: Session, Size: usize) -> Vec<u8
 }
 
 #[post("/Sessions/Capabilities/Full")]
-pub fn r_jellyfin_sessions_capabilities_full(_session: Session) {
-    
-}
+pub fn r_jellyfin_sessions_capabilities_full(_session: Session) {}
 
 #[derive(Deserialize)]
 #[serde(rename_all = "PascalCase")]
@@ -796,7 +786,10 @@ fn item_object(node: &Node, userdata: &NodeUserData) -> JellyfinItem {
         location_type: node.media.as_ref().map(|_| "FileSystem".to_owned()),
         play_access: node.media.as_ref().map(|_| "Full".to_owned()),
         container: node.media.as_ref().map(|_| "webm".to_owned()),
-        run_time_ticks: node.media.as_ref().map(|m| (m.duration * 10_000_000.) as i64),
+        run_time_ticks: node
+            .media
+            .as_ref()
+            .map(|m| (m.duration * 10_000_000.) as i64),
         media_sources: media_source.as_ref().map(|s| vec![s.clone()]),
         media_streams: media_source.as_ref().map(|s| s.media_streams.clone()),
         path: node