| Folder Type |
@@ -822,6 +828,7 @@
+
diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js
index 50fc0ccc..b98e288e 100755
--- a/gui/default/syncthing/core/syncthingController.js
+++ b/gui/default/syncthing/core/syncthingController.js
@@ -46,6 +46,7 @@ angular.module('syncthing.core')
$scope.neededCurrentPage = 1;
$scope.neededPageSize = 10;
$scope.failed = {};
+ $scope.localChanged = {};
$scope.scanProgress = {};
$scope.themes = [];
$scope.globalChangeEvents = {};
@@ -672,6 +673,15 @@ angular.module('syncthing.core')
});
};
+ $scope.refreshLocalChanged = function (page, perpage) {
+ var url = urlbase + '/db/localchanged?folder=';
+ url += encodeURIComponent($scope.localChanged.folder);
+ url += "&page=" + page + "&perpage=" + perpage;
+ $http.get(url).success(function (data) {
+ $scope.localChanged = data;
+ }).error($scope.emitHTTPError);
+ };
+
var refreshDeviceStats = debounce(function () {
$http.get(urlbase + "/stats/device").success(function (data) {
$scope.deviceStats = data;
@@ -737,7 +747,7 @@ angular.module('syncthing.core')
if (state === 'error') {
return 'stopped'; // legacy, the state is called "stopped" in the GUI
}
- if (state === 'idle' && $scope.neededItems(folderCfg.id) > 0) {
+ if (state === 'idle' && $scope.model[folderCfg.id].needTotalItems > 0) {
return 'outofsync';
}
if (state === 'scanning') {
@@ -776,15 +786,6 @@ angular.module('syncthing.core')
return 'info';
};
- $scope.neededItems = function (folderID) {
- if (!$scope.model[folderID]) {
- return 0
- }
-
- return $scope.model[folderID].needFiles + $scope.model[folderID].needDirectories +
- $scope.model[folderID].needSymlinks + $scope.model[folderID].needDeletes;
- };
-
$scope.syncPercentage = function (folder) {
if (typeof $scope.model[folder] === 'undefined') {
return 100;
@@ -2194,6 +2195,14 @@ angular.module('syncthing.core')
$http.post(urlbase + "/db/override?folder=" + encodeURIComponent(folder));
};
+ $scope.showLocalChanged = function (folder) {
+ $scope.localChanged.folder = folder;
+ $scope.localChanged = $scope.refreshLocalChanged(1, 10);
+ $('#localChanged').modal().one('hidden.bs.modal', function () {
+ $scope.localChanged = {};
+ });
+ };
+
$scope.revert = function (folder) {
$http.post(urlbase + "/db/revert?folder=" + encodeURIComponent(folder));
};
@@ -2203,11 +2212,7 @@ angular.module('syncthing.core')
if (!f) {
return false;
}
- return f.receiveOnlyChangedBytes > 0 ||
- f.receiveOnlyChangedDeletes > 0 ||
- f.receiveOnlyChangedDirectories > 0 ||
- f.receiveOnlyChangedFiles > 0 ||
- f.receiveOnlyChangedSymlinks > 0;
+ return $scope.model[folder].receiveOnlyTotalItems > 0;
};
$scope.advanced = function () {
diff --git a/gui/default/syncthing/transfer/localChangedFilesModalView.html b/gui/default/syncthing/transfer/localChangedFilesModalView.html
new file mode 100644
index 00000000..48af20ca
--- /dev/null
+++ b/gui/default/syncthing/transfer/localChangedFilesModalView.html
@@ -0,0 +1,31 @@
+
+
+
+ The following items were changed locally.
+
+
+
+
+ | Path |
+ Size |
+
+
+
+ | {{file.name}} |
+ {{file.size | binary}}B |
+
+
+
+
+
+
-
+
|
diff --git a/lib/db/set.go b/lib/db/set.go
index a7c8824c..2889eeff 100644
--- a/lib/db/set.go
+++ b/lib/db/set.go
@@ -45,6 +45,7 @@ type FileIntf interface {
IsIgnored() bool
IsUnsupported() bool
MustRescan() bool
+ IsReceiveOnlyChanged() bool
IsDirectory() bool
IsSymlink() bool
ShouldConflict() bool
diff --git a/lib/db/structs.go b/lib/db/structs.go
index 0b2b236e..671337d9 100644
--- a/lib/db/structs.go
+++ b/lib/db/structs.go
@@ -142,6 +142,10 @@ func (c Counts) Add(other Counts) Counts {
}
}
+func (c Counts) TotalItems() int32 {
+ return c.Files + c.Directories + c.Symlinks + c.Deleted
+}
+
func (vl VersionList) String() string {
var b bytes.Buffer
var id protocol.DeviceID
diff --git a/lib/model/model.go b/lib/model/model.go
index 689b9cb6..d2c84357 100644
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -797,12 +797,10 @@ func (m *Model) NeedFolderFiles(folder string, page, perpage int) ([]db.FileInfo
skip--
return true
}
- if get > 0 {
- ft := f.(db.FileInfoTruncated)
- if _, ok := seen[ft.Name]; !ok {
- rest = append(rest, ft)
- get--
- }
+ ft := f.(db.FileInfoTruncated)
+ if _, ok := seen[ft.Name]; !ok {
+ rest = append(rest, ft)
+ get--
}
return get > 0
})
@@ -810,6 +808,47 @@ func (m *Model) NeedFolderFiles(folder string, page, perpage int) ([]db.FileInfo
return progress, queued, rest
}
+// LocalChangedFiles returns a paginated list of currently needed files in
+// progress, queued, and to be queued on next puller iteration, as well as the
+// total number of files currently needed.
+func (m *Model) LocalChangedFiles(folder string, page, perpage int) []db.FileInfoTruncated {
+ m.fmut.RLock()
+ defer m.fmut.RUnlock()
+
+ rf, ok := m.folderFiles[folder]
+ if !ok {
+ return nil
+ }
+ fcfg := m.folderCfgs[folder]
+ if fcfg.Type != config.FolderTypeReceiveOnly {
+ return nil
+ }
+ if rf.ReceiveOnlyChangedSize().TotalItems() == 0 {
+ return nil
+ }
+
+ files := make([]db.FileInfoTruncated, 0, perpage)
+
+ skip := (page - 1) * perpage
+ get := perpage
+
+ rf.WithHaveTruncated(protocol.LocalDeviceID, func(f db.FileIntf) bool {
+ if !f.IsReceiveOnlyChanged() {
+ return true
+ }
+ if skip > 0 {
+ skip--
+ return true
+ }
+ ft := f.(db.FileInfoTruncated)
+ files = append(files, ft)
+ get--
+ return get > 0
+ })
+
+ return files
+}
+
// RemoteNeedFolderFiles returns paginated list of currently needed files in
// progress, queued, and to be queued on next puller iteration, as well as the
// total number of files currently needed.
@@ -833,10 +872,8 @@ func (m *Model) RemoteNeedFolderFiles(device protocol.DeviceID, folder string, p
skip--
return true
}
- if get > 0 {
- files = append(files, f.(db.FileInfoTruncated))
- get--
- }
+ files = append(files, f.(db.FileInfoTruncated))
+ get--
return get > 0
})
| |