perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Report all rates in bytes per second (fixes #934)

Browse Source
This commit is contained in:
Jakob Borg
2014-11-26 17:30:52 +01:00
parent ed85bfa915
commit 34cb305755
4 changed files with 10 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/scripts/syncthing/core/controllers/syncthingController.js
View File

@@ -320,8 +320,8 @@ angular.module('syncthing.core')
continue;
}
try {
data[id].inbps = Math.max(0, 8 * (data[id].InBytesTotal - $scope.connections[id].InBytesTotal) / td);
data[id].outbps = Math.max(0, 8 * (data[id].OutBytesTotal - $scope.connections[id].OutBytesTotal) / td);
data[id].inbps = Math.max(0, (data[id].InBytesTotal - $scope.connections[id].InBytesTotal) / td);
data[id].outbps = Math.max(0, (data[id].OutBytesTotal - $scope.connections[id].OutBytesTotal) / td);
} catch (e) {
data[id].inbps = 0;
data[id].outbps = 0;

21
gui/scripts/syncthing/core/filters/metricFilter.js
View File

@@ -1,21 +0,0 @@
angular.module('syncthing.core')
.filter('metric', function () {
return function (input) {
if (input === undefined) {
return '0 ';
}
if (input > 1000 * 1000 * 1000) {
input /= 1000 * 1000 * 1000;
return input.toFixed(decimals(input, 2)) + ' G';
}
if (input > 1000 * 1000) {
input /= 1000 * 1000;
return input.toFixed(decimals(input, 2)) + ' M';
}
if (input > 1000) {
input /= 1000;
return input.toFixed(decimals(input, 2)) + ' k';
}
return Math.round(input) + ' ';
};
});