From 2f053d597e91585deb9efd1a098537b244c25f56 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sat, 1 Feb 2025 15:11:31 +0100
Subject: Revert "ebml-struct based fragment writer (does not work)"

This reverts commit 95d90fbba36a752f7cf96ea0bebd925534341e15.
---
 import/src/lib.rs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'import/src/lib.rs')

diff --git a/import/src/lib.rs b/import/src/lib.rs
index 2de4cc9..4be2151 100644
--- a/import/src/lib.rs
+++ b/import/src/lib.rs
@@ -14,7 +14,7 @@ use jellybase::{
     database::Database,
     CONF, SECRETS,
 };
-use jellyremuxer::metadata::matroska_metadata;
+use matroska::matroska_metadata;
 use rayon::iter::{ParallelDrainRange, ParallelIterator};
 use std::{
     collections::HashMap,
@@ -243,13 +243,6 @@ fn import_media_file(db: &Database, path: &Path, parent: NodeID) -> Result<()> {
     let info = m.info.ok_or(anyhow!("no info"))?;
     let tracks = m.tracks.ok_or(anyhow!("no tracks"))?;
 
-    let infojson = m
-        .infojson
-        .as_ref()
-        .map(|ij| serde_json::from_slice::<infojson::YVideo>(ij))
-        .transpose()
-        .context("infojson")?;
-
     let mut tags = m
         .tags
         .map(|tags| {
@@ -267,7 +260,8 @@ fn import_media_file(db: &Database, path: &Path, parent: NodeID) -> Result<()> {
         .to_string_lossy()
         .to_string();
 
-    let slug = infojson
+    let slug = m
+        .infojson
         .as_ref()
         .map(|ij| format!("youtube-{}", ij.id))
         .unwrap_or(make_kebab(&filepath_stem));
@@ -317,7 +311,7 @@ fn import_media_file(db: &Database, path: &Path, parent: NodeID) -> Result<()> {
             })
             .collect::<Vec<_>>();
 
-        if let Some(infojson) = infojson {
+        if let Some(infojson) = m.infojson {
             node.kind = Some(
                 if !tracks
                     .iter()
-- 
cgit v1.2.3-70-g09d2