From 45dbdfebdb9c194af2ff25a8fa2fd574b757a06c Mon Sep 17 00:00:00 2001 From: metamuffin Date: Wed, 18 Oct 2023 15:52:30 +0200 Subject: revert to old design --- server/src/routes/ui/node.rs | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) (limited to 'server/src') diff --git a/server/src/routes/ui/node.rs b/server/src/routes/ui/node.rs index e4d53e6..773daa4 100644 --- a/server/src/routes/ui/node.rs +++ b/server/src/routes/ui/node.rs @@ -82,24 +82,37 @@ pub async fn r_library_node_filter<'a>( markup::define! { NodeCard<'a>(id: &'a str, node: &'a NodePublic) { - @let cls = format!("node card {}", match node.kind {NodeKind::Channel => "aspect-square", NodeKind::Video => "aspect-thumb", NodeKind::Collection => "aspect-land", _ => "aspect-port"}); + @let cls = format!("node card poster {}", match node.kind {NodeKind::Channel => "aspect-square", NodeKind::Video => "aspect-thumb", NodeKind::Collection => "aspect-land", _ => "aspect-port"}); div[class=cls] { .poster { - .inner { - a[href=uri!(r_library_node(id))] { - img[src=uri!(r_item_assets(id, AssetRole::Poster, Some(1024)))]; + a[href=uri!(r_library_node(id))] { + img[src=uri!(r_item_assets(id, AssetRole::Poster, Some(1024)))]; + } + @if matches!(node.kind, NodeKind::Collection | NodeKind::Channel) { + .cardhover.open { + a[href=&uri!(r_library_node(id))] { "Open" } + @Props { node } } - div.details { - h3 { @node.title } + } else { + .cardhover.item { + a.play[href=&uri!(r_player(id, PlayerConfig::default()))] { "▶" } @Props { node } - p.description { @node.description } - @if matches!(node.kind, NodeKind::Collection | NodeKind::Channel) { - a[href=&uri!(r_library_node(id))] { "Open" } - } else { - a.play[href=&uri!(r_player(id, PlayerConfig::default()))] { "Watch now" } - } } } + // .inner { + // a[href=uri!(r_library_node(id))] { + // img[src=uri!(r_item_assets(id, AssetRole::Poster, Some(1024)))]; + // } + // div.details { + // h3 { @node.title } + // p.descriptioüwn { @node.description } + // @if matches!(node.kind, NodeKind::Collection | NodeKind::Channel) { + // a[href=&uri!(r_library_node(id))] { "Open" } + // } else { + // a.play[href=&uri!(r_player(id, PlayerConfig::default()))] { "Watch now" } + // } + // } + // } } div.title { a[href=uri!(r_library_node(id))] { -- cgit v1.2.3-70-g09d2 From 539e48e3547040c05a84abc796b1778ab5472a8d Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sat, 21 Oct 2023 20:47:30 +0200 Subject: back button only when js --- server/src/routes/ui/layout.rs | 6 +----- server/src/routes/ui/node.rs | 1 - server/src/routes/ui/player.rs | 1 - web/script/backbutton.ts | 8 ++++++++ web/script/main.ts | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 web/script/backbutton.ts (limited to 'server/src') diff --git a/server/src/routes/ui/layout.rs b/server/src/routes/ui/layout.rs index 1c47247..cdac09c 100644 --- a/server/src/routes/ui/layout.rs +++ b/server/src/routes/ui/layout.rs @@ -27,7 +27,7 @@ use rocket::{ use std::io::Cursor; markup::define! { - Layout<'a, Main: Render>(title: String, main: Main, class: Option<&'a str>, session: Option, show_back: bool) { + Layout<'a, Main: Render>(title: String, main: Main, class: Option<&'a str>, session: Option) { @markup::doctype() html { head { @@ -37,7 +37,6 @@ markup::define! { } body[class=class.unwrap_or("")] { nav { - @if *show_back { a[href="javascript:history.back()"] { "<- Back" } } " " h1 { a[href="/"] { @CONF.brand } } " " @if let Some(_) = session { a[href=uri!(r_library_node("library"))] { "My Library" } " " @@ -80,7 +79,6 @@ pub type DynLayoutPage<'a> = LayoutPage>; pub struct LayoutPage { pub title: String, pub class: Option<&'static str>, - pub show_back: bool, pub content: T, } @@ -90,7 +88,6 @@ impl Default for LayoutPage> { class: None, content: markup::new!(), title: String::new(), - show_back: false, } } } @@ -103,7 +100,6 @@ impl<'r, Main: Render> Responder<'r, 'static> for LayoutPage
{ let session = block_on(req.guard::>()).unwrap(); let mut out = String::new(); Layout { - show_back: self.show_back, main: self.content, title: self.title, class: self.class.as_deref(), diff --git a/server/src/routes/ui/node.rs b/server/src/routes/ui/node.rs index 773daa4..6256c77 100644 --- a/server/src/routes/ui/node.rs +++ b/server/src/routes/ui/node.rs @@ -72,7 +72,6 @@ pub async fn r_library_node_filter<'a>( Ok(Either::Left(LayoutPage { title: node.title.to_string(), - show_back: true, //- !matches!(node.kind, NodeKind::Collection), content: markup::new! { @NodePage { node: &node, id: &id, children: &children, filter: &filter } }, diff --git a/server/src/routes/ui/player.rs b/server/src/routes/ui/player.rs index 4a636e6..d3a3342 100644 --- a/server/src/routes/ui/player.rs +++ b/server/src/routes/ui/player.rs @@ -70,7 +70,6 @@ pub fn r_player<'a>( } @conf }, - show_back: true, ..Default::default() }) } diff --git a/web/script/backbutton.ts b/web/script/backbutton.ts new file mode 100644 index 0000000..c1225c0 --- /dev/null +++ b/web/script/backbutton.ts @@ -0,0 +1,8 @@ +import { e } from "./jshelper/mod.ts"; + +globalThis.addEventListener("DOMContentLoaded", () => { + document.getElementsByTagName("nav").item(0)?.prepend( + e("a", "<- Back", { onclick() { history.back() } }) + ) +}) + diff --git a/web/script/main.ts b/web/script/main.ts index e2a5045..dd168d5 100644 --- a/web/script/main.ts +++ b/web/script/main.ts @@ -5,3 +5,4 @@ */ import "./player/mod.ts" import "./transition.ts" +import "./backbutton.ts" -- cgit v1.2.3-70-g09d2 From 704d65109a0a249583e49e600fef848934cfc13e Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sat, 21 Oct 2023 20:59:02 +0200 Subject: reenable js transitions --- server/src/routes/ui/style.rs | 1 + web/js-transition.css | 16 ++++++++++++++++ web/script/transition.ts | 13 ++++++------- 3 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 web/js-transition.css (limited to 'server/src') diff --git a/server/src/routes/ui/style.rs b/server/src/routes/ui/style.rs index 1f92690..b8a5fdb 100644 --- a/server/src/routes/ui/style.rs +++ b/server/src/routes/ui/style.rs @@ -37,6 +37,7 @@ fn css_bundle() -> String { "nodepage.css", "nodecard.css", "js-player.css", + "js-transition.css", "forms.css" ) } diff --git a/web/js-transition.css b/web/js-transition.css new file mode 100644 index 0000000..54a899f --- /dev/null +++ b/web/js-transition.css @@ -0,0 +1,16 @@ +@keyframes jst-fadein { + from { + background-color: transparent; + } + to { + background-color: black; + } +} +@keyframes jst-fadeout { + from { + background-color: black; + } + to { + background-color: transparent; + } +} diff --git a/web/script/transition.ts b/web/script/transition.ts index aa172f7..809abd6 100644 --- a/web/script/transition.ts +++ b/web/script/transition.ts @@ -5,7 +5,7 @@ */ /// -const duration = 0.2 +const duration = 200 globalThis.addEventListener("load", () => { patch_page() }) @@ -60,16 +60,15 @@ function fade(dir: boolean) { overlay.style.width = "100vw" overlay.style.height = "100vh" overlay.style.backgroundColor = dir ? "black" : "transparent" - overlay.style.transition = `background-color ${duration}s` overlay.style.zIndex = "99999"; - setTimeout(() => { - overlay.style.backgroundColor = dir ? "transparent" : "black" - }, 0) + overlay.style.animationName = dir ? "jst-fadeout" : "jst-fadein" + overlay.style.animationFillMode = "forwards" + overlay.style.animationDuration = `${duration}ms` document.body.appendChild(overlay) return new Promise(res => { setTimeout(() => { if (dir) document.body.removeChild(overlay) res() - }, duration * 1000) + }, duration) }) -} \ No newline at end of file +} -- cgit v1.2.3-70-g09d2 From c4de8d95619d6d8da8640801aeecc912cdb8d0b5 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 22 Oct 2023 15:57:18 +0200 Subject: cache control assets --- server/src/routes/ui/style.rs | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) (limited to 'server/src') diff --git a/server/src/routes/ui/style.rs b/server/src/routes/ui/style.rs index b8a5fdb..bdaddd2 100644 --- a/server/src/routes/ui/style.rs +++ b/server/src/routes/ui/style.rs @@ -4,7 +4,11 @@ Copyright (C) 2023 metamuffin Copyright (C) 2023 tpart */ -use rocket::{get, http::ContentType}; +use rocket::{ + get, + http::{ContentType, Header}, + response::Responder, +}; macro_rules! concat_files { ([$base: expr], $($files:literal),*) => {{ @@ -42,6 +46,17 @@ fn css_bundle() -> String { ) } +pub struct CachedAsset(pub T); +impl<'r, 'o: 'r, T: Responder<'r, 'o>> Responder<'r, 'o> for CachedAsset { + fn respond_to(self, request: &'r rocket::Request<'_>) -> rocket::response::Result<'o> { + let mut res = self.0.respond_to(request)?; + if cfg!(not(debug_assertions)) { + res.set_header(Header::new("cache-control", "max-age=86400")); + } + Ok(res) + } +} + fn js_bundle() -> String { concat_files!([env!("OUT_DIR")], "bundle.js") } @@ -50,23 +65,23 @@ fn js_bundle_map() -> String { } #[get("/assets/style.css")] -pub fn r_assets_style() -> (ContentType, String) { - (ContentType::CSS, css_bundle()) +pub fn r_assets_style() -> CachedAsset<(ContentType, String)> { + CachedAsset((ContentType::CSS, css_bundle())) } #[get("/assets/cantarell.woff2")] -pub fn r_assets_font() -> (ContentType, &'static [u8]) { - ( +pub fn r_assets_font() -> CachedAsset<(ContentType, &'static [u8])> { + CachedAsset(( ContentType::WOFF2, include_bytes!("../../../../web/cantarell.woff2"), - ) + )) } #[get("/assets/bundle.js")] -pub fn r_assets_js() -> (ContentType, String) { - (ContentType::JavaScript, js_bundle()) +pub fn r_assets_js() -> CachedAsset<(ContentType, String)> { + CachedAsset((ContentType::JavaScript, js_bundle())) } #[get("/assets/bundle.js.map")] -pub fn r_assets_js_map() -> (ContentType, String) { - (ContentType::JSON, js_bundle_map()) +pub fn r_assets_js_map() -> CachedAsset<(ContentType, String)> { + CachedAsset((ContentType::JSON, js_bundle_map())) } -- cgit v1.2.3-70-g09d2 From 57fccd01d487284bb317fb1ff778e0fd2e140c12 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 23 Oct 2023 18:51:17 +0200 Subject: release date from infojson and sorting --- Cargo.lock | 1 + common/Cargo.toml | 1 + common/src/lib.rs | 4 ++++ import/src/infojson.rs | 21 +++++++++++++++++++++ import/src/main.rs | 16 +++++++++++++++- server/src/routes/ui/node.rs | 3 +++ server/src/routes/ui/sort.rs | 7 ++++++- 7 files changed, 51 insertions(+), 2 deletions(-) (limited to 'server/src') diff --git a/Cargo.lock b/Cargo.lock index 8d5a5bb..d34f2e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1415,6 +1415,7 @@ name = "jellycommon" version = "0.1.0" dependencies = [ "bincode 2.0.0-rc.3", + "chrono", "rocket", "serde", ] diff --git a/common/Cargo.toml b/common/Cargo.toml index b38b962..437fb0b 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -7,6 +7,7 @@ edition = "2021" serde = { version = "1.0.188", features = ["derive"] } bincode = { version = "2.0.0-rc.3", features = ["derive"] } rocket = { workspace = true, optional = true } +chrono = { version = "0.4.31", features = ["serde"] } [features] rocket = ["dep:rocket"] diff --git a/common/src/lib.rs b/common/src/lib.rs index 2bde0b9..8292e87 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -11,6 +11,9 @@ pub mod seek_index; pub mod stream; pub mod user; +pub use chrono; + +use chrono::{DateTime, Utc}; #[cfg(feature = "rocket")] use rocket::{FromFormField, UriDisplayQuery}; use serde::{Deserialize, Serialize}; @@ -42,6 +45,7 @@ pub struct NodePublic { #[serde(default)] pub children: Vec, #[serde(default)] pub tagline: Option, #[serde(default)] pub description: Option, + #[serde(default)] pub release_date: Option>, #[serde(default)] pub index: Option, #[serde(default)] pub media: Option, #[serde(default)] pub ratings: BTreeMap, diff --git a/import/src/infojson.rs b/import/src/infojson.rs index ca02551..dd2151b 100644 --- a/import/src/infojson.rs +++ b/import/src/infojson.rs @@ -4,6 +4,8 @@ Copyright (C) 2023 metamuffin */ +use anyhow::Context; +use jellycommon::chrono::{format::Parsed, DateTime, Utc}; use serde::{Deserialize, Serialize}; use std::collections::HashMap; @@ -120,3 +122,22 @@ pub struct YHeatmapSample { pub end_time: f64, pub value: f64, } + +pub fn parse_upload_date(d: &str) -> anyhow::Result> { + let (year, month, day) = (&d[0..4], &d[4..6], &d[6..8]); + let (year, month, day) = ( + year.parse().context("parsing year")?, + month.parse().context("parsing month")?, + day.parse().context("parsing day")?, + ); + + let mut p = Parsed::new(); + p.year = Some(year); + p.month = Some(month); + p.day = Some(day); + p.hour_div_12 = Some(0); + p.hour_mod_12 = Some(0); + p.minute = Some(0); + p.second = Some(0); + Ok(p.to_datetime_with_timezone(&Utc)?) +} diff --git a/import/src/main.rs b/import/src/main.rs index 57e6b99..c274e54 100644 --- a/import/src/main.rs +++ b/import/src/main.rs @@ -11,7 +11,7 @@ pub mod tmdb; use anyhow::Context; use base64::Engine; use clap::{Parser, Subcommand}; -use infojson::YVideo; +use infojson::{parse_upload_date, YVideo}; use jellycommon::{ config::GlobalConfig, AssetLocation, LocalTrack, MediaInfo, MediaSource, Node, NodeKind, NodePrivate, NodePublic, Rating, @@ -22,6 +22,7 @@ use log::{info, warn}; use rand::random; use std::{ collections::BTreeMap, + fmt::Debug, fs::{remove_file, File}, io::{stdin, BufReader, Write}, path::PathBuf, @@ -354,6 +355,9 @@ fn main() -> anyhow::Result<()> { duration: m.duration, tracks: m.tracks.clone(), }), + release_date: infojson + .as_ref() + .and_then(|j| ok_or_warn(parse_upload_date(&j.upload_date))), ..Default::default() }, }; @@ -399,3 +403,13 @@ fn make_ident(s: &str) -> String { } out } + +fn ok_or_warn(r: Result) -> Option { + match r { + Ok(t) => Some(t), + Err(e) => { + warn!("{e:?}"); + None + } + } +} diff --git a/server/src/routes/ui/node.rs b/server/src/routes/ui/node.rs index 6256c77..bb97146 100644 --- a/server/src/routes/ui/node.rs +++ b/server/src/routes/ui/node.rs @@ -179,6 +179,9 @@ markup::define! { Rating::Imdb => { "IMDb Rating: " @value } } } } + @if let Some(d) = &node.release_date { + p { "Released " @d.to_rfc2822() } + } } } } diff --git a/server/src/routes/ui/sort.rs b/server/src/routes/ui/sort.rs index da5061d..e1af9d5 100644 --- a/server/src/routes/ui/sort.rs +++ b/server/src/routes/ui/sort.rs @@ -53,11 +53,16 @@ pub fn filter_and_sort_nodes(f: &NodeFilterSort, nodes: &mut Vec<(String, NodePu if let Some(kind) = &f.filter_kind { o &= kind.contains(&node.kind) } + if let Some(SortProperty::ReleaseDate) = &f.sort_by { + o &= node.release_date.is_some() + } o }); if let Some(sort_prop) = &f.sort_by { match sort_prop { - SortProperty::ReleaseDate => nodes.sort_by_key(|(_, _n)| 0), // TODO + SortProperty::ReleaseDate => { + nodes.sort_by_key(|(_, n)| n.release_date.expect("asserted above")) + } SortProperty::Title => nodes.sort_by(|(_, a), (_, b)| a.title.cmp(&b.title)), SortProperty::RatingRottenTomatoes => nodes.sort_by_cached_key(|(_, n)| { SortAnyway(*n.ratings.get(&Rating::RottenTomatoes).unwrap_or(&0.)) -- cgit v1.2.3-70-g09d2