From 9fc2a0c4c5b0351f07884bed56bda468039eb1d0 Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Sun, 11 Oct 2020 17:42:47 +0100
Subject: [PATCH] show total up & down speeds

---
 .../muwire/core/download/DownloadManager.groovy  |   6 ++++++
 .../models/com/muwire/gui/MainFrameModel.groovy  |  13 ++++++++++++-
 gui/griffon-app/resources/down_arrow.png         | Bin 0 -> 1840 bytes
 gui/griffon-app/resources/up_arrow.png           | Bin 0 -> 1847 bytes
 .../views/com/muwire/gui/MainFrameView.groovy    |  15 ++++++++++++++-
 5 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 gui/griffon-app/resources/down_arrow.png
 create mode 100644 gui/griffon-app/resources/up_arrow.png

diff --git a/core/src/main/groovy/com/muwire/core/download/DownloadManager.groovy b/core/src/main/groovy/com/muwire/core/download/DownloadManager.groovy
index 69e1e832..8180197b 100644
--- a/core/src/main/groovy/com/muwire/core/download/DownloadManager.groovy
+++ b/core/src/main/groovy/com/muwire/core/download/DownloadManager.groovy
@@ -255,4 +255,10 @@ public class DownloadManager {
     public boolean isDownloading(InfoHash infoHash) {
         downloaders.containsKey(infoHash)
     }
+    
+    public int totalDownloadSpeed() {
+        int total = 0
+        downloaders.values().each { total += it.speed() }
+        total
+    }
 }
diff --git a/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy b/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
index 3f6198f8..f93b479b 100644
--- a/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
@@ -143,6 +143,9 @@ class MainFrameModel {
     @Observable boolean chatServerRunning
     
     @Observable Downloader downloader
+    
+    @Observable int downSpeed
+    @Observable int upSpeed
 
     private final Set<InfoHash> downloadInfoHashes = new ConcurrentHashSet<>()
 
@@ -208,6 +211,14 @@ class MainFrameModel {
                 updateTablePreservingSelection("downloads-table")
                 updateTablePreservingSelection("trusted-table")
                 updateTablePreservingSelection("distrusted-table")
+                
+                int totalUpload = 0
+                uploads.each { 
+                    totalUpload += it.speed()
+                }
+                upSpeed = totalUpload
+                if (core != null) 
+                    downSpeed = core.downloadManager.totalDownloadSpeed()
             }
         }, 1000, 1000)
 
@@ -682,7 +693,7 @@ class MainFrameModel {
         
         public int speed() {
             
-            if (finished)
+            if (finished) 
                 return 0
 
             initIfNeeded()
diff --git a/gui/griffon-app/resources/down_arrow.png b/gui/griffon-app/resources/down_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f6d3f595e0893d6c2a7f794fcbf76b2b886707e
GIT binary patch
literal 1840
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

literal 0
HcmV?d00001

diff --git a/gui/griffon-app/resources/up_arrow.png b/gui/griffon-app/resources/up_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..7001e7531e29babd70fd8d3737ef2643f4812fc7
GIT binary patch
literal 1847
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

literal 0
HcmV?d00001

diff --git a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
index d973e37d..cf290c8b 100644
--- a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
@@ -593,8 +593,21 @@ class MainFrameView {
                         button(text : trans("COPY_SHORT"), constraints : gbc(gridx:1, gridy:0), copyShortAction)
                         button(text : trans("COPY_FULL"), constraints : gbc(gridx:2, gridy:0), copyFullAction)
                     }
+                    panel (constraints : BorderLayout.CENTER) {
+                        gridBagLayout()
+                        panel (constraints : gbc(gridx : 0, gridy : 0)){
+                            borderLayout()
+                            label(icon : imageIcon('/down_arrow.png'), constraints : BorderLayout.CENTER)
+                            label(text : bind { DataHelper.formatSize2Decimal(model.downSpeed, false) + trans("B_SEC") }, constraints : BorderLayout.EAST)
+                        }
+                        panel (constraints : gbc(gridx: 1, gridy : 0)){
+                            borderLayout()
+                            label(icon : imageIcon('/up_arrow.png'), constraints : BorderLayout.CENTER)
+                            label(text : bind { DataHelper.formatSize2Decimal(model.upSpeed, false) + trans("B_SEC") }, constraints : BorderLayout.EAST)
+                        }
+                    }
                     panel (constraints : BorderLayout.EAST) {
-                        label(trans("CONNECTIONS") + ":")
+                        label("   " + trans("CONNECTIONS") + ":")
                         label(text : bind {model.connections})
                     }
                 }