From 112dcf3009a09e87a619ce5729351c23b65e8d0d Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sat, 19 Apr 2025 00:03:53 +0200
Subject: manual clippy fixes

---
 server/src/routes/compat/jellyfin/mod.rs | 6 ++++--
 server/src/routes/ui/admin/log.rs        | 5 +++--
 server/src/routes/ui/node.rs             | 4 ++--
 server/src/routes/ui/player.rs           | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'server/src')

diff --git a/server/src/routes/compat/jellyfin/mod.rs b/server/src/routes/compat/jellyfin/mod.rs
index 7393c5f..e37d7d1 100644
--- a/server/src/routes/compat/jellyfin/mod.rs
+++ b/server/src/routes/compat/jellyfin/mod.rs
@@ -736,7 +736,8 @@ fn item_object(node: &Node, userdata: &NodeUserData) -> JellyfinItem {
         parent_id: "todo-parent".to_owned(), // TODO
         r#type: match node.kind {
             NodeKind::Movie | NodeKind::Video | NodeKind::ShortFormVideo => JellyfinItemType::Movie,
-            NodeKind::Collection | _ => JellyfinItemType::CollectionFolder,
+            NodeKind::Collection => JellyfinItemType::CollectionFolder,
+            _ => JellyfinItemType::CollectionFolder,
         },
         people: node
             .people
@@ -772,7 +773,8 @@ fn item_object(node: &Node, userdata: &NodeUserData) -> JellyfinItem {
             "aspect-thumb" => 16. / 9.,
             "aspect-land" => 2f64.sqrt(),
             "aspect-port" => 1. / 2f64.sqrt(),
-            "aspect-square" | _ => 1.,
+            "aspect-square" => 1.,
+            _ => 1.,
         },
         collection_type: "unknown".to_owned(),
         image_tags: BTreeMap::from_iter([("Primary".to_string(), "poster".to_string())]),
diff --git a/server/src/routes/ui/admin/log.rs b/server/src/routes/ui/admin/log.rs
index f962138..fc85b37 100644
--- a/server/src/routes/ui/admin/log.rs
+++ b/server/src/routes/ui/admin/log.rs
@@ -33,13 +33,15 @@ pub fn enable_logging() {
     log::set_max_level(log::LevelFilter::Debug);
 }
 
+type LogBuffer = VecDeque<Arc<LogLine>>;
+
 pub struct Log {
     inner: env_logger::Logger,
     stream: (
         broadcast::Sender<Arc<LogLine>>,
         broadcast::Sender<Arc<LogLine>>,
     ),
-    log: RwLock<(VecDeque<Arc<LogLine>>, VecDeque<Arc<LogLine>>)>,
+    log: RwLock<(LogBuffer, LogBuffer)>,
 }
 
 pub struct LogLine {
@@ -69,7 +71,6 @@ pub fn r_admin_log<'a>(_session: AdminSession, warnonly: bool) -> MyResult<DynLa
                 }}
             }
         },
-        ..Default::default()
     })
 }
 
diff --git a/server/src/routes/ui/node.rs b/server/src/routes/ui/node.rs
index 76ecd82..57e8562 100644
--- a/server/src/routes/ui/node.rs
+++ b/server/src/routes/ui/node.rs
@@ -41,7 +41,7 @@ use std::{cmp::Reverse, collections::BTreeMap, fmt::Write, sync::Arc};
 /// This function is a stub and only useful for use in the uri! macro.
 #[get("/n/<id>")]
 pub fn r_library_node(id: NodeID) {
-    id.0[0];
+    let _ = id;
 }
 
 #[get("/n/<id>?<parents>&<children>&<filter..>")]
@@ -129,7 +129,7 @@ pub fn get_similar_media(
     ranking
         .into_iter()
         .take(32)
-        .map(|(pid, _)| db.get_node_with_userdata(pid, &session))
+        .map(|(pid, _)| db.get_node_with_userdata(pid, session))
         .collect::<anyhow::Result<Vec<_>>>()
 }
 
diff --git a/server/src/routes/ui/player.rs b/server/src/routes/ui/player.rs
index ff404fa..5222573 100644
--- a/server/src/routes/ui/player.rs
+++ b/server/src/routes/ui/player.rs
@@ -143,7 +143,7 @@ pub fn player_conf<'a>(item: Arc<Node>, playing: bool) -> anyhow::Result<DynRend
         match &track.kind {
             SourceTrackKind::Audio { .. } => audio_tracks.push((tid, track)),
             SourceTrackKind::Video { .. } => video_tracks.push((tid, track)),
-            SourceTrackKind::Subtitles { .. } => sub_tracks.push((tid, track)),
+            SourceTrackKind::Subtitles => sub_tracks.push((tid, track)),
         }
     }
 
-- 
cgit v1.2.3-70-g09d2