diff options
author | metamuffin <metamuffin@disroot.org> | 2023-01-17 18:31:41 +0100 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2023-01-17 18:31:41 +0100 |
commit | 843f9e65f009e5fc5f712b4bee5902ec3676d334 (patch) | |
tree | d8e53188e79a709348d69303db89032c339ae9e0 /server | |
parent | e65619de86080d72bf81ba72311dce5325976478 (diff) | |
download | jellything-843f9e65f009e5fc5f712b4bee5902ec3676d334.tar jellything-843f9e65f009e5fc5f712b4bee5902ec3676d334.tar.bz2 jellything-843f9e65f009e5fc5f712b4bee5902ec3676d334.tar.zst |
non-seekable mkv almost works
Diffstat (limited to 'server')
-rw-r--r-- | server/src/library.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/server/src/library.rs b/server/src/library.rs index a59635b..c75bf69 100644 --- a/server/src/library.rs +++ b/server/src/library.rs @@ -1,5 +1,6 @@ use anyhow::{anyhow, bail, Context, Ok}; use jellycommon::{DirectoryInfo, ItemInfo}; +use log::info; use std::{ffi::OsStr, fs::File, path::PathBuf, sync::Arc}; pub struct Library { @@ -93,9 +94,9 @@ impl Node { .read_dir()? .filter_map(|e| { let e = e.unwrap(); - if (e.path().extension() == Some(OsStr::new("json")) - && e.path().file_name() != Some(OsStr::new("directory.json"))) - || e.metadata().unwrap().is_dir() + if (e.path().extension() != Some(OsStr::new("mkv")) + || e.metadata().unwrap().is_dir()) + && !e.path().ends_with("directory.json") { Some(e.path()) } else { @@ -117,6 +118,7 @@ impl Node { })) .into()) } else if path.is_file() { + info!("loading {path:?}"); let datafile = File::open(path.clone()).context("cant load metadata")?; let data: ItemInfo = serde_json::from_reader(datafile).context("invalid metadata")?; let identifier = path |