chore: update tests and satisfy lints

Author: DefinitelyNotSimon13

episko_derive/src/lib.rs

@@ -122,6 +122,7 @@ impl DbObjectMeta {
     }
 
     /// Generates the necessary `impl` block for the target struct.
+    #[allow(clippy::too_many_lines)]
     fn generate_impl(&self) -> TokenStream {
         let (impl_generics, type_generics, where_clause) = self.generics.split_for_impl();
         let ident = &self.ident;

episko_gui_backend/src/model/dto.rs

@@ -42,20 +42,20 @@ impl From<Metadata> for MetadataDto {
     }
 }
 
-impl Into<Metadata> for MetadataDto {
-    fn into(self) -> Metadata {
+impl From<MetadataDto> for Metadata {
+    fn from(val: MetadataDto) -> Self {
         Metadata {
-            id: self.id,
-            directory: self.directory,
-            title: self.title,
-            description: self.description,
-            categories: self.categories,
-            languages: self.languages,
-            build_systems: self.build_systems,
-            preferred_ide: self.preferred_ide,
-            repository_url: self.repository_url,
-            created: self.created,
-            updated: self.updated,
+            id: val.id,
+            directory: val.directory,
+            title: val.title,
+            description: val.description,
+            categories: val.categories,
+            languages: val.languages,
+            build_systems: val.build_systems,
+            preferred_ide: val.preferred_ide,
+            repository_url: val.repository_url,
+            created: val.created,
+            updated: val.updated,
         }
     }
 }

episko_lib/src/bin/main.rs

@@ -2,92 +2,5 @@ use std::error::Error;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
-    todo!();
-    //let connection_str = String::from_str("sqlite://episko.db")?;
-
-    // let ch = ConfigHandler::new()?;
-    //
-    // let mut config = ch.load_config()?;
-    // let db = DatabaseHandler::with_config(&config).await?;
-
-    //let mut metadata_handler = MetadataHandler::new();
-
-    //let dir = PathBuf::from("/home/simon/2_Uni");
-
-    // let locations = MetadataHandler::search_directory(&dir)?;
-    // println!("Found manifest at: ");
-    // for manifest in locations.iter() {
-    //     println!("\t{}", manifest.display());
-    // }
-    // println!("Total of {} manifests found.", locations.len());
-    //
-    // metadata_handler.load_from_config(&config)?;
-    //
-    // println!(
-    //     "Loaded {} manifests from config!",
-    //     metadata_handler.loaded_metadata.len(),
-    // );
-    //
-    // ch.save_config(&config)?;
-
-    // let db = DatabaseHandler::new(&connection_str).await?;
-
-    // println!("Connecting..");
-    // let conn = SqlitePoolOptions::new()
-    //     .max_connections(1)
-    //     .connect(&connection_str)
-    //     .await?;
-
-    /*let categories = vec![Category::new("Cool"), Category::new("University")];
-    let languages = vec![
-        Language::with_version("Rust", "1.84"),
-        Language::new("Typescript"),
-    ];
-    let build_systems = vec![
-        BuildSystem::with_version("Cargo", "1.83"),
-        BuildSystem::with_version("Bun", "1.1.43"),
-    ];
-    let ide = Ide::new("neovim");
-    let id = Uuid::from_str("c4aec118-dc18-46e8-9a2f-3dfbc2b5da40")?;
-    let metadata = Metadata::builder()
-        .id(id)
-        .title("Hello, World!")
-        .directory("./")
-        .languages(languages)
-        .categories(categories)
-        .build_systems(build_systems)
-        .preffered_ide(ide)
-        .description("SoftwareEngineering Project")
-        .build()?;
-
-    let equal = metadata.validate_db(&db).await?;
-    println!("Database is up to date: {}", equal);
-    println!("Updating...");
-    metadata.update_in_db(&db).await?;
-    let equal = metadata.validate_db(&db).await?;
-    println!("Database is up to date: {}", equal);*/
-    // metadata.write_to_db(&db).await?;
-
-    // let metadata3 = Metadata::from_file(Path::new("./manifest1.toml"))?;
-    // println!("Read metadata from file: {:#?}", metadata3);
-    //
-    // let id = metadata.id();
-    //
-    // let hash1 = metadata.get_hash()?;
-    // println!("Written metadata with hash: {:#?}", hash1);
-    //
-    // println!("Retrieving from db...");
-    //
-    // let metadata2 = Metadata::from_db(&db, id).await?;
-    // let hash2 = metadata2.get_hash()?;
-    // metadata2.write_file(Path::new("./manifest2.toml"))?;
-    //
-    // println!("Received metadata with hash: {:#?}", hash2);
-    //
-    // println!("Hashes are equal: {}", hash1 == hash2);
-    //
-
-    // println!("{:?}", StatisticHandler::generate_statistics(&db).await?);
-
-    Ok(())
+    unimplemented!()
 }

episko_lib/src/database.rs

@@ -54,6 +54,8 @@ pub struct Filter {
 }
 
 impl Filter {
+    /// !TODO!
+    #[must_use]
     pub fn with_query(query: &str) -> Self {
         Self {
             query: Some(query.to_string()),
@@ -102,8 +104,8 @@ pub mod db_test {
 
     use super::*;
     use crate::{
-        metadata::{property::Property as _, Metadata, *},
         ApplyIf as _,
+        metadata::{Metadata, property::Property as _, *},
     };
     use chrono::{TimeDelta, Utc};
 
@@ -175,7 +177,7 @@ pub mod db_test {
 mod test {
     use sqlx::SqlitePool;
 
-    use crate::database::{db_test::fill_db, DatabaseHandler};
+    use crate::database::{DatabaseHandler, db_test::fill_db};
 
     #[sqlx::test]
     async fn setup_test_db(conn: SqlitePool) {

episko_lib/src/database/retrieve_metadata.rs

@@ -1,6 +1,6 @@
 use super::{
-    dao::{ConversionError, MetadataDao, MetadataPreviewDao},
     DatabaseHandler, Filter, Result,
+    dao::{ConversionError, MetadataDao, MetadataPreviewDao},
 };
 use crate::metadata::{Metadata, MetadataPreview};
 use sqlx::{QueryBuilder, Row};
@@ -167,16 +167,16 @@ fn build_query(filter: QueryFilter, pagination: Option<&Pagination>) -> String {
         QueryFilter::Complex(filter) => {
             let mut sep = " WHERE";
             if filter.query.is_some() {
-                query.push_str(&format!("{} metadata.title LIKE ?", sep));
+                query.push_str(&format!("{sep} metadata.title LIKE ?"));
                 sep = " AND";
             }
 
             if filter.category.is_some() {
-                query.push_str(&format!("{} category.name LIKE ?", sep));
+                query.push_str(&format!("{sep} category.name LIKE ?"));
                 sep = " AND";
             }
             if filter.language.is_some() {
-                query.push_str(&format!("{} language.name LIKE ?", sep));
+                query.push_str(&format!("{sep} language.name LIKE ?"));
             }
         }
         QueryFilter::None => {}