octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-12 16:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1024 from AudriusButkevicius/regexp

Browse Source 
Fix versioner regexp's (fixes #1023)
This commit is contained in:
Jakob Borg 2014-11-26 13:22:57 +01:00
commit 3417839726
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/versioner/util.go
View File

@ -28,7 +28,7 @@ func taggedFilename(name, tag string) string {
return filepath.Join(dir, withoutExt+"~"+tag+ext) return filepath.Join(dir, withoutExt+"~"+tag+ext)
} }
var tagExp = regexp.MustCompile(`~([^~.]+)(?:\.[^.]+)?$`) var tagExp = regexp.MustCompile(`.*~([^~.]+)(?:\.[^.]+)?$`)
// Returns the tag from a filename, whether at the end or middle. // Returns the tag from a filename, whether at the end or middle.
func filenameTag(path string) string { func filenameTag(path string) string {

4
internal/versioner/versioner_test.go
View File

@ -25,10 +25,14 @@ func TestTaggedFilename(t *testing.T) {
{filepath.Join("foo", "bar.baz"), "tag", filepath.Join("foo", "bar~tag.baz")}, {filepath.Join("foo", "bar.baz"), "tag", filepath.Join("foo", "bar~tag.baz")},
{"bar.baz", "tag", "bar~tag.baz"}, {"bar.baz", "tag", "bar~tag.baz"},
{"bar", "tag", "bar~tag"}, {"bar", "tag", "bar~tag"},
{"~$ufheft2.docx", "20140612-200554", "~$ufheft2~20140612-200554.docx"},
{"alle~4.mgz", "20141106-094415", "alle~4~20141106-094415.mgz"},
// Parsing test only // Parsing test only
{"", "tag-only", "foo/bar.baz~tag-only"}, {"", "tag-only", "foo/bar.baz~tag-only"},
{"", "tag-only", "bar.baz~tag-only"}, {"", "tag-only", "bar.baz~tag-only"},
{"", "20140612-200554", "~$ufheft2.docx~20140612-200554"},
{"", "20141106-094415", "alle~4.mgz~20141106-094415"},
} }
for _, tc := range cases { for _, tc := range cases {