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

Index: Ignore paths starting with _. and __ like "__MACOSX" #2844

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2022-11-02 18:02:18 +01:00
parent 9be52990fa
commit 7c634a1f51
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkg/fs/name.go
View file

@ -56,18 +56,27 @@ func RelName(fileName, dir string) string {
// FileNameHidden tests is a file name belongs to a hidden file.
func FileNameHidden(name string) bool {
if name == "" {
if len(name) == 0 {
return false
}
name = filepath.Base(name)
prefix := name[0:1]
switch prefix {
// Hidden files and folders starting with "." or "@" should be ignored.
switch name[0:1] {
case ".", "@":
return true
default:
return strings.HasPrefix(name, "_.")
}
if len(name) == 1 {
return false
}
// File paths starting with _. and __ like __MACOSX should be ignored.
switch name[0:2] {
case "_.", "__":
return true
}
return false
}

2
pkg/fs/name_test.go
View file

@ -85,6 +85,8 @@ func TestFileNameHidden(t *testing.T) {
assert.False(t, FileNameHidden("_folder"))
assert.True(t, FileNameHidden("/some/_.folder"))
assert.True(t, FileNameHidden("_.folder"))
assert.True(t, FileNameHidden("/some/__MACOSX"))
assert.True(t, FileNameHidden("__MACOSX"))
})
t.Run("At", func(t *testing.T) {
assert.False(t, FileNameHidden("/some/path/ea@Dir"))