octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-02 11:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1752 from alex2108/master

Browse Source 
Distinguish files with same name but different extension in staggered versioner (fixes #1738)
This commit is contained in:
Jakob Borg 2015-05-03 12:32:20 +02:00
commit 33048f88b8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/versioner/staggered.go
View File

@ -116,10 +116,11 @@ func (v Staggered) clean() {
} }
} else { } else {
// Regular file, or possibly a symlink. // Regular file, or possibly a symlink.
ext := filepath.Ext(path)
extension := filenameTag(path) versionTag := filenameTag(path)
dir := filepath.Dir(path) dir := filepath.Dir(path)
name := path[:len(path)-len(extension)-1] withoutExt := path[:len(path)-len(ext)-len(versionTag)-1]
name := withoutExt + ext
filesPerDir[dir]++ filesPerDir[dir]++
versionsPerFile[name] = append(versionsPerFile[name], path) versionsPerFile[name] = append(versionsPerFile[name], path)