add upload rate display

boypt · Jul 25, 2019 · 91f27bd · 91f27bd
1 parent 2065686
commit 91f27bd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/engine/torrent.go b/engine/torrent.go
@@ -12,6 +12,7 @@ type Torrent struct {
 	Name       string
 	Loaded     bool
 	Downloaded int64
+	Uploaded   int64
 	Size       int64
 	Files      []*File
 	//cloud torrent
@@ -20,6 +21,7 @@ type Torrent struct {
 	DoneCmdCalled bool
 	Percent       float32
 	DownloadRate  float32
+	UploadRate 	  float32
 	SeedRatio	  float32
 	Stats         torrent.TorrentStats
 	t             *torrent.Torrent
@@ -84,24 +86,28 @@ func (torrent *Torrent) updateLoaded(t *torrent.Torrent) {
 		totalCompleted += file.Completed
 	}
 
+	torrent.Stats = t.Stats()
 	now := time.Now()
 	bytes := t.BytesCompleted()
+	ulbytes := torrent.Stats.BytesWrittenData.Int64()
 
 	// calculate rate
 	if !torrent.updatedAt.IsZero() {
-		dt := float32(now.Sub(torrent.updatedAt))
-		db := float32(bytes - torrent.Downloaded)
-		rate := db * (float32(time.Second) / dt)
-		if rate >= 0 {
-			torrent.DownloadRate = rate
-		}
+		dtinv := float32(time.Second) / float32(now.Sub(torrent.updatedAt))
+
+		dldb := float32(bytes - torrent.Downloaded)
+		torrent.DownloadRate = dldb * dtinv
+
+		uldb := float32(ulbytes - torrent.Uploaded)
+		torrent.UploadRate = uldb * dtinv
 	}
 
 	torrent.Downloaded = bytes
+	torrent.Uploaded = ulbytes
+
 	torrent.updatedAt = now
 	torrent.Percent = percent(bytes, torrent.Size)
 	torrent.Done = (bytes == torrent.Size)
-	torrent.Stats = t.Stats()
 
 	// calculate ratio
 	bRead := torrent.Stats.BytesReadData.Int64()

diff --git a/static/files.go b/static/files.go
diff --git a/static/files/template/torrents.html b/static/files/template/torrents.html
@@ -33,7 +33,7 @@ <h5 class="right">
           <div>Peers (Active / Pending / HalfOpen / Total):
             {{ t.Stats.ActivePeers }}/{{ t.Stats.PendingPeers }}/{{ t.Stats.HalfOpenPeers }}/{{ t.Stats.TotalPeers }}
           </div>
-          <div>Up / Down: {{ t.Stats.BytesWritten | bytes }} / {{ t.Stats.BytesRead | bytes }} | Ratio: {{ t.SeedRatio | round }}</div>
+          <div>Up: {{ t.Stats.BytesWritten | bytes }} / Down: {{ t.Stats.BytesRead | bytes }} / Ratio: {{ t.SeedRatio | round }}</div>
         </div>
         <div class="ui blue progress" ng-class="{active: t.Percent > 0 && t.Percent < 100}">
           <div class="bar" ng-style="{width: t.Percent + '%'}">
@@ -66,7 +66,7 @@ <h5 class="right">
           <span ng-class="{muted:t.Downloaded == 0}">{{t.Downloaded | bytes}}</span>
           <span> / {{t.Size | bytes}}</span>
           <span> - {{t.Percent }}% </span>
-          <span style="font-weight:bold" ng-class="{muted:t.DownloadRate == 0}"> - {{t.DownloadRate | bytes}}/s</span>
+          <span style="font-weight:bold" ng-class="{muted:t.DownloadRate == 0}"> - ↑{{t.UploadRate | bytes}}/s - ↓{{t.DownloadRate | bytes}}/s</span>
         </div>
       </div>
     </div>