octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-08 14:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show 100% complete status for nodes without any files to sync (fixes #453)

Browse Source
This commit is contained in:
Jakob Borg 2014-08-05 20:16:25 +02:00
parent b2c196e5c7
commit 62d703f967
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto/gui.files.go
View File

File diff suppressed because one or more lines are too long

8
gui/app.js
View File

@ -168,6 +168,9 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
OutBytesTotal: 0, OutBytesTotal: 0,
Address: arg.data.addr, Address: arg.data.addr,
}; };
$scope.completion[arg.data.id] = {
_total: 100,
};
} }
}); });
@ -284,6 +287,11 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
$scope.config.Options.ListenStr = $scope.config.Options.ListenAddress.join(', '); $scope.config.Options.ListenStr = $scope.config.Options.ListenAddress.join(', ');
$scope.nodes = $scope.config.Nodes; $scope.nodes = $scope.config.Nodes;
$scope.nodes.forEach(function (nodeCfg) {
$scope.completion[nodeCfg.NodeID] = {
_total: 100,
};
});
$scope.nodes.sort(nodeCompare); $scope.nodes.sort(nodeCompare);
$scope.repos = repoMap($scope.config.Repositories); $scope.repos = repoMap($scope.config.Repositories);

16
model/model.go
View File

@ -199,7 +199,15 @@ func (m *Model) ConnectionStats() map[string]ConnectionInfo {
// Returns the completion status, in percent, for the given node and repo. // Returns the completion status, in percent, for the given node and repo.
func (m *Model) Completion(node protocol.NodeID, repo string) float64 { func (m *Model) Completion(node protocol.NodeID, repo string) float64 {
var tot int64 var tot int64
m.repoFiles[repo].WithGlobal(func(f protocol.FileInfo) bool {
m.rmut.RLock()
rf, ok := m.repoFiles[repo]
m.rmut.RUnlock()
if !ok {
return 0 // Repo doesn't exist, so we hardly have any of it
}
rf.WithGlobal(func(f protocol.FileInfo) bool {
if !protocol.IsDeleted(f.Flags) { if !protocol.IsDeleted(f.Flags) {
var size int64 var size int64
if protocol.IsDirectory(f.Flags) { if protocol.IsDirectory(f.Flags) {
@ -212,8 +220,12 @@ func (m *Model) Completion(node protocol.NodeID, repo string) float64 {
return true return true
}) })
if tot == 0 {
return 100 // Repo is empty, so we have all of it
}
var need int64 var need int64
m.repoFiles[repo].WithNeed(node, func(f protocol.FileInfo) bool { rf.WithNeed(node, func(f protocol.FileInfo) bool {
if !protocol.IsDeleted(f.Flags) { if !protocol.IsDeleted(f.Flags) {
var size int64 var size int64
if protocol.IsDirectory(f.Flags) { if protocol.IsDirectory(f.Flags) {