Merge pull request #188 from zjean/fix/ci-clippy-fmt

fix: resolve clippy and rustfmt CI failures

Author: DioCrafts

Cargo.lock

@@ -109,7 +109,7 @@ fn process_release(manifest_dir: &Path, static_dir: &Path, out_dir: &Path) {
     fs::write(dist_dir.join("css").join(&css_name), &css_bundle).expect("write css bundle");
 
     // ── 4. Minify ALL individual CSS in static-dist/ ─────────────────────────
-    minify_tree_css(&dist_dir.join("css"), &css_name);
+    minify_tree_css(&dist_dir.join("css"));
 
     // ── 5. Build JS bundle for index.html ────────────────────────────────────
     let index_html = fs::read_to_string(static_dir.join("index.html")).expect("read index.html");
@@ -120,11 +120,11 @@ fn process_release(manifest_dir: &Path, static_dir: &Path, out_dir: &Path) {
     fs::write(dist_dir.join("js").join(&js_name), &js_bundle).expect("write js bundle");
 
     // ── 6. Minify ALL individual JS in static-dist/ ──────────────────────────
-    minify_tree_js(&dist_dir.join("js"), &js_name);
+    minify_tree_js(&dist_dir.join("js"));
 
     // ── 7. Inline theme-init.js  &  rewrite index.html ──────────────────────
-    let theme_init = fs::read_to_string(static_dir.join("js/core/theme-init.js"))
-        .unwrap_or_default();
+    let theme_init =
+        fs::read_to_string(static_dir.join("js/core/theme-init.js")).unwrap_or_default();
     let theme_init_min = js_minify_safe(&theme_init);
     let rewritten_index = rewrite_index_html(
         &index_html,
@@ -153,9 +153,7 @@ fn process_release(manifest_dir: &Path, static_dir: &Path, out_dir: &Path) {
     // index.html too (future use / embedded route)
     fs::write(out_dir.join("index.html"), &rewritten_index).expect("write out index.html");
 
-    eprintln!(
-        "cargo:warning=OxiCloud static-dist built ✓  CSS: {css_name}  JS: {js_name}"
-    );
+    eprintln!("cargo:warning=OxiCloud static-dist built ✓  CSS: {css_name}  JS: {js_name}");
 }
 
 // ═══════════════════════════════════════════════════════════════════════════════
@@ -206,8 +204,8 @@ fn css_minify_safe(source: &str) -> String {
 fn css_minify(source: &str) -> Result<String, String> {
     use lightningcss::stylesheet::{ParserOptions, PrinterOptions, StyleSheet};
 
-    let mut sheet = StyleSheet::parse(source, ParserOptions::default())
-        .map_err(|e| format!("{e}"))?;
+    let mut sheet =
+        StyleSheet::parse(source, ParserOptions::default()).map_err(|e| format!("{e}"))?;
 
     sheet
         .minify(Default::default())
@@ -224,12 +222,14 @@ fn css_minify(source: &str) -> Result<String, String> {
 }
 
 /// Walk a directory and minify every `.css` in-place (skips generated bundles).
-fn minify_tree_css(dir: &Path, skip_prefix: &str) {
-    let Ok(entries) = fs::read_dir(dir) else { return };
+fn minify_tree_css(dir: &Path) {
+    let Ok(entries) = fs::read_dir(dir) else {
+        return;
+    };
     for entry in entries.flatten() {
         let p = entry.path();
         if p.is_dir() {
-            minify_tree_css(&p, skip_prefix);
+            minify_tree_css(&p);
         } else if p.extension().is_some_and(|e| e == "css") {
             let fname = p.file_name().unwrap().to_string_lossy();
             // Skip the generated bundle and already-processed main.css
@@ -336,12 +336,14 @@ fn js_minify(source: &str) -> Result<String, String> {
 }
 
 /// Walk a directory and minify every `.js` in-place (skips generated bundles).
-fn minify_tree_js(dir: &Path, skip_prefix: &str) {
-    let Ok(entries) = fs::read_dir(dir) else { return };
+fn minify_tree_js(dir: &Path) {
+    let Ok(entries) = fs::read_dir(dir) else {
+        return;
+    };
     for entry in entries.flatten() {
         let p = entry.path();
         if p.is_dir() {
-            minify_tree_js(&p, skip_prefix);
+            minify_tree_js(&p);
         } else if p.extension().is_some_and(|e| e == "js") {
             let fname = p.file_name().unwrap().to_string_lossy();
             if fname.starts_with("app.") {
@@ -359,13 +361,15 @@ fn minify_tree_js(dir: &Path, skip_prefix: &str) {
 // ═══════════════════════════════════════════════════════════════════════════════
 
 fn minify_tree_json(dir: &Path) {
-    let Ok(entries) = fs::read_dir(dir) else { return };
+    let Ok(entries) = fs::read_dir(dir) else {
+        return;
+    };
     for entry in entries.flatten() {
         let p = entry.path();
-        if p.extension().is_some_and(|e| e == "json") {
-            if let Ok(src) = fs::read_to_string(&p) {
-                let _ = fs::write(&p, json_minify(&src));
-            }
+        if p.extension().is_some_and(|e| e == "json")
+            && let Ok(src) = fs::read_to_string(&p)
+        {
+            let _ = fs::write(&p, json_minify(&src));
         }
     }
 }
@@ -407,12 +411,7 @@ fn json_minify(source: &str) -> String {
 // ═══════════════════════════════════════════════════════════════════════════════
 
 /// Rewrite index.html: single CSS bundle, inline theme-init, single JS bundle.
-fn rewrite_index_html(
-    html: &str,
-    css_path: &str,
-    js_path: &str,
-    inline_theme_js: &str,
-) -> String {
+fn rewrite_index_html(html: &str, css_path: &str, js_path: &str, inline_theme_js: &str) -> String {
     let mut out: Vec<String> = Vec::with_capacity(html.lines().count());
     let mut css_done = false;
     let mut defer_done = false;
@@ -423,29 +422,22 @@ fn rewrite_index_html(
         // ── Replace all stylesheet <link>s with single bundle ────────────────
         if t.starts_with("<link") && t.contains("stylesheet") && t.contains("href=\"/css/") {
             if !css_done {
-                out.push(format!(
-                    "    <link rel=\"stylesheet\" href=\"{css_path}\">"
-                ));
+                out.push(format!("    <link rel=\"stylesheet\" href=\"{css_path}\">"));
                 css_done = true;
             }
             continue;
         }
 
         // ── Replace sync theme-init.js with inline <script> ─────────────────
-        if t.starts_with("<script")
-            && !t.contains("defer")
-            && t.contains("theme-init")
-        {
+        if t.starts_with("<script") && !t.contains("defer") && t.contains("theme-init") {
             out.push(format!("    <script>{inline_theme_js}</script>"));
             continue;
         }
 
         // ── Replace all defer <script>s with single bundle ──────────────────
         if t.starts_with("<script") && t.contains("defer") && t.contains("src=\"") {
             if !defer_done {
-                out.push(format!(
-                    "    <script defer src=\"{js_path}\"></script>"
-                ));
+                out.push(format!("    <script defer src=\"{js_path}\"></script>"));
                 defer_done = true;
             }
             continue;

build.rs

@@ -89,11 +89,7 @@ pub trait ThumbnailPort: Send + Sync + 'static {
     /// Returns `None` if no cached thumbnail exists on disk or in memory.
     /// Used for non-image file types (videos) where thumbnails are
     /// generated client-side and uploaded.
-    async fn get_cached_thumbnail(
-        &self,
-        file_id: &str,
-        size: ThumbnailSize,
-    ) -> Option<Bytes>;
+    async fn get_cached_thumbnail(&self, file_id: &str, size: ThumbnailSize) -> Option<Bytes>;
 
     /// Store an externally-generated thumbnail (e.g. client-side video frame).
     ///

src/application/ports/thumbnail_ports.rs

@@ -17,11 +17,11 @@ use crate::infrastructure::services::jwt_service::JwtTokenService;
 use crate::infrastructure::services::oidc_service::OidcService;
 use crate::infrastructure::services::password_hasher::Argon2PasswordHasher;
 use moka::sync::Cache;
-use uuid::Uuid;
 use std::path::PathBuf;
 use std::sync::Arc;
 use std::sync::RwLock;
 use std::time::Duration;
+use uuid::Uuid;
 
 /// Result of a successful OIDC callback. The handler layer inspects this to
 /// decide whether to redirect to the regular frontend or complete a Nextcloud

src/application/services/auth_application_service.rs

@@ -448,11 +448,9 @@ impl BatchOperationService {
             },
         };
 
-        let uid = user_id;
-
         let mut operation_stream = stream::iter(file_ids.into_iter().map(|file_id| {
             let trash = trash_service.clone();
-            let uid = uid;
+            let uid = user_id;
 
             async move {
                 let trash_result = trash.move_to_trash(&file_id, "file", uid).await;
@@ -513,11 +511,9 @@ impl BatchOperationService {
             },
         };
 
-        let uid = user_id;
-
         let mut operation_stream = stream::iter(folder_ids.into_iter().map(|folder_id| {
             let trash = trash_service.clone();
-            let uid = uid;
+            let uid = user_id;
 
             async move {
                 let trash_result = trash.move_to_trash(&folder_id, "folder", uid).await;

src/application/services/batch_operations.rs

@@ -1,6 +1,6 @@
 use chrono::Utc;
-use uuid::Uuid;
 use std::sync::Arc;
+use uuid::Uuid;
 
 use crate::application::dtos::address_book_dto::{
     AddressBookDto, CreateAddressBookDto, ShareAddressBookDto, UnshareAddressBookDto,
@@ -296,8 +296,11 @@ impl AddressBookUseCase for ContactService {
 
         // Check if user has write access to the address book
         let address_book = self
-            .check_address_book_write_access(&id, &Uuid::parse_str(&update.user_id)
-                .map_err(|_| DomainError::validation_error("Invalid user ID format"))?)
+            .check_address_book_write_access(
+                &id,
+                &Uuid::parse_str(&update.user_id)
+                    .map_err(|_| DomainError::validation_error("Invalid user ID format"))?,
+            )
             .await?;
 
         // Apply updates
@@ -526,9 +529,12 @@ impl ContactUseCase for ContactService {
             .map_err(|_| DomainError::validation_error("Invalid address book ID format"))?;
 
         // Check if user has write access to the address book
-        self.check_address_book_write_access(&address_book_id, &Uuid::parse_str(&dto.user_id)
-            .map_err(|_| DomainError::validation_error("Invalid user ID format"))?)
-            .await?;
+        self.check_address_book_write_access(
+            &address_book_id,
+            &Uuid::parse_str(&dto.user_id)
+                .map_err(|_| DomainError::validation_error("Invalid user ID format"))?,
+        )
+        .await?;
 
         // Convert DTOs to domain entities
         let email: Vec<Email> = dto
@@ -604,9 +610,12 @@ impl ContactUseCase for ContactService {
             .map_err(|_| DomainError::validation_error("Invalid address book ID format"))?;
 
         // Check if user has write access to the address book
-        self.check_address_book_write_access(&address_book_id, &Uuid::parse_str(&dto.user_id)
-            .map_err(|_| DomainError::validation_error("Invalid user ID format"))?)
-            .await?;
+        self.check_address_book_write_access(
+            &address_book_id,
+            &Uuid::parse_str(&dto.user_id)
+                .map_err(|_| DomainError::validation_error("Invalid user ID format"))?,
+        )
+        .await?;
 
         // Parse vCard data
         let mut contact = self.parse_vcard(&dto.vcard)?;
@@ -819,9 +828,12 @@ impl ContactUseCase for ContactService {
             .map_err(|_| DomainError::validation_error("Invalid address book ID format"))?;
 
         // Check if user has write access to the address book
-        self.check_address_book_write_access(&address_book_id, &Uuid::parse_str(&dto.user_id)
-            .map_err(|_| DomainError::validation_error("Invalid user ID format"))?)
-            .await?;
+        self.check_address_book_write_access(
+            &address_book_id,
+            &Uuid::parse_str(&dto.user_id)
+                .map_err(|_| DomainError::validation_error("Invalid user ID format"))?,
+        )
+        .await?;
 
         let group = ContactGroup::new(address_book_id, dto.name);
 
@@ -845,9 +857,12 @@ impl ContactUseCase for ContactService {
             .ok_or_else(|| DomainError::not_found("Contact group", "not found"))?;
 
         // Check if user has write access to the address book
-        self.check_address_book_write_access(group.address_book_id(), &Uuid::parse_str(&update.user_id)
-            .map_err(|_| DomainError::validation_error("Invalid user ID format"))?)
-            .await?;
+        self.check_address_book_write_access(
+            group.address_book_id(),
+            &Uuid::parse_str(&update.user_id)
+                .map_err(|_| DomainError::validation_error("Invalid user ID format"))?,
+        )
+        .await?;
 
         // Update the group
         let updated_group = ContactGroup::from_raw(

src/application/services/contact_service.rs

@@ -178,10 +178,10 @@ impl FileManagementUseCase for FileManagementService {
     async fn delete_file(&self, id: &str) -> Result<(), DomainError> {
         self.file_repository.delete_file(id).await?;
         // Best-effort thumbnail cleanup
-        if let Some(thumb) = &self.thumbnail_service {
-            if let Err(e) = thumb.delete_thumbnails(id).await {
-                warn!("Failed to delete thumbnails for file {}: {}", id, e);
-            }
+        if let Some(thumb) = &self.thumbnail_service
+            && let Err(e) = thumb.delete_thumbnails(id).await
+        {
+            warn!("Failed to delete thumbnails for file {}: {}", id, e);
         }
         Ok(())
     }
@@ -223,10 +223,10 @@ impl FileManagementUseCase for FileManagementService {
         warn!("Permanently deleting file: {}", id);
         self.file_repository.delete_file(id).await?;
         // Best-effort thumbnail cleanup
-        if let Some(thumb) = &self.thumbnail_service {
-            if let Err(e) = thumb.delete_thumbnails(id).await {
-                warn!("Failed to delete thumbnails for file {}: {}", id, e);
-            }
+        if let Some(thumb) = &self.thumbnail_service
+            && let Err(e) = thumb.delete_thumbnails(id).await
+        {
+            warn!("Failed to delete thumbnails for file {}: {}", id, e);
         }
         info!("File permanently deleted: {}", id);