refactor: error handling

umlx5h · Jan 12, 2024 · 21e8d65 · 21e8d65
1 parent b1e05e0
commit 21e8d65
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/internal/cmd/find.go b/internal/cmd/find.go
@@ -191,7 +191,13 @@ func findCmdRun(args []string, opts findOptions) error {
 		trash.WithTrashDir(opts.trashDir),
 	)
 	if err := box.Open(); err != nil {
-		return err
+		// no error only remove mode (consider executing via batch)
+		if opts.doRemove && errors.Is(err, trash.ErrNotFound) {
+			fmt.Printf("do nothing: %s\n", err)
+			return nil
+		} else {
+			return err
+		}
 	}
 
 	listFiles(box.Files, box.GetSize, opts.showTrashPath)
@@ -212,9 +218,7 @@ func findCmdRun(args []string, opts findOptions) error {
 		if !opts.force && isTerminal && !tui.BoolPrompt("Are you sure you want to remove PERMENANTLY? ") {
 			return errors.New("do nothing")
 		}
-		if err := doRemove(box.Files); err != nil {
-			return err
-		}
+		doRemove(box.Files)
 
 	} else if opts.doRestore {
 		if opts.restoreTo != "" {

diff --git a/internal/cmd/metafix.go b/internal/cmd/metafix.go
@@ -57,11 +57,16 @@ func metafixCmdRun(opts metafixOptions) error {
 		trash.WithSortBy(trash.SortByName),
 	)
 	if err := box.Open(); err != nil {
-		return err
+		if errors.Is(err, trash.ErrNotFound) {
+			fmt.Printf("do nothing: %s\n", err)
+			return nil
+		} else {
+			return err
+		}
 	}
 
 	if len(box.OrphanMeta) == 0 {
-		fmt.Println("Not found invalid metadata")
+		fmt.Println("not found invalid metadata")
 		return nil
 	}
 

diff --git a/internal/cmd/summary.go b/internal/cmd/summary.go
@@ -83,7 +83,7 @@ func summaryCmdRun(_ summaryOptions) error {
 		totalItem += item
 	}
 
-	if len(box.FilesByTrashDir) > 1 {
+	if len(box.TrashDirs) > 1 {
 		fmt.Printf("\n[total]\n")
 		fmt.Printf("item: %d\n", totalItem)
 		fmt.Printf("size: %s\n", humanize.Bytes(uint64(totalSize)))