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

Mediafile: Basename should also trim " copy" at the end of file names

Browse source
This commit is contained in:
Michael Mayer 2019-07-03 10:55:46 +02:00
parent 3527675995
commit 909b1d9f8a
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/photoprism/mediafile.go
View file

@ -337,16 +337,20 @@ func (m *MediaFile) Directory() string {
return filepath.Dir(m.filename)
}
// Basename returns the filename base without any extension and path.
// Basename returns the filename base without any extensions and path.
func (m *MediaFile) Basename() string {
basename := filepath.Base(m.Filename())
if end := strings.Index(basename, "."); end != -1 {
// ignore everything behind the first dot in the file name
basename = basename[:end]
}
// File copies created by operating systems, example: IMG_1234 (2)
if end := strings.Index(basename, " ("); end != -1 {
// copies created by Chrome & Windows, example: IMG_1234 (2)
basename = basename[:end]
} else if end := strings.Index(basename, " copy"); end != -1 {
// copies created by OS X, example: IMG_1234 copy 2
basename = basename[:end]
}