move cache to own crate

4 files changed, 8 insertions, 21 deletions

diff --git a/remuxer/Cargo.toml b/remuxer/Cargo.toml
index 16713df..98dd86c 100644
--- a/remuxer/Cargo.toml
+++ b/remuxer/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 jellymatroska = { path = "../matroska" }
-jellybase = { path = "../base" }
+jellycache = { path = "../cache" }
 
 tokio = { version = "1.43.0", features = ["io-util"] }
 anyhow = "1.0.95"
diff --git a/remuxer/src/metadata.rs b/remuxer/src/metadata.rs
index c2931f4..ddcf4c0 100644
--- a/remuxer/src/metadata.rs
+++ b/remuxer/src/metadata.rs
@@ -10,11 +10,7 @@ use ebml_struct::{
     matroska::*,
     read::{EbmlReadExt, TagRead},
 };
-use jellybase::{
-    assetfed::AssetInner,
-    cache::{cache_file, cache_memory},
-    common::Asset,
-};
+use jellycache::{cache_file, cache_memory, CachePath};
 use log::{info, warn};
 use std::{
     fs::File,
@@ -29,7 +25,7 @@ pub use ebml_struct::matroska::TrackEntry as MatroskaTrackEntry;
 pub struct MatroskaMetadata {
     pub info: Option<Info>,
     pub tracks: Option<Tracks>,
-    pub cover: Option<Asset>,
+    pub cover: Option<CachePath>,
     pub chapters: Option<Chapters>,
     pub tags: Option<Tags>,
     pub infojson: Option<Vec<u8>>,
@@ -83,17 +79,10 @@ pub fn matroska_metadata(path: &Path) -> Result<Arc<MatroskaMetadata>> {
                             }
                             "cover.webp" | "cover.png" | "cover.jpg" | "cover.jpeg"
                             | "cover.avif" => {
-                                cover = Some(
-                                    AssetInner::Cache(cache_file(
-                                        "att-cover",
-                                        path,
-                                        move |mut file| {
-                                            file.write_all(&f.data)?;
-                                            Ok(())
-                                        },
-                                    )?)
-                                    .ser(),
-                                )
+                                cover = Some(cache_file("att-cover", path, move |mut file| {
+                                    file.write_all(&f.data)?;
+                                    Ok(())
+                                })?)
                             }
                             _ => (),
                         }
diff --git a/remuxer/src/remux.rs b/remuxer/src/remux.rs
index a44c58b..9e6d4b5 100644
--- a/remuxer/src/remux.rs
+++ b/remuxer/src/remux.rs
@@ -3,7 +3,6 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
-use jellybase::common::Node;
 use std::{io::Write, ops::Range, path::PathBuf};
 
 // struct ClusterLayout {
@@ -17,7 +16,6 @@ pub fn remux_stream_into(
     _writer: impl Write,
     _range: Range<usize>,
     _path_base: PathBuf,
-    _item: &Node,
     _selection: Vec<usize>,
     _webm: bool,
 ) -> anyhow::Result<()> {
diff --git a/remuxer/src/seek_index.rs b/remuxer/src/seek_index.rs
index c09fdf9..a1a97ef 100644
--- a/remuxer/src/seek_index.rs
+++ b/remuxer/src/seek_index.rs
@@ -5,7 +5,7 @@
 */
 use anyhow::{Context, Result};
 use bincode::{Decode, Encode};
-use jellybase::cache::cache_memory;
+use jellycache::cache_memory;
 use jellymatroska::{
     block::Block,
     read::EbmlReader,