reorder some logic

Author: 0x7d8

application/src/config.rs

@@ -1245,12 +1245,6 @@ impl Config {
             }
         }
 
-        if self.system.user.uid == 0 || self.system.user.gid == 0 {
-            return Err(anyhow::anyhow!(
-                "refusing to create user with UID or GID of 0 (root), please check your wings config and change system.username to a non-root user"
-            ));
-        }
-
         let command = if release.contains("alpine") {
             std::process::Command::new("addgroup")
                 .arg("-S")
@@ -1300,6 +1294,12 @@ impl Config {
         self.system.user.uid = **user.id();
         self.system.user.gid = *user.group_id();
 
+        if self.system.user.uid == 0 || self.system.user.gid == 0 {
+            return Err(anyhow::anyhow!(
+                "refusing to use user with UID or GID of 0 (root), please check your wings config and change system.username to a non-root user"
+            ));
+        }
+
         Ok(())
     }
 

application/src/server/filesystem/mod.rs

@@ -708,18 +708,18 @@ impl Filesystem {
             metadata.len()
         };
 
-        self.async_allocate_in_path(&path, -(size as i64), false)
-            .await;
-
         if metadata.is_dir() {
-            let mut disk_usage = self.disk_usage.write().await;
-            disk_usage.remove_path(&path);
+            self.async_remove_dir_all(&path).await?;
+        } else {
+            self.async_remove_file(&path).await?;
         }
 
         if metadata.is_dir() {
-            self.async_remove_dir_all(path).await?;
-        } else {
-            self.async_remove_file(path).await?;
+            let mut disk_usage = self.disk_usage.write().await;
+            disk_usage.remove_path(&path);
+        } else if let Some(parent) = path.parent() {
+            self.async_allocate_in_path(parent, -(size as i64), false)
+                .await;
         }
 
         Ok(())