chore(cmds): encapsulate ipfs rm logic in another function

core/commands/files.go

@@ -1052,13 +1052,30 @@ Remove files or directories.
 		for _, arg := range req.Arguments {
 			path, err := checkPath(arg)
 			if err != nil {
-				errs = append(errs, fmt.Errorf("%s: %w", arg, err))
+				errs = append(errs, fmt.Errorf("%s is not a valid path: %w", arg, err))
 				continue
 			}
 
+			if err := removePath(nd.FilesRoot, path, force, dashr); err != nil {
+				errs = append(errs, fmt.Errorf("%s: %w", path, err))
+			}
+		}
+		if len(errs) > 0 {
+			for _, err = range errs {
+				e := res.Emit(err.Error())
+				if e != nil {
+					return e
+				}
+			}
+			return fmt.Errorf("can't remove some files")
+		}
+		return nil
+	},
+}
+
+func removePath(filesRoot *mfs.Root, path string, force bool, dashr bool) error {
 	if path == "/" {
-				errs = append(errs, fmt.Errorf("%s: cannot delete root", path))
-				continue
+		return fmt.Errorf("cannot delete root")
 	}
 
 	// 'rm a/b/c/' will fail unless we trim the slash at the end
@@ -1068,70 +1085,45 @@ Remove files or directories.
 
 	dir, name := gopath.Split(path)
 
-			pdir, err := getParentDir(nd.FilesRoot, dir)
+	pdir, err := getParentDir(filesRoot, dir)
 	if err != nil {
 		if force && err == os.ErrNotExist {
-					continue
+			return nil
 		}
-				errs = append(errs, fmt.Errorf("%s: parent lookup: %w", path, err))
-				continue
+		return err
 	}
 
 	if force {
 		err := pdir.Unlink(name)
 		if err != nil {
 			if err == os.ErrNotExist {
-						continue
-					}
-					errs = append(errs, fmt.Errorf("%s: %w", path, err))
-					continue
+				return nil
 			}
-				err = pdir.Flush()
-				if err != nil {
-					errs = append(errs, fmt.Errorf("%s: %w", path, err))
+			return err
 		}
-				continue
+		return pdir.Flush()
 	}
 
 	// get child node by name, when the node is corrupted and nonexistent,
 	// it will return specific error.
 	child, err := pdir.Child(name)
 	if err != nil {
-				errs = append(errs, fmt.Errorf("%s: %w", path, err))
-				continue
+		return err
 	}
 
 	switch child.(type) {
 	case *mfs.Directory:
 		if !dashr {
-					errs = append(errs, fmt.Errorf("%s is a directory, use -r to remove directories", path))
-					continue
+			return fmt.Errorf("path is a directory, use -r to remove directories")
 		}
 	}
 
 	err = pdir.Unlink(name)
 	if err != nil {
-				errs = append(errs, fmt.Errorf("%s: %w", path, err))
-				continue
+		return err
 	}
 
-			err = pdir.Flush()
-			if err != nil {
-				errs = append(errs, fmt.Errorf("%s: %w", path, err))
-			}
-			continue
-		}
-		if len(errs) > 0 {
-			for _, err = range errs {
-				e := res.Emit(err.Error())
-				if e != nil {
-					return e
-				}
-			}
-			return fmt.Errorf("can't remove some files")
-		}
-		return nil
-	},
+	return pdir.Flush()
 }
 
 func getPrefixNew(req *cmds.Request) (cid.Builder, error) {