Merge branch 'rewrite-stream'

1 files changed, 6 insertions, 9 deletions

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,
                     })