Explorar el Código

add staggered versioner

Alexander Graf hace 11 años
padre
commit
2b3359dff3
Se han modificado 5 ficheros con 393 adiciones y 10 borrados
  1. 0 0
      auto/gui.files.go
  2. 33 1
      gui/app.js
  3. 39 5
      gui/index.html
  4. 8 4
      versioner/simple.go
  5. 313 0
      versioner/staggered.go

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
auto/gui.files.go


+ 33 - 1
gui/app.js

@@ -686,9 +686,22 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         });
         if ($scope.currentRepo.Versioning && $scope.currentRepo.Versioning.Type === "simple") {
             $scope.currentRepo.simpleFileVersioning = true;
+            $scope.currentRepo.FileVersioningSelector = "simple";
             $scope.currentRepo.simpleKeep = +$scope.currentRepo.Versioning.Params.keep;
+        } else if ($scope.currentRepo.Versioning && $scope.currentRepo.Versioning.Type === "staggered") {
+            $scope.currentRepo.staggeredFileVersioning = true;
+            $scope.currentRepo.FileVersioningSelector = "staggered";
+            $scope.currentRepo.staggeredMaxAge = +$scope.currentRepo.Versioning.Params.maxAge;
+            $scope.currentRepo.staggeredCleanInterval = +$scope.currentRepo.Versioning.Params.cleanInterval;
+            $scope.currentRepo.staggeredVersionsPath = $scope.currentRepo.Versioning.Params.versionsPath;
+        } else {
+            $scope.currentRepo.FileVersioningSelector = "none";
         }
         $scope.currentRepo.simpleKeep = $scope.currentRepo.simpleKeep || 5;
+        $scope.currentRepo.staggeredMaxAge = $scope.currentRepo.staggeredMaxAge || 31536000;
+        $scope.currentRepo.staggeredCleanInterval = $scope.currentRepo.staggeredCleanInterval || 3600;
+        $scope.currentRepo.staggeredVersionsPath = $scope.currentRepo.staggeredVersionsPath || "";
+        
         $scope.editingExisting = true;
         $scope.repoEditor.$setPristine();
         $('#editRepo').modal();
@@ -696,6 +709,11 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
 
     $scope.addRepo = function () {
         $scope.currentRepo = {selectedNodes: {}};
+        $scope.currentRepo.FileVersioningSelector = "none";
+        $scope.currentRepo.simpleKeep = 5;
+        $scope.currentRepo.staggeredMaxAge = 31536000;
+        $scope.currentRepo.staggeredCleanInterval = 3600;
+        $scope.currentRepo.staggeredVersionsPath = "";
         $scope.editingExisting = false;
         $scope.repoEditor.$setPristine();
         $('#editRepo').modal();
@@ -715,7 +733,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         }
         delete repoCfg.selectedNodes;
 
