From 956d212e9995d1e2a958d5d92b23eec9124b83be Mon Sep 17 00:00:00 2001
From: Simon Frei
Date: Thu, 25 Feb 2021 18:24:18 +0100
Subject: [PATCH] gui: Folder versioning editing cleanup (#7384)
---
.../syncthing/core/syncthingController.js | 69 +++++++------------
.../syncthing/folder/editFolderModalView.html | 4 +-
.../syncthing/core/syncthingController.js | 69 +++++++------------
.../syncthing/folder/editFolderModalView.html | 4 +-
4 files changed, 56 insertions(+), 90 deletions(-)
diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js
index 95850b3ff..73acf28e0 100755
--- a/gui/default/syncthing/core/syncthingController.js
+++ b/gui/default/syncthing/core/syncthingController.js
@@ -67,7 +67,7 @@ angular.module('syncthing.core')
$scope.versioningDefaults = {
selector: "none",
trashcanClean: 0,
- versioningCleanupIntervalS: 3600,
+ cleanupIntervalS: 3600,
simpleKeep: 5,
staggeredMaxAge: 365,
staggeredCleanInterval: 3600,
@@ -1886,38 +1886,42 @@ angular.module('syncthing.core')
editFolderModal();
}
+ $scope.internalVersioningEnabled = function(guiVersioning) {
+ if (!$scope.currentFolder._guiVersioning) {
+ return false;
+ }
+ return ['none', 'external'].indexOf($scope.currentFolder._guiVersioning.selector) === -1;
+ };
+
function initVersioningEditing() {
$scope.currentFolder._guiVersioning = angular.copy($scope.versioningDefaults);
- if (!$scope.currentFolder.versioning) {
+ var currentVersioning = $scope.currentFolder.versioning;
+
+ if (!currentVersioning || !currentVersioning.type || currentVersioning.type === 'none') {
return;
}
- var currentVersioning = $scope.currentFolder.versioning;
-
$scope.currentFolder._guiVersioning.cleanupIntervalS = +currentVersioning.cleanupIntervalS;
+ $scope.currentFolder._guiVersioning.selector = currentVersioning.type;
+ if (currentVersioning.type !== 'external') {
+ $scope.currentFolder._guiVersioning.versionsPath = currentVersioning.params.versionsPath;
+ }
// Apply parameters currently in use
switch (currentVersioning.type) {
case "trashcan":
- $scope.currentFolder._guiVersioning.selector = "trashcan";
$scope.currentFolder._guiVersioning.trashcanClean = +currentVersioning.params.cleanoutDays;
- $scope.currentFolder._guiVersioning.versionsPath = currentVersioning.params.versionsPath;
break;
case "simple":
- $scope.currentFolder._guiVersioning.selector = "simple";
$scope.currentFolder._guiVersioning.simpleKeep = +currentVersioning.params.keep;
$scope.currentFolder._guiVersioning.trashcanClean = +currentVersioning.params.cleanoutDays;
- $scope.currentFolder._guiVersioning.versionsPath = currentVersioning.params.versionsPath;
break;
case "staggered":
- $scope.currentFolder._guiVersioning.selector = "staggered";
$scope.currentFolder._guiVersioning.staggeredMaxAge = Math.floor(+currentVersioning.params.maxAge / 86400);
$scope.currentFolder._guiVersioning.staggeredCleanInterval = +currentVersioning.params.cleanInterval;
- $scope.currentFolder._guiVersioning.versionsPath = currentVersioning.params.versionsPath;
break;
case "external":
- $scope.currentFolder._guiVersioning.selector = "external";
$scope.currentFolder._guiVersioning.externalCommand = currentVersioning.params.command;
break;
}
@@ -2038,46 +2042,25 @@ angular.module('syncthing.core')
folderCfg.devices = newDevices;
delete $scope.currentSharing;
+ folderCfg.versioning.type = folderCfg._guiVersioning.selector;
+ if ($scope.internalVersioningEnabled()) {
+ folderCfg.versioning.cleanupIntervalS = folderCfg._guiVersioning.cleanupIntervalS;
+ folderCfg.versioning.versionsPath = folderCfg._guiVersioning.versionsPath;
+ }
switch (folderCfg._guiVersioning.selector) {
case "trashcan":
- folderCfg.versioning = {
- 'type': 'trashcan',
- 'params': {
- 'cleanoutDays': '' + folderCfg._guiVersioning.trashcanClean,
- 'versionsPath': '' + folderCfg._guiVersioning.versionsPath
- },
- 'cleanupIntervalS': folderCfg._guiVersioning.cleanupIntervalS
- };
+ folderCfg.versioning.params.cleanoutDays = '' + folderCfg._guiVersioning.trashcanClean;
break;
case "simple":
- folderCfg.versioning = {
- 'type': 'simple',
- 'params': {
- 'keep': '' + folderCfg._guiVersioning.simpleKeep,
- 'cleanoutDays': '' + folderCfg._guiVersioning.trashcanClean,
- 'versionsPath': '' + folderCfg._guiVersioning.versionsPath
- },
- 'cleanupIntervalS': folderCfg._guiVersioning.cleanupIntervalS
- };
+ folderCfg.versioning.params.keep = '' + folderCfg._guiVersioning.simpleKeep,
+ folderCfg.versioning.params.cleanoutDays = '' + folderCfg._guiVersioning.trashcanClean;
break;
case "staggered":
- folderCfg.versioning = {
- 'type': 'staggered',
- 'params': {
- 'maxAge': '' + (folderCfg._guiVersioning.staggeredMaxAge * 86400),
- 'cleanInterval': '' + folderCfg._guiVersioning.staggeredCleanInterval,
- 'versionsPath': '' + folderCfg._guiVersioning.versionsPath
- },
- 'cleanupIntervalS': folderCfg._guiVersioning.cleanupIntervalS
- };
+ folderCfg.versioning.params.maxAge = '' + (folderCfg._guiVersioning.staggeredMaxAge * 86400);
+ folderCfg.versioning.params.cleanInterval = '' + folderCfg._guiVersioning.staggeredCleanInterval;
break;
case "external":
- folderCfg.versioning = {
- 'type': 'external',
- 'params': {
- 'command': '' + folderCfg._guiVersioning.externalCommand
- },
- };
+ folderCfg.versioning.params.command = '' + folderCfg._guiVersioning.externalCommand;
break;
default:
delete folderCfg.versioning;
diff --git a/gui/default/syncthing/folder/editFolderModalView.html b/gui/default/syncthing/folder/editFolderModalView.html
index 28f78aeab..f342bf5ec 100644
--- a/gui/default/syncthing/folder/editFolderModalView.html
+++ b/gui/default/syncthing/folder/editFolderModalView.html
@@ -132,7 +132,7 @@
A negative number of days doesn't make sense.
-