aboutsummaryrefslogtreecommitdiff
path: root/server/src
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2026-01-23 04:19:24 +0100
committermetamuffin <metamuffin@disroot.org>2026-01-23 04:19:24 +0100
commit3671a4e07565c86f8071fb2309f463aeaf684ba3 (patch)
tree9a9057c7dcc174ada17a45a195502ff94b2f2946 /server/src
parent10cdaaa30a6b4a187797434dc8d959780f0e8fbf (diff)
downloadjellything-3671a4e07565c86f8071fb2309f463aeaf684ba3.tar
jellything-3671a4e07565c86f8071fb2309f463aeaf684ba3.tar.bz2
jellything-3671a4e07565c86f8071fb2309f463aeaf684ba3.tar.zst
move ui code around
Diffstat (limited to 'server/src')
-rw-r--r--server/src/compat/jellyfin/mod.rs6
-rw-r--r--server/src/main.rs4
2 files changed, 4 insertions, 6 deletions
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,
}