clean-up

photos-network · Oct 21, 2023 · a992dc0 · a992dc0
1 parent 3cce3b8
commit a992dc0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 19 deletions.
diff --git a/crates/database/src/postgres.rs b/crates/database/src/postgres.rs
@@ -153,8 +153,8 @@ impl Database for PostgresDatabase {
 
             sqlx::query(query)
                 .bind(id.clone())
-                .bind(&user_id)
-                .bind(&name)
+                .bind(user_id)
+                .bind(name)
                 .bind(false)
                 .bind(OffsetDateTime::now_utc())
                 .bind(date_taken)

diff --git a/crates/database/src/sqlite.rs b/crates/database/src/sqlite.rs
@@ -202,8 +202,8 @@ impl Database for SqliteDatabase {
         let id = Uuid::new_v4().hyphenated().to_string();
         let _res: SqliteQueryResult = sqlx::query(query)
             .bind(id.clone())
-            .bind(&media_id)
-            .bind(&user_id)
+            .bind(media_id)
+            .bind(user_id)
             .bind(&reference.filepath)
             .bind(&reference.filename)
             .bind(i64::try_from(reference.size).unwrap())

diff --git a/crates/media/src/api/routes/post_media.rs b/crates/media/src/api/routes/post_media.rs
@@ -80,7 +80,7 @@ pub(crate) async fn post_media(
                 "name={}, taken={} => id={}",
                 name.unwrap(),
                 date.unwrap(),
-                uuid.clone().hyphenated().to_string()
+                uuid.hyphenated().to_string()
             );
 
             Ok((
@@ -97,11 +97,9 @@ pub(crate) async fn post_media(
                     let location = format!("/media/{}", id);
                     headers.insert(LOCATION, location.parse().unwrap());
 
-                    return Err(StatusCode::SEE_OTHER);
-                }
-                _ => {
-                    return Err(StatusCode::INTERNAL_SERVER_ERROR);
+                    Err(StatusCode::SEE_OTHER)
                 }
+                _ => Err(StatusCode::INTERNAL_SERVER_ERROR),
             }
         }
     }

diff --git a/crates/media/src/api/routes/post_media_id.rs b/crates/media/src/api/routes/post_media_id.rs
@@ -84,10 +84,7 @@ pub(crate) async fn post_media_id(
 
     match result {
         Ok(uuid) => {
-            debug!(
-                "reference added. uuid={}",
-                uuid.clone().hyphenated().to_string()
-            );
+            debug!("reference added. uuid={}", uuid.hyphenated().to_string());
 
             Ok(uuid.hyphenated().to_string())
         }
@@ -99,11 +96,9 @@ pub(crate) async fn post_media_id(
                     let location = format!("/media/{}", id);
                     headers.insert(LOCATION, location.parse().unwrap());
 
-                    return Err(StatusCode::SEE_OTHER);
-                }
-                _ => {
-                    return Err(StatusCode::INTERNAL_SERVER_ERROR);
+                    Err(StatusCode::SEE_OTHER)
                 }
+                _ => Err(StatusCode::INTERNAL_SERVER_ERROR),
             }
         }
     }

diff --git a/crates/media/src/repository.rs b/crates/media/src/repository.rs
@@ -85,7 +85,7 @@ impl MediaRepositoryTrait for MediaRepository {
         return match items_result {
             Ok(items) => {
                 Ok(items
-                    .into_iter()
+                    .iter()
                     .map(|d| MediaItem {
                         // TODO: fill in missing info like references, details, tags
                         // TODO: check references on filesystem
@@ -133,7 +133,7 @@ impl MediaRepositoryTrait for MediaRepository {
         mut tmp_file: File,
     ) -> Result<Uuid, DataAccessError> {
         let path = Path::new("data/files/")
-            .join(user_id.clone().hyphenated().to_string())
+            .join(user_id.hyphenated().to_string())
             .join(media_id.clone())
             .join(name.clone());