-        if (repoCfg.simpleFileVersioning) {
+        if (repoCfg.FileVersioningSelector === "simple") {
             repoCfg.Versioning = {
                 'Type': 'simple',
                 'Params': {
@@ -724,6 +742,20 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
             };
             delete repoCfg.simpleFileVersioning;
             delete repoCfg.simpleKeep;
+        } else if (repoCfg.FileVersioningSelector === "staggered") {
+            repoCfg.Versioning = {
+                'Type': 'staggered',
+                'Params': {
+                    'maxAge': '' + repoCfg.staggeredMaxAge,
+                    'cleanInterval': '' + repoCfg.staggeredCleanInterval,
+                    'versionsPath': '' + repoCfg.staggeredVersionsPath,
+                }
+            };
+            delete repoCfg.staggeredFileVersioning;
+            delete repoCfg.staggeredMaxAge;
+            delete repoCfg.staggeredCleanInterval;
+            delete repoCfg.staggeredVersionsPath;
+        
         } else {
             delete repoCfg.Versioning;
         }

+ 39 - 5
gui/index.html

@@ -540,14 +540,25 @@
               </div>
               <div class="col-md-6">
                 <div class="form-group">
-                  <div class="checkbox">
+                  <label translate>File Versioning</label>
+                  <div class="radio">
                     <label>
-                      <input type="checkbox" ng-model="currentRepo.simpleFileVersioning"> <span translate>File Versioning</span>
+                      <input type="radio" ng-model="currentRepo.FileVersioningSelector" value="none"> <span translate>No File Versioning</span>
+                    </label>
+                  </div>
+                  <div class="radio">
+                    <label>
+                      <input type="radio" ng-model="currentRepo.FileVersioningSelector" value="simple"> <span translate>Simple File Versioning</span>
+                    </label>
+                  </div>
+                  <div class="radio">
+                    <label>
+                      <input type="radio" ng-model="currentRepo.FileVersioningSelector" value="staggered"> <span translate>Staggered File Versioning</span>
                     </label>
                   </div>
-                  <p translate class="help-block">Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing.</p>
                 </div>
-                <div class="form-group" ng-if="currentRepo.simpleFileVersioning" ng-class="{'has-error': repoEditor.simpleKeep.$invalid && repoEditor.simpleKeep.$dirty}">
+                <div class="form-group" ng-if="currentRepo.FileVersioningSelector=='simple'" ng-class="{'has-error': repoEditor.simpleKeep.$invalid && repoEditor.simpleKeep.$dirty}">
+                  <p translate class="help-block">Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing.</p>
                   <label translate for="simpleKeep">Keep Versions</label>
                   <input name="simpleKeep" id="simpleKeep" class="form-control" type="number" ng-model="currentRepo.simpleKeep" required min="1"></input>
                   <p class="help-block">
@@ -556,7 +567,30 @@
                     <span translate ng-if="repoEditor.simpleKeep.$error.min && repoEditor.simpleKeep.$dirty">You must keep at least one version.</span>
                   </p>
                 </div>
-
+                <div class="form-group" ng-if="currentRepo.FileVersioningSelector=='staggered'" ng-class="{'has-error': repoEditor.staggeredMaxAge.$invalid && repoEditor.staggeredMaxAge.$dirty}">
+                  <p translate class="help-block">Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing. Versions are automatically deleted if they are over the set maximum age or too many files are in a interval.</p>
+                  <p translate class="help-block">The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.</p>
+                  <label translate for="staggeredMaxAge">Maximum Age</label>
+                  <input name="staggeredMaxAge" id="staggeredMaxAge" class="form-control" type="number" ng-model="currentRepo.staggeredMaxAge" required></input>
+                  <p class="help-block">
+                    <span translate ng-if="repoEditor.staggeredMaxAge.$valid || repoEditor.staggeredMaxAge.$pristine">The maximum time to keep a version in seconds, -1 keeps versions forever.</span>
+                    <span translate ng-if="repoEditor.staggeredMaxAge.$error.required && repoEditor.staggeredMaxAge.$dirty">The maximum age must be a number and cannot be blank.</span>
+                  </p>
+                </div>
+                <div class="form-group" ng-if="currentRepo.FileVersioningSelector=='staggered'" ng-class="{'has-error': repoEditor.staggeredCleanInterval.$invalid && repoEditor.staggeredCleanInterval.$dirty}">
+                  <label translate for="staggeredCleanInterval">Clean Interval</label>
+                  <input name="staggeredCleanInterval" id="staggeredCleanInterval" class="form-control" type="number" ng-model="currentRepo.staggeredCleanInterval" required min="1"></input>
+                  <p class="help-block">
+                    <span translate ng-if="repoEditor.staggeredCleanInterval.$valid || repoEditor.staggeredCleanInterval.$pristine">The interval to clean versions in seconds.</span>
+                    <span translate ng-if="repoEditor.staggeredCleanInterval.$error.required && repoEditor.staggeredCleanInterval.$dirty">The clean interval must be a number and cannot be blank.</span>
+                    <span translate ng-if="repoEditor.staggeredCleanInterval.$error.min && repoEditor.staggeredCleanInterval.$dirty">Clean Interval has to be greater than 0.</span>
+                  </p>
+                </div>
+                <div class="form-group" ng-if="currentRepo.FileVersioningSelector=='staggered'">
+                  <label translate for="staggeredVersionsPath">Versions Path</label>
+                  <input name="staggeredVersionsPath" placeholder="" id="staggeredVersionsPath" class="form-control" type="text" ng-model="currentRepo.staggeredVersionsPath"></input>
+                  <p translate class="help-block">Path where versions should be stored, leave empty to put them in .stversions folder in the repository.</p>
+                </div>
               </div>
             </div>
           </form>

+ 8 - 4
versioner/simple.go

@@ -47,11 +47,15 @@ func NewSimple(repoID, repoPath string, params map[string]string) Versioner {
 // nil, the named file does not exist any more (has been archived).
 func (v Simple) Archive(filePath string) error {
 	_, err := os.Stat(filePath)
-	if err != nil && os.IsNotExist(err) {
-		if debug {
-			l.Debugln("not archiving nonexistent file", filePath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			if debug {
+				l.Debugln("not archiving nonexistent file", filePath)
+			}
+			return nil
+		} else {
+			return err
 		}
-		return nil
 	}
 
 	versionsDir := filepath.Join(v.repoPath, ".stversions")

+ 313 - 0
versioner/staggered.go

@@ -0,0 +1,313 @@
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// All rights reserved. Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+package versioner
+
+import (
+	"fmt"
+	"github.com/syncthing/syncthing/osutil"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"sort"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+)
+
+func init() {
+	// Register the constructor for this type of versioner with the name "staggered"
+	Factories["staggered"] = NewStaggered
+}
+
+type Interval struct {
+	step int64
+	end  int64
+}
+
+// The type holds our configuration
+type Staggered struct {
+	versionsPath  string
+	cleanInterval int64
+	repoPath      string
+	interval      [4]Interval
+	mutex         *sync.Mutex
+}
+
+// Check if file or dir
+func isFile(path string) bool {
+	fileordir := path
+	file, err := os.Open(fileordir)
+	if err != nil {
+		l.Infoln("versioner isFile:", err)
+		return false
+	}
+	defer file.Close()
+
+	fileInfo, err := file.Stat()
+	if err != nil {
+		l.Infoln("versioner isFile:", err)
+		return false
+	}
+	return fileInfo.Mode().IsRegular()
+}
+
+// The constructor function takes a map of parameters and creates the type.
+func NewStaggered(repoID, repoPath string, params map[string]string) Versioner {
+
+	maxAge, err := strconv.ParseInt(params["maxAge"], 10, 0)
+	if err != nil {
+		maxAge = 31536000 // Default: ~1 year
+	}
+	cleanInterval, err := strconv.ParseInt(params["cleanInterval"], 10, 0)
+	if err != nil {
+		cleanInterval = 3600 // Default: clean once per hour
+	}
+
+	// Use custom path if set, otherwise .stversions in repoPath
+	var versionsDir string
+	if params["versionsPath"] == "" {
+		if debug {
+			l.Debugln("using default dir .stversions")
+		}
+		versionsDir = filepath.Join(repoPath, ".stversions")
+	} else {
+		if debug {
+			l.Debugln("using dir", params["versionsPath"])
+		}
+		versionsDir = params["versionsPath"]
+	}
+
+	var mutex sync.Mutex
+	s := Staggered{
+		versionsPath:  versionsDir,
+		cleanInterval: cleanInterval,
+		repoPath:      repoPath,
+		interval: [4]Interval{
+			Interval{30, 3600},        // first hour -> 30 sec between versions
+			Interval{3600, 86400},     // next day -> 1 h between versions
+			Interval{86400, 2592000},  // next 30 days -> 1 day between versions
+			Interval{604800, maxAge}, // next year -> 1 week between versions
+		},
+		mutex: &mutex,
+	}
+
+	if debug {
+		l.Debugf("instantiated %#v", s)
+	}
+
+	go func() {
+		s.clean()
+		for _ = range time.Tick(time.Duration(cleanInterval) * time.Second) {
+			s.clean()
+		}
+	}()
+
+	return s
+}
+
+func (v Staggered) clean() {
+	if debug {
+		l.Debugln("Versioner clean: Waiting for lock on", v.versionsPath)
+	}
+	v.mutex.Lock()
+	defer v.mutex.Unlock()
+	if debug {
+		l.Debugln("Versioner clean: Cleaning", v.versionsPath)
+	}
+
+	_, err := os.Stat(v.versionsPath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			if debug {
+				l.Debugln("creating versions dir", v.versionsPath)
+			}
+			os.MkdirAll(v.versionsPath, 0755)
+			osutil.HideFile(v.versionsPath)
+		} else {
+			l.Warnln("Versioner: can't create versions dir",err)
+		}
+	}
+
+	// Using keys of map as set
+	clean_filelist := make(map[string]struct{})
+	clean_emptyDirs := make(map[string]struct{})
+
+	err = filepath.Walk(v.versionsPath, func(path string, f os.FileInfo, err error) error {
+		switch mode := f.Mode(); {
+		case mode.IsDir():
+			files, _ := ioutil.ReadDir(path)
+			if len(files) == 0 {
+				clean_emptyDirs[path] = struct{}{}
+			}
+		case mode.IsRegular():
+			extension := filepath.Ext(path)
+			name := path[0 : len(path)-len(extension)]
+			clean_filelist[name] = struct{}{}
+		}
+
+		return nil
+	})
+	if err != nil {
+		l.Warnln("Versioner: error scanning versions dir",err)
+	}
+
+	for k, _ := range clean_filelist {
+		versions, err := filepath.Glob(k + ".v[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("Versioner: error finding versions for", k, err)
+		}
+		sort.Strings(versions)
+		expire(versions, v)
+	}
+	for k, _ := range clean_emptyDirs {
+		if k == v.versionsPath {
+			if debug {
+				l.Debugln("Cleaner: versions dir is empty, don't delete", k)
+			}
+			continue
+		}
+		if debug {
+			l.Debugln("Cleaner: deleting empty directory", k)
+		}
+		err = os.Remove(k)
+		if err != nil {
+			l.Warnln("Versioner: can't remove directory", k, err)
+		}
+	}
+	if debug {
+		l.Debugln("Cleaner: Finished cleaning", v.versionsPath)
+	}
+}
+
+func expire(versions []string, v Staggered) {
+	if debug {
+		l.Debugln("Versioner: Expiring versions", versions)
+	}
+	now := time.Now().Unix()
+	var prevAge int64
+	firstFile := true
+	for _, file := range versions {
+		if isFile(file) {
+			versiondate, err := strconv.ParseInt(strings.Replace(filepath.Ext(file), ".v", "", 1), 10, 0)
+			if err != nil {
+				l.Warnln("Versioner expire: file", file, "is invalid")
+				continue
+			}
+			age := now - versiondate
+
+			var usedInterval Interval
+			for _, usedInterval = range v.interval { // Find the interval the file fits in
+				if age < usedInterval.end {
+					break
+				}
+			}
+			if lastIntv := v.interval[len(v.interval)-1]; lastIntv.end != -1 && age > lastIntv.end {
+				if debug {
+					l.Debugln("Versioner: File over maximum age -> delete ", file)
+				}
+				err = os.Remove(file)
+				if err != nil {
+					l.Warnln("Versioner: can't remove file", file, err)
+				}
+				continue
+			}
+
+			if firstFile {
+				prevAge = age
+				firstFile = false
+				continue
+			}
+
+			if prevAge-age < usedInterval.step {
+				if debug {
+					l.Debugln("too many files in step -> delete", file)
+				}
+				err = os.Remove(file)
+				if err != nil {
+					l.Warnln("Versioner: can't remove file", file, err)
+				}
+				continue
+			}
+			prevAge = age
+
+		} else {
+			l.Warnln("Versioner: folder", file, "is named like a file version")
+		}
+
+	}
+
+}
+
+// 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 Staggered) Archive(filePath string) error {
+	if debug {
+		l.Debugln("Waiting for lock on ", v.versionsPath)
+	}
+	v.mutex.Lock()
+	defer v.mutex.Unlock()
+
+	_, err := os.Stat(filePath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			if debug {
+				l.Debugln("not archiving nonexistent file", filePath)
+			}
+			return nil
+		} else {
+			return err
+		}
+	}
+
+	_, err = os.Stat(v.versionsPath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			if debug {
+				l.Debugln("creating versions dir", v.versionsPath)
+			}
+			os.MkdirAll(v.versionsPath, 0755)
+			osutil.HideFile(v.versionsPath)
+		} else {
+			return err
+		}
+	}
+
+	if debug {
+		l.Debugln("archiving", filePath)
+	}
+
+	file := filepath.Base(filePath)
+	inRepoPath, err := filepath.Rel(v.repoPath, filepath.Dir(filePath))
+	if err != nil {
+		return err
+	}
+
+	dir := filepath.Join(v.versionsPath, inRepoPath)
+	err = os.MkdirAll(dir, 0755)
+	if err != nil && !os.IsExist(err) {
+		return err
+	}
+	ver := file + ".v" + fmt.Sprintf("%010d", time.Now().Unix())
+	dst := filepath.Join(dir, ver)
+	if debug {
+		l.Debugln("moving to", dst)
+	}
+	err = osutil.Rename(filePath, dst)
+	if err != nil {
+		return err
+	}
+
+	versions, err := filepath.Glob(filepath.Join(dir, file+".v[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("Versioner: error finding versions for", file, err)
+		return nil
+	}
+
+	sort.Strings(versions)
+	expire(versions, v)
+
+	return nil
+}

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio