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

some clean up

Browse source
This commit is contained in:
Lilian Jónsdóttir 2024-08-06 09:31:45 -07:00
parent d8ec25b36d
commit 50f4dbda8a
5 changed files with 22 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/files/disk.go
View file

@ -67,7 +67,7 @@ func NewDisk(path string) (DiskFile, error) {
}, nil
}
func FindDisk(dir string, recursive bool, fltr *filter.Filter) (Files, error) {
func FindDisk(dir string, recursive bool, fltr *filter.Filter) Files {
var files Files
dir = filepath.Clean(dir)
if dir == "." || dir == "" {
@ -91,7 +91,7 @@ func FindDisk(dir string, recursive bool, fltr *filter.Filter) (Files, error) {
files = append(files, readDir(dir, fltr)...)
}
return files, nil
return files
}
// isInHiddenDir checks `path` and parent directories
@ -143,7 +143,7 @@ func walkDir(dir string, fltr *filter.Filter) Files {
})
if err != nil {
log.Errorf("error walking directory %s: %s", dir, err)
return Files{}
return nil
}
return files
}
@ -152,7 +152,7 @@ func readDir(dir string, fltr *filter.Filter) Files {
var files Files
fs, err := os.ReadDir(dir)
if err != nil {
return Files{}
return nil
}
for _, file := range fs {
name := file.Name()
@ -163,7 +163,7 @@ func readDir(dir string, fltr *filter.Filter) Files {
info, err := file.Info()
if err != nil {
return Files{}
return nil
}
path := filepath.Dir(filepath.Join(dir, name))

10
internal/files/trash.go
View file

@ -67,7 +67,7 @@ func (t TrashInfo) String() string {
return t.name + t.path + t.ogpath + t.trashinfo
}
func FindInAllTrashes(ogdir string, fltr *filter.Filter) (Files, error) {
func FindInAllTrashes(ogdir string, fltr *filter.Filter) Files {
var files Files
personalTrash := filepath.Join(xdg.DataHome, "Trash")
@ -79,12 +79,13 @@ func FindInAllTrashes(ogdir string, fltr *filter.Filter) (Files, error) {
for _, trash := range getAllTrashes() {
fls, err := findTrash(trash, ogdir, fltr)
if err != nil {
log.Errorf("error reading trash dir '%s': %s", trash, err)
continue
}
files = append(files, fls...)
}
return files, nil
return files
}
func ConfirmRestore(confirm bool, fs Files) error {
@ -143,7 +144,7 @@ func findTrash(trashdir, ogdir string, fltr *filter.Filter) (Files, error) {
infodir := filepath.Join(trashdir, "info")
dirs, err := os.ReadDir(infodir)
if err != nil {
return Files{}, err
return nil, err
}
for _, dir := range dirs {
@ -425,7 +426,8 @@ func getAllTrashes() []string {
})
if err != nil {
return []string{}
log.Errorf("error reading mounts: %s", err)
return nil
}
return trashes