Merge branch 'rewrite-stream'

3 files changed, 7 insertions, 126 deletions

diff --git a/import/src/infojson.rs b/import/src/infojson.rs
index 3a8d76e..1efbae9 100644
--- a/import/src/infojson.rs
+++ b/import/src/infojson.rs
@@ -86,7 +86,7 @@ pub struct YFormat {
     pub fps: Option<f64>,
     pub columns: Option<u32>,
     pub fragments: Option<Vec<YFragment>>,
-    pub resolution: String,
+    pub resolution: Option<String>,
     pub dynamic_range: Option<String>,
     pub aspect_ratio: Option<f64>,
     pub http_headers: HashMap<String, String>,
diff --git a/import/src/lib.rs b/import/src/lib.rs
index f7c047e..78a99c3 100644
--- a/import/src/lib.rs
+++ b/import/src/lib.rs
@@ -7,16 +7,15 @@ use anyhow::{anyhow, bail, Context, Result};
 use infojson::YVideo;
 use jellybase::{
     assetfed::AssetInner,
-    common::{
-        Chapter, LocalTrack, MediaInfo, Node, NodeID, NodeKind, Rating, SourceTrack,
-        SourceTrackKind, TrackSource,
-    },
+    common::{Chapter, MediaInfo, Node, NodeID, NodeKind, Rating, SourceTrack, SourceTrackKind},
     database::Database,
     CONF, SECRETS,
 };
-use jellyclient::{Appearance, PeopleGroup, TmdbKind, TraktKind, Visibility};
+use jellyclient::{
+    Appearance, LocalTrack, PeopleGroup, TmdbKind, TrackSource, TraktKind, Visibility,
+};
+use jellyremuxer::metadata::checked_matroska_metadata;
 use log::info;
-use matroska::matroska_metadata;
 use rayon::iter::{ParallelBridge, ParallelIterator};
 use regex::Regex;
 use std::{
@@ -36,7 +35,6 @@ use tokio::{
 use trakt::Trakt;
 
 pub mod infojson;
-pub mod matroska;
 pub mod tmdb;
 pub mod trakt;
 
@@ -279,7 +277,7 @@ fn import_media_file(
     visibility: Visibility,
 ) -> Result<()> {
     info!("media file {path:?}");
-    let Some(m) = (*matroska_metadata(path)?).to_owned() else {
+    let Some(m) = (*checked_matroska_metadata(path)?).to_owned() else {
         return Ok(());
     };
     let infojson = m
@@ -398,7 +396,6 @@ fn import_media_file(
                 },
                 source: TrackSource::Local(
                     AssetInner::LocalTrack(LocalTrack {
-                        codec_private: track.codec_private,
                         path: path.to_owned(),
                         track: track.track_number as usize,
                     })
diff --git a/import/src/matroska.rs b/import/src/matroska.rs
deleted file mode 100644
index 1593463..0000000
--- a/import/src/matroska.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-    This file is part of jellything (https://codeberg.org/metamuffin/jellything)
-    which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
-    Copyright (C) 2025 metamuffin <metamuffin.org>
-*/
-use anyhow::{Context, Result};
-use bincode::{Decode, Encode};
-use ebml_struct::{
-    ids::*,
-    matroska::*,
-    read::{EbmlReadExt, TagRead},
-};
-use jellybase::{
-    assetfed::AssetInner,
-    cache::{cache_file, cache_memory},
-    common::Asset,
-};
-use log::{info, warn};
-use std::{
-    fs::File,
-    io::{BufReader, ErrorKind, Read, Write},
-    path::Path,
-    sync::Arc,
-};
-
-#[derive(Encode, Decode, Clone)]
-pub(crate) struct MatroskaMetadata {
-    pub info: Option<Info>,
-    pub tracks: Option<Tracks>,
-    pub cover: Option<Asset>,
-    pub chapters: Option<Chapters>,
-    pub tags: Option<Tags>,
-    pub infojson: Option<Vec<u8>>,
-}
-pub(crate) fn matroska_metadata(path: &Path) -> Result<Arc<Option<MatroskaMetadata>>> {
-    cache_memory(&["mkmeta-v2", path.to_string_lossy().as_ref()], || {
-        let mut magic = [0; 4];
-        File::open(path)?.read_exact(&mut magic).ok();
-        if !matches!(magic, [0x1A, 0x45, 0xDF, 0xA3]) {
-            return Ok(None);
-        }
-
-        info!("reading {path:?}");
-        let mut file = BufReader::new(File::open(path)?);
-        let mut file = file.by_ref().take(u64::MAX);
-
-        let (x, mut ebml) = file.read_tag()?;
-        assert_eq!(x, EL_EBML);
-        let ebml = Ebml::read(&mut ebml).unwrap();
-        assert!(ebml.doc_type == "matroska" || ebml.doc_type == "webm");
-        let (x, mut segment) = file.read_tag()?;
-        assert_eq!(x, EL_SEGMENT);
-
-        let mut info = None;
-        let mut infojson = None;
-        let mut tracks = None;
-        let mut cover = None;
-        let mut chapters = None;
-        let mut tags = None;
-        loop {
-            let (x, mut seg) = match segment.read_tag() {
-                Ok(o) => o,
-                Err(e) if e.kind() == ErrorKind::UnexpectedEof => break,
-                Err(e) => return Err(e.into()),
-            };
-            match x {
-                EL_INFO => info = Some(Info::read(&mut seg).context("info")?),
-                EL_TRACKS => tracks = Some(Tracks::read(&mut seg).context("tracks")?),
-                EL_CHAPTERS => chapters = Some(Chapters::read(&mut seg).context("chapters")?),
-                EL_TAGS => tags = Some(Tags::read(&mut seg).context("tags")?),
-                EL_ATTACHMENTS => {
-                    let attachments = Attachments::read(&mut seg).context("attachments")?;
-                    for f in attachments.files {
-                        match f.name.as_str() {
-                            "info.json" => {
-                                infojson = Some(f.data);
-                            }
-                            "cover.webp" | "cover.png" | "cover.jpg" | "cover.jpeg"
-                            | "cover.avif" => {
-                                cover = Some(
-                                    AssetInner::Cache(cache_file(
-                                        &["att-cover", path.to_string_lossy().as_ref()],
-                                        move |mut file| {
-                                            file.write_all(&f.data)?;
-                                            Ok(())
-                                        },
-                                    )?)
-                                    .ser(),
-                                )
-                            }
-                            _ => (),
-                        }
-                    }
-                }
-                EL_VOID | EL_CRC32 | EL_CUES | EL_SEEKHEAD => {
-                    seg.consume()?;
-                }
-                EL_CLUSTER => {
-                    break;
-                }
-                id => {
-                    warn!("unknown top-level element {id:x}");
-                    seg.consume()?;
-                }
-            }
-        }
-        Ok(Some(MatroskaMetadata {
-            chapters,
-            cover,
-            info,
-            infojson,
-            tags,
-            tracks,
-        }))
-    })
-}