perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use modification time for version timestamp; change version format to filename~yyyymmdd-hhmmss

Browse Source
This commit is contained in:
Alexander Graf
2014-09-07 13:40:22 +02:00
parent 78c6a68db9
commit 5faa16f9ee
2 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
versioner/simple.go
View File

@@ -9,7 +9,6 @@ import (
"path/filepath"
"sort"
"strconv"
"time"
"github.com/syncthing/syncthing/osutil"
)
@@ -46,7 +45,7 @@ func NewSimple(repoID, repoPath string, params map[string]string) Versioner {
// Move away the named file to a version archive. If this function returns
// nil, the named file does not exist any more (has been archived).
func (v Simple) Archive(filePath string) error {
_, err := os.Stat(filePath)
fileInfo, err := os.Stat(filePath)
if err != nil {
if os.IsNotExist(err) {
if debug {
@@ -88,7 +87,7 @@ func (v Simple) Archive(filePath string) error {
return err
}
ver := file + "~" + time.Now().Format("20060102-150405")
ver := file + "~" + fileInfo.ModTime().Format("20060102-150405")
dst := filepath.Join(dir, ver)
if debug {
l.Debugln("moving to", dst)
@@ -98,7 +97,7 @@ func (v Simple) Archive(filePath string) error {
return err
}
versions, err := filepath.Glob(filepath.Join(dir, file+"~*"))
versions, err := filepath.Glob(filepath.Join(dir, file+"~[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9]"))
if err != nil {
l.Warnln("globbing:", err)
return nil