rm: refactor prompt_file create prompt_file_permission_read_only

terade · terade · commit bd5a75f470c3 · 2023-10-05T17:58:45.000+02:00
diff --git a/src/uu/rm/src/rm.rs b/src/uu/rm/src/rm.rs
@@ -500,50 +500,48 @@ fn prompt_file(path: &Path, options: &Options) -> bool {
             }
         }
     }
+
     // File::open(path) doesn't open the file in write mode so we need to use file options to open it in also write mode to check if it can written too
     match File::options().read(true).write(true).open(path) {
         Ok(file) => {
-            if file.metadata().is_err() {
+            let Ok(metadata) = file.metadata() else {
                 return true;
-            }
+            };
 
-            let metadata = file.metadata().unwrap();
-            if metadata.permissions().readonly() {
-                if metadata.len() == 0 {
-                    prompt_yes!(
-                        "remove write-protected regular empty file {}?",
-                        path.quote()
-                    )
-                } else {
-                    prompt_yes!("remove write-protected regular file {}?", path.quote())
-                }
-            } else if options.interactive == InteractiveMode::Always {
-                if metadata.len() == 0 {
+            if options.interactive == InteractiveMode::Always && !metadata.permissions().readonly()
+            {
+                return if metadata.len() == 0 {
                     prompt_yes!("remove regular empty file {}?", path.quote())
                 } else {
                     prompt_yes!("remove file {}?", path.quote())
-                }
-            } else {
-                true
+                };
             }
+            prompt_file_permission_readonly(path, Ok(metadata))
         }
         Err(err) => {
             if err.kind() != ErrorKind::PermissionDenied {
                 return true;
             }
-            match fs::metadata(path) {
-                Ok(metadata) if metadata.len() == 0 => {
-                    prompt_yes!(
-                        "remove write-protected regular empty file {}?",
-                        path.quote()
-                    )
-                }
-                _ => prompt_yes!("remove write-protected regular file {}?", path.quote()),
-            }
+            prompt_file_permission_readonly(path, fs::metadata(path))
         }
     }
 }
 
+#[allow(clippy::cognitive_complexity)]
+fn prompt_file_permission_readonly(
+    path: &Path,
+    metadata_or_err: Result<Metadata, std::io::Error>,
+) -> bool {
+    match metadata_or_err {
+        Ok(metadata) if !metadata.permissions().readonly() => true,
+        Ok(metadata) if metadata.len() == 0 => prompt_yes!(
+            "remove write-protected regular empty file {}?",
+            path.quote()
+        ),
+        _ => prompt_yes!("remove write-protected regular file {}?", path.quote()),
+    }
+}
+
 // For directories finding if they are writable or not is a hassle. In Unix we can use the built-in rust crate to to check mode bits. But other os don't have something similar afaik
 // Most cases are covered by keep eye out for edge cases
 #[cfg(unix)]
