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

more consistent errors

Browse source
This commit is contained in:
Lilian Jónsdóttir 2024-07-30 13:58:06 -07:00
parent 437101b947
commit 7c0f78f4d6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/files/trash.go
View file

@ -214,10 +214,11 @@ func ConfirmClean(confirm bool, fs Files) error {
func TrashFile(trashDir, name string) error { func TrashFile(trashDir, name string) error {
trashinfoFilename, outPath := ensureUniqueName(filepath.Base(name), trashDir) trashinfoFilename, outPath := ensureUniqueName(filepath.Base(name), trashDir)
// TODO: write across filesystems
if err := os.Rename(name, outPath); err != nil { if err := os.Rename(name, outPath); err != nil {
if strings.Contains(err.Error(), "invalid cross-device link") { if strings.Contains(err.Error(), "invalid cross-device link") {
return fmt.Errorf("not trashing file '%s': On different filesystem from trash directory", name) // TODO: use $topdir/.Trash as per XDG spec
// TODO: maybe figure out if filesystem is truly different or is a btrfs subvolume
return err
} }
return err return err
} }
@ -239,7 +240,7 @@ func TrashFile(trashDir, name string) error {
func TrashFiles(trashDir string, files ...string) (trashed int) { 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 {
log.Errorf("error trashing file %s: %s", file, err) log.Errorf("cannot trash '%s': %s", file, err)
continue continue
} }
trashed++ trashed++