diff options
| author | metamuffin <metamuffin@disroot.org> | 2023-01-17 23:08:57 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2023-01-17 23:08:57 +0100 |
| commit | 5aa557e864bd2cf940e7164b7568e7e545817306 (patch) | |
| tree | 6eec3a834c4217dbf1208dc9b34bb7debddb1d9c /server/src | |
| parent | cda5929b5176947490bcf0f661f61b4b9d5ea7c1 (diff) | |
| download | jellything-5aa557e864bd2cf940e7164b7568e7e545817306.tar jellything-5aa557e864bd2cf940e7164b7568e7e545817306.tar.bz2 jellything-5aa557e864bd2cf940e7164b7568e7e545817306.tar.zst | |
wokrs
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/frontend/pages/node.rs | 5 | ||||
| -rw-r--r-- | server/src/library.rs | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/server/src/frontend/pages/node.rs b/server/src/frontend/pages/node.rs index 7ac4332..6819bc9 100644 --- a/server/src/frontend/pages/node.rs +++ b/server/src/frontend/pages/node.rs @@ -1,3 +1,5 @@ +use super::MyError; +use crate::rocket_uri_macro_stream; use crate::{ frontend::pages::HtmlTemplate, library::{Directory, Item, Node}, @@ -7,8 +9,6 @@ use anyhow::Context; use rocket::{get, uri, State}; use std::{ops::Deref, path::PathBuf, sync::Arc}; -use super::MyError; - #[get("/library/<path..>")] pub async fn page_library_node( path: PathBuf, @@ -56,5 +56,6 @@ markup::define! { } ItemPage(item: Arc<Item>) { h1 { @item.data.title } + video[src=&uri!(stream(&item.lib_path, "1,2")).to_string(), controls] {} } } diff --git a/server/src/library.rs b/server/src/library.rs index c75bf69..37d71df 100644 --- a/server/src/library.rs +++ b/server/src/library.rs @@ -94,7 +94,9 @@ impl Node { .read_dir()? .filter_map(|e| { let e = e.unwrap(); - if (e.path().extension() != Some(OsStr::new("mkv")) + // TODO + if ((e.path().extension() != Some(OsStr::new("mkv")) + && e.path().extension() != Some(OsStr::new("webm"))) || e.metadata().unwrap().is_dir()) && !e.path().ends_with("directory.json") { |