cjw/Oxicloud
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: resolve clippy warnings (collapsible_if, manual_clamp)

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Jared Wolff
2026-03-05 17:39:34 -05:00
parent 6a84a5c44e
commit c53a0602ec
3 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/infrastructure/services/exif_service.rs
+18 -20
View File
@@ -49,10 +49,10 @@ impl ExifService {
meta.captured_at = parse_exif_datetime(&field.display_value().to_string());
}
// Fallback to DateTimeDigitized if DateTimeOriginal is missing
if meta.captured_at.is_none() {
if let Some(field) = exif.get_field(Tag::DateTimeDigitized, In::PRIMARY) {
meta.captured_at = parse_exif_datetime(&field.display_value().to_string());
}
if meta.captured_at.is_none()
&& let Some(field) = exif.get_field(Tag::DateTimeDigitized, In::PRIMARY)
{
meta.captured_at = parse_exif_datetime(&field.display_value().to_string());
}
// ── GPS coordinates ──
@@ -84,14 +84,12 @@ impl ExifService {
}
// ── Orientation ──
if let Some(field) = exif.get_field(Tag::Orientation, In::PRIMARY) {
if let exif::Value::Short(ref v) = field.value {
if let Some(&o) = v.first() {
if (1..=8).contains(&o) {
meta.orientation = Some(o);
}
}
}
if let Some(field) = exif.get_field(Tag::Orientation, In::PRIMARY)
&& let exif::Value::Short(ref v) = field.value
&& let Some(&o) = v.first()
&& (1..=8).contains(&o)
{
meta.orientation = Some(o);
}
// ── Dimensions ──
@@ -102,15 +100,15 @@ impl ExifService {
meta.height = parse_u32_value(&field.value);
}
// Fallback to ImageWidth/ImageLength if PixelXDimension is missing
if meta.width.is_none() {
if let Some(field) = exif.get_field(Tag::ImageWidth, In::PRIMARY) {
meta.width = parse_u32_value(&field.value);
}
if meta.width.is_none()
&& let Some(field) = exif.get_field(Tag::ImageWidth, In::PRIMARY)
{
meta.width = parse_u32_value(&field.value);
}
if meta.height.is_none() {
if let Some(field) = exif.get_field(Tag::ImageLength, In::PRIMARY) {
meta.height = parse_u32_value(&field.value);
}
if meta.height.is_none()
&& let Some(field) = exif.get_field(Tag::ImageLength, In::PRIMARY)
{
meta.height = parse_u32_value(&field.value);
}
Some(meta)
src/interfaces/api/handlers/file_handler.rs
+4 -4
View File
@@ -635,10 +635,10 @@ impl FileHandler {
use crate::infrastructure::services::exif_service::ExifService;
match tokio::fs::read(&file_path).await {
Ok(data) => {
if let Some(meta) = ExifService::extract(&data) {
if let Err(e) = metadata_repo.upsert(&file_id, &meta).await {
tracing::warn!("Failed to store EXIF for {}: {}", file_id, e);
}
if let Some(meta) = ExifService::extract(&data)
&& let Err(e) = metadata_repo.upsert(&file_id, &meta).await
{
tracing::warn!("Failed to store EXIF for {}: {}", file_id, e);
}
}
Err(e) => {
src/interfaces/api/handlers/photos_handler.rs
+1 -1
View File
@@ -32,7 +32,7 @@ pub async fn list_photos(
Query(params): Query<PhotosQueryParams>,
) -> impl IntoResponse {
let user_id = &auth_user.id;
let limit = params.limit.unwrap_or(200).min(500).max(1);
let limit = params.limit.unwrap_or(200).clamp(1, 500);
let file_read = &state.repositories.file_read_repository;