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

Import: Never remove ignored directories #1319

Browse source
This commit is contained in:
Michael Mayer 2021-05-23 13:49:07 +02:00
parent ed3287d8ef
commit 65c3967384
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
internal/photoprism/import.go
View file

@ -129,14 +129,12 @@ func (imp *Import) Start(opt ImportOptions) fs.Done {
isDir := info.IsDir()
isSymlink := info.IsSymlink()
if isDir {
if fileName != importPath {
directories = append(directories, fileName)
}
}
if skip, result := fs.SkipWalk(fileName, isDir, isSymlink, done, ignore); skip {
if isDir && result != filepath.SkipDir {
if fileName != importPath {
directories = append(directories, fileName)
}
folder := entity.NewFolder(entity.RootImport, fs.RelName(fileName, imp.conf.ImportPath()), fs.BirthTime(fileName))
if err := folder.Create(); err == nil {
@ -210,7 +208,7 @@ func (imp *Import) Start(opt ImportOptions) fs.Done {
})
if opt.RemoveEmptyDirectories {
// Remove empty directories from import path
// Remove empty directories from import path.
for _, directory := range directories {
if fs.IsEmpty(directory) {
if err := os.Remove(directory); err != nil {
@ -223,7 +221,7 @@ func (imp *Import) Start(opt ImportOptions) fs.Done {
}
if opt.RemoveDotFiles {
// Remove hidden .files if option is enabled
// Remove hidden .files if option is enabled.
for _, file := range ignore.Hidden() {
if !fs.FileExists(file) {
continue

2
internal/photoprism/import_options.go
View file

@ -22,7 +22,7 @@ func ImportOptionsCopy(path string) ImportOptions {
return result
}
// IndexOptionsMove returns import options for moving files to originals (modifies import directory).
// ImportOptionsMove returns import options for moving files to originals (modifies import directory).
func ImportOptionsMove(path string) ImportOptions {
result := ImportOptions{
Path: path,