diff options
| author | metamuffin <metamuffin@disroot.org> | 2025-02-01 15:11:31 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2025-02-01 15:11:31 +0100 |
| commit | 2f053d597e91585deb9efd1a098537b244c25f56 (patch) | |
| tree | cc6b6677f3a375e291be2ae5ef36563543476315 /import/src/lib.rs | |
| parent | 95d90fbba36a752f7cf96ea0bebd925534341e15 (diff) | |
| download | jellything-2f053d597e91585deb9efd1a098537b244c25f56.tar jellything-2f053d597e91585deb9efd1a098537b244c25f56.tar.bz2 jellything-2f053d597e91585deb9efd1a098537b244c25f56.tar.zst | |
Revert "ebml-struct based fragment writer (does not work)"
This reverts commit 95d90fbba36a752f7cf96ea0bebd925534341e15.
Diffstat (limited to 'import/src/lib.rs')
| -rw-r--r-- | import/src/lib.rs | 14 |
1 files changed, 4 insertions, 10 deletions
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() |