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

Ignore whitespace when stripping sequence from filename #335

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-06-01 01:35:07 +02:00
parent 344c88b84c
commit a6e06844f3
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/fs/base.go
View file

@ -29,7 +29,7 @@ func Base(fileName string, stripSequence bool) string {
} }
// other common sequential naming schemes // other common sequential naming schemes
if end := strings.Index(basename, " ("); end != -1 { if end := strings.Index(basename, "("); end != -1 {
// copies created by Chrome & Windows, example: IMG_1234 (2) // copies created by Chrome & Windows, example: IMG_1234 (2)
basename = basename[:end] basename = basename[:end]
} else if end := strings.Index(basename, " copy"); end != -1 { } else if end := strings.Index(basename, " copy"); end != -1 {
@ -37,6 +37,8 @@ func Base(fileName string, stripSequence bool) string {
basename = basename[:end] basename = basename[:end]
} }
basename = strings.TrimSpace(basename)
return basename return basename
} }

20
pkg/fs/base_test.go
View file

@ -67,6 +67,26 @@ func TestBase(t *testing.T) {
result := Base("/testdata/Test (3).jpg", false) result := Base("/testdata/Test (3).jpg", false)
assert.Equal(t, "Test (3)", result) assert.Equal(t, "Test (3)", result)
}) })
t.Run("20180506_091537_DSC02122.JPG", func(t *testing.T) {
result := Base("20180506_091537_DSC02122.JPG", true)
assert.Equal(t, "20180506_091537_DSC02122", result)
})
t.Run("20180506_091537_DSC02122 (+3.3).JPG", func(t *testing.T) {
result := Base("20180506_091537_DSC02122 (+3.3).JPG", true)
assert.Equal(t, "20180506_091537_DSC02122", result)
})
t.Run("20180506_091537_DSC02122 (-2.7).JPG", func(t *testing.T) {
result := Base("20180506_091537_DSC02122 (-2.7).JPG", true)
assert.Equal(t, "20180506_091537_DSC02122", result)
})
t.Run("20180506_091537_DSC02122(+3.3).JPG", func(t *testing.T) {
result := Base("20180506_091537_DSC02122(+3.3).JPG", true)
assert.Equal(t, "20180506_091537_DSC02122", result)
})
t.Run("20180506_091537_DSC02122(-2.7).JPG", func(t *testing.T) {
result := Base("20180506_091537_DSC02122(-2.7).JPG", true)
assert.Equal(t, "20180506_091537_DSC02122", result)
})
} }
func TestRelativeBase(t *testing.T) { func TestRelativeBase(t *testing.T) {