aboutsummaryrefslogtreecommitdiff
path: root/server/src/library.rs
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/library.rs')
-rw-r--r--server/src/library.rs11
1 files changed, 8 insertions, 3 deletions
diff --git a/server/src/library.rs b/server/src/library.rs
index ea8b095..6e6e13d 100644
--- a/server/src/library.rs
+++ b/server/src/library.rs
@@ -7,7 +7,9 @@ use anyhow::{anyhow, bail, Context, Ok};
use jellycommon::{DirectoryInfo, ItemInfo};
use log::info;
use std::{
+ ffi::OsStr,
fs::File,
+ os::unix::prelude::OsStrExt,
path::{Path, PathBuf},
sync::Arc,
};
@@ -107,12 +109,14 @@ impl Node {
lib_path = lib_path.join(identifier.clone());
}
+ info!("scanning directory {:?}", path);
let children = path
.read_dir()?
.filter_map(|e| {
let e = e.unwrap();
- if (e.path().extension().is_none() || e.metadata().unwrap().is_dir())
- && !e.path().ends_with("directory.json")
+ eprintln!("{:?}", e.path());
+ if e.path().extension() == Some(&OsStr::from_bytes(b"jelly"))
+ || e.metadata().unwrap().is_dir()
{
Some(e.path())
} else {
@@ -140,11 +144,12 @@ impl Node {
let datafile = File::open(path.clone()).context("cant load metadata")?;
let data: ItemInfo = serde_json::from_reader(datafile).context("invalid metadata")?;
let identifier = path
- .with_extension("")
.file_name()
.unwrap()
.to_str()
.unwrap()
+ .strip_suffix(".jelly")
+ .unwrap()
.to_string();
Ok(Some(
Node::Item(Arc::new(Item {