beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Folders: Show no error if fs.Dirs returns at least one result

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2022-07-14 17:48:58 +02:00
parent da2cb2c55f
commit 86ee51321c
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal/query/folders.go
View file

@ -8,12 +8,18 @@ import (
"github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/fs"
) )
// FoldersByPath returns a slice of folders in a given directory incl sub directories in recursive mode. // FoldersByPath returns a slice of folders in a given directory incl sub-folders in recursive mode.
func FoldersByPath(rootName, rootPath, path string, recursive bool) (folders entity.Folders, err error) { func FoldersByPath(rootName, rootPath, path string, recursive bool) (folders entity.Folders, err error) {
dirs, err := fs.Dirs(filepath.Join(rootPath, path), recursive, true) dirs, err := fs.Dirs(filepath.Join(rootPath, path), recursive, true)
// Failed?
if err != nil { if err != nil {
return folders, err if len(dirs) == 0 {
return folders, err
} else {
// At least one folder found.
log.Infof("folders: %s", err)
}
} }
folders = make(entity.Folders, len(dirs)) folders = make(entity.Folders, len(dirs))
@ -21,7 +27,7 @@ func FoldersByPath(rootName, rootPath, path string, recursive bool) (folders ent
for i, dir := range dirs { for i, dir := range dirs {
newFolder := entity.NewFolder(rootName, filepath.Join(path, dir), fs.BirthTime(filepath.Join(rootPath, dir))) newFolder := entity.NewFolder(rootName, filepath.Join(path, dir), fs.BirthTime(filepath.Join(rootPath, dir)))
if err := newFolder.Create(); err == nil { if err = newFolder.Create(); err == nil {
folders[i] = newFolder folders[i] = newFolder
} else if folder := entity.FindFolder(rootName, filepath.Join(path, dir)); folder != nil { } else if folder := entity.FindFolder(rootName, filepath.Join(path, dir)); folder != nil {
folders[i] = *folder folders[i] = *folder