From 32e27978ec2aa51d0f4feadedd404b22d3d4dcda Mon Sep 17 00:00:00 2001
From: Chewing_Bever <roosensjef@gmail.com>
Date: Mon, 27 May 2024 13:47:53 +0200
Subject: [PATCH] chore: bit of cleanup

---
 server/src/cli.rs           |  3 +--
 server/src/db/query/repo.rs |  5 ++++-
 server/src/main.rs          |  2 --
 server/src/repo/archive.rs  |  9 +--------
 server/src/repo/mod.rs      | 14 +-------------
 5 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/server/src/cli.rs b/server/src/cli.rs
index 2b85492..2d61ad4 100644
--- a/server/src/cli.rs
+++ b/server/src/cli.rs
@@ -1,4 +1,4 @@
-use crate::repo::{MetaRepoMgr, RepoGroupManager};
+use crate::repo::MetaRepoMgr;
 use crate::{Config, Global};
 
 use axum::extract::FromRef;
@@ -82,7 +82,6 @@ impl Cli {
 
         let config = Config {
             data_dir: self.data_dir.clone(),
-            api_key: self.api_key.clone(),
         };
         let repo_manager = MetaRepoMgr::new(&self.data_dir.join("repos"));
 
diff --git a/server/src/db/query/repo.rs b/server/src/db/query/repo.rs
index 399d227..dfc92ad 100644
--- a/server/src/db/query/repo.rs
+++ b/server/src/db/query/repo.rs
@@ -9,7 +9,10 @@ pub struct Filter {
 
 impl IntoCondition for Filter {
     fn into_condition(self) -> Condition {
-        Condition::all().add_option(self.name.map(|name| package::Column::Name.like(name)))
+        Condition::all().add_option(
+            self.name
+                .map(|name| repo::Column::Name.like(format!("%{}%", name))),
+        )
     }
 }
 
diff --git a/server/src/main.rs b/server/src/main.rs
index eea6dc3..32360e2 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -7,7 +7,6 @@ mod repo;
 use clap::Parser;
 pub use error::{Result, ServerError};
 use repo::MetaRepoMgr;
-use repo::RepoGroupManager;
 use std::path::PathBuf;
 use std::sync::Arc;
 use tokio::sync::RwLock;
@@ -15,7 +14,6 @@ use tokio::sync::RwLock;
 #[derive(Clone)]
 pub struct Config {
     data_dir: PathBuf,
-    api_key: String,
 }
 
 #[derive(Clone)]
diff --git a/server/src/repo/archive.rs b/server/src/repo/archive.rs
index 8f7fb49..bce0d1a 100644
--- a/server/src/repo/archive.rs
+++ b/server/src/repo/archive.rs
@@ -1,17 +1,10 @@
-use std::io::{self, Write};
+use std::io;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
-use tokio::sync::{mpsc, oneshot};
 
 use libarchive::write::{Builder, FileWriter, WriteEntry};
 use libarchive::{Entry, WriteFilter, WriteFormat};
 
-enum Message {
-    AppendFilesEntry(oneshot::Sender<io::Result<()>>, String),
-    AppendLine(oneshot::Sender<io::Result<()>>, String),
-    Close(oneshot::Sender<io::Result<()>>),
-}
-
 /// Struct to abstract away the intrinsics of writing entries to an archive file
 pub struct RepoArchiveWriter {
     ar: Arc<Mutex<FileWriter>>,
diff --git a/server/src/repo/mod.rs b/server/src/repo/mod.rs
index c535f0f..87cfda1 100644
--- a/server/src/repo/mod.rs
+++ b/server/src/repo/mod.rs
@@ -3,13 +3,9 @@ mod manager;
 mod manager_new;
 pub mod package;
 
-pub use manager::RepoGroupManager;
 pub use manager_new::MetaRepoMgr;
 use tokio_util::io::StreamReader;
 
-use std::path::PathBuf;
-
-use crate::db;
 use axum::body::Body;
 use axum::extract::{Path, State};
 use axum::http::Request;
@@ -18,17 +14,9 @@ use axum::response::IntoResponse;
 use axum::routing::{delete, post};
 use axum::Router;
 use futures::TryStreamExt;
-use futures::{Stream, StreamExt};
-use regex::Regex;
-use sea_orm::ModelTrait;
-use std::sync::Arc;
-use tokio::{fs, io::AsyncWriteExt};
 use tower::util::ServiceExt;
-use tower_http::services::{ServeDir, ServeFile};
+use tower_http::services::ServeFile;
 use tower_http::validate_request::ValidateRequestHeaderLayer;
-use uuid::Uuid;
-
-const DB_FILE_EXTS: [&str; 4] = [".db", ".files", ".db.tar.gz", ".files.tar.gz"];
 
 pub fn router(api_key: &str) -> Router<crate::Global> {
     Router::new()