haeaeae/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Created cleanup functionality for syncthing (#6884)

Browse Source 
* Add clean up for Simple File Versioning pt.1

created test

* Add clean up for Simple File Versioning pt.2

Passing the test

* stuck on how javascript communicates with backend

* Add trash clean up for Simple File Versioning

Add trash clean up functionality of to allow the user to delete backups
after specified amount of days.

* Fixed html and js style

* Refactored cleanup test cases

Refactored cleanup test cases to one file and deleted duplicated code.

* Added copyright to test file

* Refactor folder cleanout to utility function

* change utility function to package private

* refactored utility function; fixed build errors

* Updated copyright year.

* refactor test and logging

* refactor html and js

* revert style change in html

* reverted changes in html and some js

* checkout origin head version edit...html

* checkout upstream master and correct file
This commit is contained in:
Rahmi Pruitt
2020-08-24 12:14:30 +01:00
committed by GitHub
parent dfc3525cf7
commit 5b953033c7
8 changed files with 160 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/default/syncthing/core/syncthingController.js
+8 -5
View File
@@ -663,7 +663,7 @@ angular.module('syncthing.core')
function setDefaultTheme() {
if (!document.getElementById("fallback-theme-css")){
if (!document.getElementById("fallback-theme-css")) {
// check if no support for prefers-color-scheme
var colorSchemeNotSupported = typeof window.matchMedia === "undefined" || window.matchMedia('(prefers-color-scheme: dark)').media === 'not all';
@@ -671,8 +671,8 @@ angular.module('syncthing.core')
if ($scope.config.gui.theme === "default" && colorSchemeNotSupported) {
document.documentElement.style.display = 'none';
document.head.insertAdjacentHTML(
'beforeend',
'<link id="fallback-theme-css" rel="stylesheet" href="theme-assets/light/assets/css/theme.css" onload="document.documentElement.style.display = \'\'">'
'beforeend',
'<link id="fallback-theme-css" rel="stylesheet" href="theme-assets/light/assets/css/theme.css" onload="document.documentElement.style.display = \'\'">'
);
}
}
@@ -1733,7 +1733,7 @@ angular.module('syncthing.core')
});
$scope.currentFolder.unrelatedDevices = $scope.devices.filter(function (n) {
return n.deviceID !== $scope.myID
&& ! $scope.currentFolder.selectedDevices[n.deviceID]
&& !$scope.currentFolder.selectedDevices[n.deviceID]
});
if ($scope.currentFolder.versioning && $scope.currentFolder.versioning.type === "trashcan") {
$scope.currentFolder.trashcanFileVersioning = true;
@@ -1744,6 +1744,8 @@ angular.module('syncthing.core')
$scope.currentFolder.simpleFileVersioning = true;
$scope.currentFolder.fileVersioningSelector = "simple";
$scope.currentFolder.simpleKeep = +$scope.currentFolder.versioning.params.keep;
$scope.currentFolder.versioningCleanupIntervalS = +$scope.currentFolder.versioning.cleanupIntervalS;
$scope.currentFolder.trashcanClean = +$scope.currentFolder.versioning.params.cleanoutDays;
} else if ($scope.currentFolder.versioning && $scope.currentFolder.versioning.type === "staggered") {
$scope.currentFolder.staggeredFileVersioning = true;
$scope.currentFolder.fileVersioningSelector = "staggered";
@@ -1878,7 +1880,8 @@ angular.module('syncthing.core')
folderCfg.versioning = {
'type': 'simple',
'params': {
'keep': '' + folderCfg.simpleKeep
'keep': '' + folderCfg.simpleKeep,
'cleanoutDays': '' + folderCfg.trashcanClean
},
'cleanupIntervalS': folderCfg.versioningCleanupIntervalS
};