diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/Cargo.toml | 2 | ||||
| -rw-r--r-- | server/src/compat/jellyfin/mod.rs | 6 | ||||
| -rw-r--r-- | server/src/main.rs | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/server/Cargo.toml b/server/Cargo.toml index 416ff8e..01e918e 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -9,7 +9,7 @@ jellystream = { path = "../stream" } jellytranscoder = { path = "../transcoder" } jellyimport = { path = "../import" } jellycache = { path = "../cache" } -jellyui = { path = "../ui" } +# jellyui = { path = "../ui" } anyhow = { workspace = true } async-recursion = "1.1.1" diff --git a/server/src/compat/jellyfin/mod.rs b/server/src/compat/jellyfin/mod.rs index 7978f3b..db60530 100644 --- a/server/src/compat/jellyfin/mod.rs +++ b/server/src/compat/jellyfin/mod.rs @@ -9,7 +9,7 @@ use crate::{helper::A, ui::error::MyResult}; use anyhow::anyhow; use jellycommon::{ api::{NodeFilterSort, SortOrder, SortProperty}, - routes::{u_asset, u_node_image}, + routes::{u_asset, u_image}, stream::{StreamContainer, StreamSpec}, user::{NodeUserData, WatchedState}, MediaInfo, Node, NodeID, NodeKind, PictureSlot, SourceTrack, SourceTrackKind, Visibility, @@ -169,7 +169,7 @@ pub fn r_jellyfin_items_image_primary( tag: String, ) -> Redirect { if tag == "poster" { - Redirect::permanent(u_node_image( + Redirect::permanent(u_image( id, PictureSlot::Cover, fillWidth.unwrap_or(1024), @@ -186,7 +186,7 @@ pub fn r_jellyfin_items_images_backdrop( id: &str, maxWidth: Option<usize>, ) -> Redirect { - Redirect::permanent(u_node_image( + Redirect::permanent(u_image( id, PictureSlot::Backdrop, maxWidth.unwrap_or(1024), diff --git a/server/src/main.rs b/server/src/main.rs index 058fdc3..8b0c128 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -8,7 +8,6 @@ #![recursion_limit = "4096"] use config::load_config; -use jellylogic::{admin::log::enable_logging, login::create_admin_account}; use log::{error, info, warn}; use routes::build_rocket; use serde::{Deserialize, Serialize}; @@ -23,12 +22,11 @@ pub mod logic; pub mod routes; pub mod ui; -#[rustfmt::skip] #[derive(Debug, Deserialize, Serialize, Default)] pub struct Config { asset_path: PathBuf, cookie_key: Option<String>, - tls:bool, + tls: bool, hostname: String, } |