cleanup

7 files changed, 53 insertions, 52 deletions

diff --git a/remuxer/src/lib.rs b/remuxer/src/lib.rs
index d91bfe5..91c913a 100644
--- a/remuxer/src/lib.rs
+++ b/remuxer/src/lib.rs
@@ -186,17 +186,20 @@ impl RemuxerContext {
                 "writing cluster {cluster_index} with {} blocks",
                 cluster.len()
             );
-            for (block_index, block) in cluster {
+            for (block_index, iblock) in cluster {
                 let kn = &mut ks[block_index];
-                let mut next = kn.peek.replace(kn.stream.next()?).unwrap(); //.ok_or(anyhow!("eof?"));
+                let mut block = kn
+                    .peek
+                    .replace(kn.stream.next()?)
+                    .expect("source file too short");
 
-                assert_eq!(block.size, next.block.data.len(), "the seek index is wrong");
-                assert_eq!(block.pts, next.pts(), "the seek index is wrong");
+                assert_eq!(iblock.size, block.block.data.len(), "seek index is wrong");
+                assert_eq!(iblock.pts, block.pts(), "seek index is wrong");
 
-                let pts = next.pts();
-                next.block.track = kn.mapped;
-                next.block.timestamp_off = 0;
-                let buf = next.block.dump();
+                let pts = block.pts();
+                block.block.track = kn.mapped;
+                block.block.timestamp_off = 0;
+                let buf = block.block.dump();
                 output.write_tag(&MatroskaTag::Cluster(Master::Collected(vec![
                     MatroskaTag::Timestamp(pts),
                     MatroskaTag::SimpleBlock(buf),
diff --git a/server/src/routes/stream.rs b/server/src/routes/stream.rs
index 9d90eea..eb7bc13 100644
--- a/server/src/routes/stream.rs
+++ b/server/src/routes/stream.rs
@@ -5,21 +5,20 @@
 */
 use super::ui::error::MyError;
 use crate::library::Library;
-use anyhow::Result;
-use anyhow::{anyhow, Context};
+use anyhow::{anyhow, Context, Result};
 use jellyremuxer::RemuxerContext;
-use log::warn;
-use log::{debug, info};
-use rocket::http::{Header, Status};
-use rocket::request::{self, FromRequest};
-use rocket::response;
-use rocket::response::Responder;
-use rocket::Request;
-use rocket::Response;
-use rocket::{get, http::ContentType, State};
-use std::ops::Deref;
-use std::ops::Range;
-use std::path::PathBuf;
+use log::{debug, info, warn};
+use rocket::{
+    get,
+    http::{ContentType, Header, Status},
+    request::{self, FromRequest},
+    response::{self, Responder},
+    Request, Response, State,
+};
+use std::{
+    ops::{Deref, Range},
+    path::PathBuf,
+};
 use tokio::io::{duplex, DuplexStream};
 use tokio_util::io::SyncIoBridge;
 
diff --git a/server/src/routes/ui/account/mod.rs b/server/src/routes/ui/account/mod.rs
index 2c27f0c..e7031ff 100644
--- a/server/src/routes/ui/account/mod.rs
+++ b/server/src/routes/ui/account/mod.rs
@@ -6,21 +6,22 @@
 pub mod admin;
 pub mod session;
 
-use super::error::MyError;
-use super::layout::LayoutPage;
-use crate::database::Database;
-use crate::database::User;
-use crate::routes::ui::error::MyResult;
-use crate::routes::ui::home::rocket_uri_macro_r_home;
-use crate::routes::ui::layout::DynLayoutPage;
-use crate::CONF;
+use super::{error::MyError, layout::LayoutPage};
+use crate::{
+    database::{Database, User},
+    routes::ui::{error::MyResult, home::rocket_uri_macro_r_home, layout::DynLayoutPage},
+    CONF,
+};
 use anyhow::anyhow;
 use argon2::{Argon2, PasswordHasher};
-use rocket::form::Contextual;
-use rocket::form::Form;
-use rocket::http::{Cookie, CookieJar};
-use rocket::response::Redirect;
-use rocket::{get, post, uri, FromForm, State};
+use rocket::{
+    form::{Contextual, Form},
+    get,
+    http::{Cookie, CookieJar},
+    post,
+    response::Redirect,
+    uri, FromForm, State,
+};
 
 #[derive(FromForm)]
 pub struct RegisterForm {
@@ -74,7 +75,7 @@ pub fn r_account_login() -> DynLayoutPage<'static> {
                 input[type="text", id="inp-username", name="username"]; br;
                 label[for="inp-password"] { "Password: " }
                 input[type="password", id="inp-password", name="password"]; br;
-                
+
                 input[type="submit", value="Login"];
 
                 p { "While logged in, a cookie will be used to identify you." }
diff --git a/server/src/routes/ui/error.rs b/server/src/routes/ui/error.rs
index 1c5b00c..59e322a 100644
--- a/server/src/routes/ui/error.rs
+++ b/server/src/routes/ui/error.rs
@@ -3,13 +3,11 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2023 metamuffin <metamuffin.org>
 */
-use super::layout::DynLayoutPage;
-use super::layout::LayoutPage;
-use crate::routes::ui::account::rocket_uri_macro_r_account_login;
-use rocket::http::Status;
-use rocket::uri;
+use super::layout::{DynLayoutPage, LayoutPage};
+use crate::{routes::ui::account::rocket_uri_macro_r_account_login, uri};
 use rocket::{
     catch,
+    http::Status,
     response::{self, Responder},
     Request,
 };
@@ -23,7 +21,7 @@ pub fn r_catch<'a>(status: Status, _request: &Request) -> DynLayoutPage<'a> {
             h2 { "Error" }
             p { @format!("{status}") }
             @if status == Status::NotFound {
-                p { "You might need to " a[href=&uri!(r_account_login()).to_string()] { "log in" } ", to see this page" }
+                p { "You might need to " a[href=uri!(r_account_login())] { "log in" } ", to see this page" }
             }
         },
     }
diff --git a/server/src/routes/ui/home.rs b/server/src/routes/ui/home.rs
index bbf3f70..a8d9c65 100644
--- a/server/src/routes/ui/home.rs
+++ b/server/src/routes/ui/home.rs
@@ -3,12 +3,12 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2023 metamuffin <metamuffin.org>
 */
-use super::account::session::Session;
-use super::layout::LayoutPage;
-use crate::routes::ui::error::MyResult;
-use crate::routes::ui::layout::DynLayoutPage;
-use crate::CONF;
-use crate::{library::Library, routes::ui::node::NodePage};
+use super::{account::session::Session, layout::LayoutPage};
+use crate::{
+    library::Library,
+    routes::ui::{error::MyResult, layout::DynLayoutPage, node::NodePage},
+    CONF,
+};
 use rocket::{get, State};
 use tokio::fs::read_to_string;
 
diff --git a/server/src/routes/ui/node.rs b/server/src/routes/ui/node.rs
index 8e6bf7a..f216df2 100644
--- a/server/src/routes/ui/node.rs
+++ b/server/src/routes/ui/node.rs
@@ -62,13 +62,13 @@ markup::define! {
     ItemCard(item: Arc<Item>) {
         div.card.item {
             div.banner {
-                a[href=&uri!(r_library_node(&item.lib_path)).to_string()] {
+                a[href=uri!(r_library_node(&item.lib_path)).to_string()] {
                     img[src=uri!(r_item_assets(&item.lib_path)).to_string()];
                 }
                 div.hover { a[href=&player_uri(&item.lib_path)] { "▶" } }
             }
             p.title {
-                a[href=&uri!(r_library_node(&item.lib_path)).to_string()] {
+                a[href=uri!(r_library_node(&item.lib_path)).to_string()] {
                     @item.info.title
                 }
             }
diff --git a/server/src/routes/ui/player.rs b/server/src/routes/ui/player.rs
index ed7e4f7..0fc0364 100644
--- a/server/src/routes/ui/player.rs
+++ b/server/src/routes/ui/player.rs
@@ -39,10 +39,10 @@ pub fn r_player(
         return player_conf(item.clone());
     }
 
-    let tracks = conf
-        .a
+    let tracks = []
         .into_iter()
         .chain(conf.v.into_iter())
+        .chain(conf.a.into_iter())
         .chain(conf.s.into_iter())
         .collect::<Vec<_>>();