avoid transitive crate deps by re-export

6 files changed, 37 insertions, 24 deletions

diff --git a/stream/Cargo.toml b/stream/Cargo.toml
index b66cfca..36979c9 100644
--- a/stream/Cargo.toml
+++ b/stream/Cargo.toml
@@ -4,8 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-jellycommon = { path = "../common", features = ["rocket"] }
-jellybase = { path = "../base" }
+jellybase = { path = "../base", features = ["rocket"] }
 jellytranscoder = { path = "../transcoder" }
 jellyremuxer = { path = "../remuxer" }
 
diff --git a/stream/src/fragment.rs b/stream/src/fragment.rs
index 2dbc716..e276d29 100644
--- a/stream/src/fragment.rs
+++ b/stream/src/fragment.rs
@@ -4,11 +4,14 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use anyhow::{anyhow, bail, Result};
-use jellybase::{permission::PermissionSetExt, CONF};
-use jellycommon::{
-    stream::StreamSpec,
-    user::{PermissionSet, UserPermission},
-    LocalTrack, Node,
+use jellybase::{
+    common::{
+        stream::StreamSpec,
+        user::{PermissionSet, UserPermission},
+        LocalTrack, Node,
+    },
+    permission::PermissionSetExt,
+    CONF,
 };
 use jellytranscoder::fragment::transcode;
 use log::warn;
diff --git a/stream/src/hls.rs b/stream/src/hls.rs
index c09b77f..dca1036 100644
--- a/stream/src/hls.rs
+++ b/stream/src/hls.rs
@@ -5,10 +5,12 @@
 */
 
 use anyhow::{anyhow, Result};
-use jellybase::CONF;
-use jellycommon::{
-    stream::{StreamFormat, StreamSpec},
-    LocalTrack, Node, SourceTrackKind,
+use jellybase::{
+    common::{
+        stream::{StreamFormat, StreamSpec},
+        LocalTrack, Node, SourceTrackKind,
+    },
+    CONF,
 };
 use std::{fmt::Write, ops::Range, sync::Arc};
 use tokio::{
diff --git a/stream/src/jhls.rs b/stream/src/jhls.rs
index 28d383f..79fc5fe 100644
--- a/stream/src/jhls.rs
+++ b/stream/src/jhls.rs
@@ -4,12 +4,15 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use anyhow::{anyhow, Result};
-use jellybase::{permission::PermissionSetExt, CONF};
-use jellycommon::{
-    jhls::JhlsTrackIndex,
-    stream::StreamSpec,
-    user::{PermissionSet, UserPermission},
-    LocalTrack, Node,
+use jellybase::{
+    common::{
+        jhls::JhlsTrackIndex,
+        stream::StreamSpec,
+        user::{PermissionSet, UserPermission},
+        LocalTrack, Node,
+    },
+    permission::PermissionSetExt,
+    CONF,
 };
 use std::sync::Arc;
 use tokio::io::{AsyncWriteExt, DuplexStream};
diff --git a/stream/src/lib.rs b/stream/src/lib.rs
index 2055440..ca7578d 100644
--- a/stream/src/lib.rs
+++ b/stream/src/lib.rs
@@ -12,11 +12,14 @@ pub mod webvtt;
 use anyhow::{anyhow, bail, Context, Result};
 use fragment::fragment_stream;
 use hls::{hls_master_stream, hls_variant_stream};
-use jellybase::{permission::PermissionSetExt, CONF};
-use jellycommon::{
-    stream::{StreamFormat, StreamSpec},
-    user::{PermissionSet, UserPermission},
-    LocalTrack, Node, TrackSource,
+use jellybase::{
+    common::{
+        stream::{StreamFormat, StreamSpec},
+        user::{PermissionSet, UserPermission},
+        LocalTrack, Node, TrackSource,
+    },
+    permission::PermissionSetExt,
+    CONF,
 };
 use jhls::jhls_index;
 use std::{io::SeekFrom, ops::Range, sync::Arc};
diff --git a/stream/src/webvtt.rs b/stream/src/webvtt.rs
index 02a4181..f78ac2f 100644
--- a/stream/src/webvtt.rs
+++ b/stream/src/webvtt.rs
@@ -4,8 +4,11 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use anyhow::{anyhow, Context, Result};
-use jellybase::{cache::async_cache_memory, CONF};
-use jellycommon::{stream::StreamSpec, LocalTrack, Node};
+use jellybase::{
+    cache::async_cache_memory,
+    common::{stream::StreamSpec, LocalTrack, Node},
+    CONF,
+};
 use jellyremuxer::extract::extract_track;
 use jellytranscoder::subtitles::{parse_subtitles, write_webvtt};
 use std::sync::Arc;