celediel/gt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 2 Wiki Activity

don't die on error trashing one file

Browse source 
try trashing all the rest instead
This commit is contained in:
Lilian Jónsdóttir 2024-07-30 13:48:52 -07:00
parent c33afe615c
commit 437101b947
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
internal/files/trash.go
View file

@ -236,14 +236,15 @@ func TrashFile(trashDir, name string) error {
return nil return nil
} }
func TrashFiles(trashDir string, files ...string) (trashed int, err error) { func TrashFiles(trashDir string, files ...string) (trashed int) {
for _, file := range files { for _, file := range files {
if err = TrashFile(trashDir, file); err != nil { if err := TrashFile(trashDir, file); err != nil {
return trashed, err log.Errorf("error trashing file %s: %s", file, err)
continue
} }
trashed++ trashed++
} }
return trashed, err return trashed
} }
func ConfirmTrash(confirm bool, fs Files, trashDir string) error { func ConfirmTrash(confirm bool, fs Files, trashDir string) error {
@ -254,10 +255,8 @@ func ConfirmTrash(confirm bool, fs Files, trashDir string) error {
tfs = append(tfs, file.Path()) tfs = append(tfs, file.Path())
} }
trashed, err := TrashFiles(trashDir, tfs...) trashed := TrashFiles(trashDir, tfs...)
if err != nil {
return err
}
var files string var files string
if trashed == 1 { if trashed == 1 {
files = "file" files = "file"

3
main.go
View file

@ -164,7 +164,8 @@ var (
for _, arg := range ctx.Args().Slice() { for _, arg := range ctx.Args().Slice() {
file, e := files.NewDisk(arg) file, e := files.NewDisk(arg)
if e != nil { if e != nil {
log.Fatalf("cannot trash '%s': No such file or directory", arg) log.Errorf("cannot trash '%s': No such file or directory", arg)
continue
} }
filesToTrash = append(filesToTrash, file) filesToTrash = append(filesToTrash, file)
} }