From 97007a4d4f08595bededcb0106aa6b49d8a93b2c Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Mon, 12 Jun 2023 20:02:18 +0200
Subject: small cleanup

---
 server/src/database.rs         | 10 ++++++----
 server/src/library.rs          |  1 -
 server/src/routes/ui/player.rs | 12 ++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'server')

diff --git a/server/src/database.rs b/server/src/database.rs
index 00ce193..3773ad1 100644
--- a/server/src/database.rs
+++ b/server/src/database.rs
@@ -26,13 +26,15 @@ pub struct User {
 
 impl Database {
     pub fn open(path: &Path) -> Result<Self, anyhow::Error> {
-        info!("opening database… (takes O(n) time sadly)");
+        info!("opening database… (might take up to O(n) time)");
         let db = sled::open(path).context("opening database")?;
-        info!("ready");
-        Ok(Self {
+        info!("creating trees");
+        let r = Ok(Self {
             users: Tree::open(&db, "users"),
             invites: Tree::open(&db, "invites"),
             db,
-        })
+        });
+        info!("ready");
+        r
     }
 }
diff --git a/server/src/library.rs b/server/src/library.rs
index 6e6e13d..2b5cf9b 100644
--- a/server/src/library.rs
+++ b/server/src/library.rs
@@ -114,7 +114,6 @@ impl Node {
                 .read_dir()?
                 .filter_map(|e| {
                     let e = e.unwrap();
-                    eprintln!("{:?}", e.path());
                     if e.path().extension() == Some(&OsStr::from_bytes(b"jelly"))
                         || e.metadata().unwrap().is_dir()
                     {
diff --git a/server/src/routes/ui/player.rs b/server/src/routes/ui/player.rs
index a35a93f..2fa2dc5 100644
--- a/server/src/routes/ui/player.rs
+++ b/server/src/routes/ui/player.rs
@@ -39,12 +39,12 @@ pub fn r_player(
     conf: PlayerConfig,
 ) -> MyResult<DynLayoutPage<'_>> {
     let item = library.nested_path(&path)?.get_item()?;
-    let tracks = []
-    .into_iter()
-    .chain(conf.v.into_iter())
-    .chain(conf.a.into_iter())
-    .chain(conf.s.into_iter())
-    .collect::<Vec<_>>();
+    let tracks = None
+        .into_iter()
+        .chain(conf.v.into_iter())
+        .chain(conf.a.into_iter())
+        .chain(conf.s.into_iter())
+        .collect::<Vec<_>>();
 
     Ok(LayoutPage {
         title: item.info.title.to_owned(),
-- 
cgit v1.2.3-70-g09d2