diff --git a/src/application/adapters/webdav_adapter.rs b/src/application/adapters/webdav_adapter.rs index f50dd21c..da4f1ccb 100644 --- a/src/application/adapters/webdav_adapter.rs +++ b/src/application/adapters/webdav_adapter.rs @@ -752,10 +752,8 @@ impl WebDavAdapter { _ => (), } } - Ok(Event::Text(e)) => { - if current_prop.is_some() { - current_text.push_str(&e.decode().unwrap_or_default()); - } + Ok(Event::Text(e)) if current_prop.is_some() => { + current_text.push_str(&e.decode().unwrap_or_default()); } Ok(Event::End(ref e)) => { let name = e.name(); @@ -961,10 +959,8 @@ impl WebDavAdapter { _ => (), } } - Ok(Event::Text(e)) => { - if in_owner { - owner_text.push_str(&e.decode().unwrap_or_default()); - } + Ok(Event::Text(e)) if in_owner => { + owner_text.push_str(&e.decode().unwrap_or_default()); } Ok(Event::End(ref e)) => { let name = e.name(); diff --git a/src/application/services/search_service.rs b/src/application/services/search_service.rs index c535226e..1adaff83 100644 --- a/src/application/services/search_service.rs +++ b/src/application/services/search_service.rs @@ -253,7 +253,7 @@ impl SearchService { } // Merge files + folders by relevance and truncate to the final limit - suggestions.sort_by(|a, b| b.relevance_score.cmp(&a.relevance_score)); + suggestions.sort_by_key(|f| Reverse(f.relevance_score)); suggestions.truncate(limit); let elapsed = start.elapsed().as_millis() as u64; @@ -346,13 +346,13 @@ impl SearchUseCase for SearchService { enriched_folders.sort_by_cached_key(|f| Reverse(f.name.to_lowercase())); } "date" => { - enriched_folders.sort_by(|a, b| a.modified_at.cmp(&b.modified_at)); + enriched_folders.sort_by_key(|f| f.modified_at); } "date_desc" => { - enriched_folders.sort_by(|a, b| b.modified_at.cmp(&a.modified_at)); + enriched_folders.sort_by_key(|f| Reverse(f.modified_at)); } _ => { - enriched_folders.sort_by(|a, b| b.relevance_score.cmp(&a.relevance_score)); + enriched_folders.sort_by_key(|f| Reverse(f.relevance_score)); } } @@ -432,13 +432,13 @@ impl SearchUseCase for SearchService { enriched_folders.sort_by_cached_key(|f| Reverse(f.name.to_lowercase())); } "date" => { - enriched_folders.sort_by(|a, b| a.modified_at.cmp(&b.modified_at)); + enriched_folders.sort_by_key(|f| f.modified_at); } "date_desc" => { - enriched_folders.sort_by(|a, b| b.modified_at.cmp(&a.modified_at)); + enriched_folders.sort_by_key(|f| Reverse(f.modified_at)); } _ => { - enriched_folders.sort_by(|a, b| b.relevance_score.cmp(&a.relevance_score)); + enriched_folders.sort_by_key(|f| Reverse(f.relevance_score)); } } diff --git a/src/interfaces/api/handlers/carddav_handler.rs b/src/interfaces/api/handlers/carddav_handler.rs index d4a29f70..3524605a 100644 --- a/src/interfaces/api/handlers/carddav_handler.rs +++ b/src/interfaces/api/handlers/carddav_handler.rs @@ -150,7 +150,6 @@ fn strip_username_prefix(path: &str) -> &str { } } - // ─── Helper: extract user from request ─────────────────────────────── fn extract_user(req: &Request) -> Result { diff --git a/src/interfaces/nextcloud/webdav_handler.rs b/src/interfaces/nextcloud/webdav_handler.rs index c78e9b52..a383ad05 100644 --- a/src/interfaces/nextcloud/webdav_handler.rs +++ b/src/interfaces/nextcloud/webdav_handler.rs @@ -495,10 +495,8 @@ fn parse_proppatch_favorite(body: &str) -> Option { let text = e.decode().ok()?; return text.trim().parse::().ok(); } - Ok(Event::End(ref e)) => { - if e.local_name().as_ref() == b"favorite" { - inside_favorite = false; - } + Ok(Event::End(ref e)) if e.local_name().as_ref() == b"favorite" => { + inside_favorite = false; } Ok(Event::Eof) => break, Err(_) => break,