From fb0fa1f351a7a8c366c0e14762e8dd348ea93609 Mon Sep 17 00:00:00 2001
From: JMARyA <jmarya@hydrar.de>
Date: Thu, 17 Apr 2025 08:56:00 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile            |  2 +-
 src/config.rs         | 16 +++++-----------
 src/lib.rs            |  4 ++--
 src/main.rs           |  2 +-
 src/pkg/mirror.rs     |  6 +++++-
 src/routes/push.rs    |  2 +-
 src/routes/ui/repo.rs |  2 +-
 7 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 69909f9..8beb37d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,4 @@ COPY --from=builder /app/target/release/pacco /usr/bin/pacco
 
 WORKDIR /
 
-CMD ["/usr/bin/pacco", "serve", "/config.toml"]
+CMD ["/usr/bin/pacco", "serve", "--config", "/config.toml"]
diff --git a/src/config.rs b/src/config.rs
index 43c2abe..55750d9 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,5 +1,5 @@
-use serde::Deserialize;
 use crate::Architecture;
+use serde::Deserialize;
 
 #[derive(Debug, Clone, Deserialize, Default)]
 pub struct Config {
@@ -15,21 +15,15 @@ pub struct MirrorConfig {
 #[derive(Debug, Clone, Deserialize, Default)]
 pub struct Mirrorlist {
     pub x86_64: Vec<String>,
-    pub aarch64: Vec<String>
+    pub aarch64: Vec<String>,
 }
 
 impl Mirrorlist {
     pub fn for_arch(&self, arch: Architecture) -> &[String] {
         match arch {
-            Architecture::x86_64 => {
-                &self.x86_64
-            },
-            Architecture::aarch64 => {
-                &self.aarch64
-            },
-            Architecture::any => {
-                &self.x86_64
-            },
+            Architecture::x86_64 => &self.x86_64,
+            Architecture::aarch64 => &self.aarch64,
+            Architecture::any => &self.x86_64,
         }
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index a2f1b6d..15b35df 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,3 +1,3 @@
-pub mod pkg;
 pub mod config;
-use pkg::arch::Architecture;
\ No newline at end of file
+pub mod pkg;
+use pkg::arch::Architecture;
diff --git a/src/main.rs b/src/main.rs
index ea73c2c..2dd137f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,7 +25,7 @@ async fn launch(config: String) {
     let pg = get_pg!();
     sqlx::migrate!("./migrations").run(pg).await.unwrap();
 
-    let config: Config =
+    let config: pacco::config::Config =
         toml::from_str(&std::fs::read_to_string(&config).unwrap_or_default()).unwrap_or_default();
 
     let _ = User::create("admin".to_string(), "admin", based::auth::UserRole::Admin).await;
diff --git a/src/pkg/mirror.rs b/src/pkg/mirror.rs
index 4c6ddbd..d17bd06 100644
--- a/src/pkg/mirror.rs
+++ b/src/pkg/mirror.rs
@@ -88,7 +88,11 @@ impl MirrorRepository {
     }
 
     /// Get the `.db.tar.gz.sig` content for the repository of `arch`
-    pub async fn sig_content(&self, arch: Architecture, mirrorlist: &Mirrorlist) -> Option<Vec<u8>> {
+    pub async fn sig_content(
+        &self,
+        arch: Architecture,
+        mirrorlist: &Mirrorlist,
+    ) -> Option<Vec<u8>> {
         self.download_file(
             &format!("{}.db.tar.gz.sig", self.inner.name),
             self.inner
diff --git a/src/routes/push.rs b/src/routes/push.rs
index ba2e4ca..08174da 100644
--- a/src/routes/push.rs
+++ b/src/routes/push.rs
@@ -13,7 +13,7 @@ use pacco::pkg::arch::Architecture;
 use rocket::form::Form;
 use rocket::fs::TempFile;
 
-use crate::config::Config;
+use pacco::config::Config;
 
 #[derive(FromForm)]
 pub struct PkgUpload<'r> {
diff --git a/src/routes/ui/repo.rs b/src/routes/ui/repo.rs
index 193e7c4..5e1a344 100644
--- a/src/routes/ui/repo.rs
+++ b/src/routes/ui/repo.rs
@@ -7,8 +7,8 @@ use rocket::{State, get};
 
 use pacco::pkg::{Repository, arch::Architecture};
 
-use crate::config::Config;
 use crate::routes::ui::arch_card;
+use pacco::config::Config;
 
 #[get("/<repo>?<arch>&<sort>")]
 pub async fn repo_ui(