octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 03:18:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1616 from syncthing/rates

Browse Source 
Fix total transfer rates (fixes #1615)
This commit is contained in:
Jakob Borg 2015-04-09 13:08:49 +02:00
commit 509e2411bf
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/index.html
View File

@ -293,11 +293,11 @@
<tbody> <tbody>
<tr> <tr>
<th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Download Rate</span></th> <th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Download Rate</span></th>
<td class="text-right">{{connections_total.inbps | binary}}B/s ({{connections_total.inBytesTotal | binary}}B)</td> <td class="text-right">{{connectionsTotal.inbps | binary}}B/s ({{connectionsTotal.inBytesTotal | binary}}B)</td>
</tr> </tr>
<tr> <tr>
<th><span class="glyphicon glyphicon-cloud-upload"></span>&emsp;<span translate>Upload Rate</span></th> <th><span class="glyphicon glyphicon-cloud-upload"></span>&emsp;<span translate>Upload Rate</span></th>
<td class="text-right">{{connections_total.outbps | binary}}B/s ({{connections_total.outBytesTotal | binary}}B)</td> <td class="text-right">{{connectionsTotal.outbps | binary}}B/s ({{connectionsTotal.outBytesTotal | binary}}B)</td>
</tr> </tr>
<tr> <tr>
<th><span class="glyphicon glyphicon-th"></span>&emsp;<span translate>RAM Utilization</span></th> <th><span class="glyphicon glyphicon-th"></span>&emsp;<span translate>RAM Utilization</span></th>

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

@ -24,7 +24,6 @@ angular.module('syncthing.core')
$scope.config = {}; $scope.config = {};
$scope.configInSync = true; $scope.configInSync = true;
$scope.connections = {}; $scope.connections = {};
$scope.connections_total = {};
$scope.errors = []; $scope.errors = [];
$scope.model = {}; $scope.model = {};
$scope.myID = ''; $scope.myID = '';
@ -368,7 +367,16 @@ angular.module('syncthing.core')
id; id;
prevDate = now; prevDate = now;
$scope.connections_total = data['total'];
try {
data.total.inbps = Math.max(0, (data.total.inBytesTotal - $scope.connectionsTotal.inBytesTotal) / td);
data.total.outbps = Math.max(0, (data.total.outBytesTotal - $scope.connectionsTotal.outBytesTotal) / td);
} catch (e) {
data.total.inbps = 0;
data.total.outbps = 0;
}
$scope.connectionsTotal = data.total;
data = data.connections; data = data.connections;
for (id in data) { for (id in data) {
if (!data.hasOwnProperty(id)) { if (!data.hasOwnProperty(id)) {

6
internal/auto/gui.files.go
View File

File diff suppressed because one or more lines are too long