aboutsummaryrefslogtreecommitdiff
path: root/import/src/matroska.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-02-17 11:04:49 +0100
committermetamuffin <metamuffin@disroot.org>2025-02-17 11:04:49 +0100
commita847a075e3ec9d51f5b9aeced0b484ccb12f8539 (patch)
tree6fb0e2bb7194b4ee19d78fe18471ab4969b38cd7 /import/src/matroska.rs
parent6e60cbb3145cfdb8e1590ec05e01a5e96df7d9bf (diff)
downloadjellything-a847a075e3ec9d51f5b9aeced0b484ccb12f8539.tar
jellything-a847a075e3ec9d51f5b9aeced0b484ccb12f8539.tar.bz2
jellything-a847a075e3ec9d51f5b9aeced0b484ccb12f8539.tar.zst
use alt_text and store raw json in mkmeta
Diffstat (limited to 'import/src/matroska.rs')
-rw-r--r--import/src/matroska.rs10
1 files changed, 3 insertions, 7 deletions
diff --git a/import/src/matroska.rs b/import/src/matroska.rs
index 4ab1148..1593463 100644
--- a/import/src/matroska.rs
+++ b/import/src/matroska.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 crate::infojson::{self, YVideo};
use anyhow::{Context, Result};
use bincode::{Decode, Encode};
use ebml_struct::{
@@ -31,10 +30,10 @@ pub(crate) struct MatroskaMetadata {
pub cover: Option<Asset>,
pub chapters: Option<Chapters>,
pub tags: Option<Tags>,
- pub infojson: Option<YVideo>,
+ pub infojson: Option<Vec<u8>>,
}
pub(crate) fn matroska_metadata(path: &Path) -> Result<Arc<Option<MatroskaMetadata>>> {
- cache_memory(&["mkmeta-v1", path.to_string_lossy().as_ref()], || {
+ 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]) {
@@ -74,10 +73,7 @@ pub(crate) fn matroska_metadata(path: &Path) -> Result<Arc<Option<MatroskaMetada
for f in attachments.files {
match f.name.as_str() {
"info.json" => {
- infojson = Some(
- serde_json::from_slice::<infojson::YVideo>(&f.data)
- .context("infojson")?,
- );
+ infojson = Some(f.data);
}
"cover.webp" | "cover.png" | "cover.jpg" | "cover.jpeg"
| "cover.avif" => {