minor improvements

src/handlers/list_file.rs

@@ -17,11 +17,13 @@ pub async fn ep_list_files(
     request: Json<FileList>,
     user: Authenticateduser,
 ) -> Result<Json<FileListResponse>, RestError> {
-    let found = File::search(&pool.get()?, &request, user.user)?
+    let files = File::search(&pool.get()?, &request, user.user)?
         .into_iter()
+        // Map fond files to a responable format
         .map(|(file, namespace, attr)| -> response::FileItemResponse {
             let mut res: response::FileItemResponse = file.into();
             res.attributes.namespace = namespace.name;
+
             let (tags, groups): (Vec<Attribute>, Vec<Attribute>) = attr
                 .into_iter()
                 .partition(|i| i.type_.eq(&AttributeType::Tag));
@@ -38,5 +40,5 @@ pub async fn ep_list_files(
         })
         .collect();
 
-    Ok(Json(FileListResponse { files: found }))
+    Ok(Json(FileListResponse { files }))
 }

src/handlers/namespace.rs

@@ -23,8 +23,10 @@ pub async fn ep_create_namespace(
         return Err(RestError::IllegalOperation);
     }
 
+    let db = pool.get()?;
+
     web::block(move || -> Result<(), RestError> {
-        namespace::CreateNamespace::new(&req.name, user.user.id).create(&pool.get()?)
+        namespace::CreateNamespace::new(&req.name, user.user.id).create(&db)
     })
     .await??;
 
@@ -62,12 +64,10 @@ pub async fn ep_delete_namespace(
     }
 
     web::block(move || -> Result<(), RestError> {
-        if let Some(ns) = Namespace::find_by_name(&db, &req.name, user.user.id)? {
-            ns.delete(&db, &config)?;
-            Ok(())
-        } else {
-            Err(RestError::DNotFound(Origin::Namespace))
-        }
+        let ns = Namespace::find_by_name(&db, &req.name, user.user.id)?
+            .ok_or(RestError::DNotFound(Origin::Namespace))?;
+
+        ns.delete(&db, &config)
     })
     .await??;
 
@@ -97,12 +97,10 @@ pub async fn ep_rename_namespace(
     let db = pool.get()?;
 
     web::block(move || -> Result<(), RestError> {
-        if let Some(ns) = Namespace::find_by_name(&db, &req.name, user.user.id)? {
-            ns.rename(&db, new_name.as_ref())?;
-            Ok(())
-        } else {
-            Err(RestError::DNotFound(Origin::Namespace))
-        }
+        let ns = Namespace::find_by_name(&db, &req.name, user.user.id)?
+            .ok_or(RestError::DNotFound(Origin::Namespace))?;
+
+        ns.rename(&db, new_name.as_ref())
     })
     .await??;
 

src/handlers/upload_file.rs

@@ -357,7 +357,6 @@ impl UploadBuffer {
                     // ensure to only pop actually overflowing items
                     .skip(left_to_fill)
                     .take(bytes.len() - left_to_fill)
-                    // Put in right order
                     .copied()
                     .collect_vec()
             } else {

src/handlers/user.rs

@@ -19,6 +19,8 @@ pub async fn ep_register(
     config: web::Data<Config>,
     req: web::Json<CredentialsRequest>,
 ) -> Result<Json<Success>, RestError> {
+    let req = req.into_inner();
+
     // Don't allow the registration ep if disabled in config
     config
         .server
@@ -30,10 +32,8 @@ pub async fn ep_register(
         return Err(RestError::BadRequest);
     }
 
+    let new_user = User::new(req.username, req.password);
     let db = pool.get()?;
-
-    let new_user = User::new(req.username.clone(), req.password.clone());
-
     web::block(move || new_user.create(&db)).await??;
 
     Ok(SUCCESS)