clean main

2 files changed, 17 insertions, 14 deletions

diff --git a/server/src/database.rs b/server/src/database.rs
index ac20347..b6e9ab9 100644
--- a/server/src/database.rs
+++ b/server/src/database.rs
@@ -3,6 +3,7 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2023 metamuffin <metamuffin.org>
 */
+use crate::{routes::ui::account::hash_password, CONF};
 use anyhow::Context;
 use log::info;
 use serde::{Deserialize, Serialize};
@@ -36,4 +37,17 @@ impl Database {
         info!("ready");
         r
     }
+    pub fn create_admin(&self) {
+        self.users
+            .insert(
+                &CONF.admin_username,
+                &User {
+                    admin: true,
+                    display_name: "Admin".to_string(),
+                    name: CONF.admin_username.clone(),
+                    password: hash_password(&CONF.admin_username, &CONF.admin_password),
+                },
+            )
+            .unwrap();
+    }
 }
diff --git a/server/src/main.rs b/server/src/main.rs
index d8a7441..6d7f812 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -4,12 +4,12 @@
     Copyright (C) 2023 metamuffin <metamuffin.org>
 */
 use config::{load_global_config, GlobalConfig};
-use database::{Database, User};
+use database::Database;
 use jellyremuxer::RemuxerContext;
 use library::Library;
 use once_cell::sync::Lazy;
 use rocket::launch;
-use routes::{build_rocket, ui::account::hash_password};
+use routes::build_rocket;
 
 pub mod config;
 pub mod database;
@@ -31,17 +31,6 @@ fn rocket() -> _ {
     let remuxer = RemuxerContext::new();
     let library = Library::open(&CONF.library_path).unwrap();
     let database = Database::open(&CONF.database_path).unwrap();
-    database
-        .users
-        .insert(
-            &CONF.admin_username,
-            &User {
-                admin: true,
-                display_name: "Admin".to_string(),
-                name: CONF.admin_username.clone(),
-                password: hash_password(&CONF.admin_username, &CONF.admin_password),
-            },
-        )
-        .unwrap();
+    database.create_admin();
     build_rocket(remuxer, library, database)
 }