From a4ceb2f513a46f23cfb1aa6c3d7d24bc553019ad Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Fri, 12 Jun 2020 19:11:14 +0200
Subject: [PATCH] Add current bandwidth throughput to webinterface

---
 .../recorder/server/RecorderServlet.java      | 10 ++++++++--
 .../src/main/resources/html/static/index.html | 19 +++++++++++++------
 .../main/resources/html/static/recordings.js  |  5 +++++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java b/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java
index bb433526..136a0037 100644
--- a/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java
+++ b/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java
@@ -23,6 +23,7 @@ import com.squareup.moshi.Moshi;
 
 import ctbrec.Model;
 import ctbrec.Recording;
+import ctbrec.io.BandwidthMeter;
 import ctbrec.io.InstantJsonAdapter;
 import ctbrec.io.ModelJsonAdapter;
 import ctbrec.recorder.Recorder;
@@ -186,8 +187,13 @@ public class RecorderServlet extends AbstractCtbrecServlet {
                     resp.getWriter().write(response);
                     break;
                 case "space":
-                    response = "{\"status\": \"success\", \"spaceTotal\": "+recorder.getTotalSpaceBytes()+", \"spaceFree\": "+recorder.getFreeSpaceBytes()+"}";
-                    resp.getWriter().write(response);
+                    JSONObject jsonResponse = new JSONObject();
+                    jsonResponse.put("status", "success");
+                    jsonResponse.put("spaceTotal", recorder.getTotalSpaceBytes());
+                    jsonResponse.put("spaceFree", recorder.getFreeSpaceBytes());
+                    jsonResponse.put("throughput", BandwidthMeter.getThroughput());
+                    jsonResponse.put("throughputTimeframe", BandwidthMeter.MEASURE_TIMEFRAME.getSeconds());
+                    resp.getWriter().write(jsonResponse.toString());
                     break;
                 case "changePriority":
                     recorder.priorityChanged(request.model);
diff --git a/server/src/main/resources/html/static/index.html b/server/src/main/resources/html/static/index.html
index 060b6d01..dd0d9aeb 100644
--- a/server/src/main/resources/html/static/index.html
+++ b/server/src/main/resources/html/static/index.html
@@ -122,13 +122,14 @@
 				<div class="row">
 					<div class="col-lg-4 mx-auto">
 						Space left: <span data-bind="text: space.text()"></span>
-						<div class="progress">
-							<div class="progress-bar progress-bar-striped" role="progressbar" aria-valuemin="0" 
+						<span data-bind="text: throughput.text()" style="float:right"></span>
+						<span class="progress">
+							<span class="progress-bar progress-bar-striped" role="progressbar" aria-valuemin="0" 
 								data-bind="attr: {'aria-valuemax': space.total, 'aria-valuenow': space.free},
 									style: { width: space.percent() + '%' },
 									text: space.percent() + '%'">
-							</div>
-						</div>
+							</span>
+						</span>
 					</div>
 				</div>
 				<div class="row">
@@ -162,7 +163,7 @@
 											<button class="btn btn-secondary fa fa-download" title="Download recording" data-bind="enable: ko_status() == 'FINISHED' && singleFile, click: download"></button>
 										</td>
 										<td>
-											<button class="btn btn-secondary fa fa-trash" title="Delete recording" data-bind="enable: ko_status() == 'FINISHED', click: ctbrec.deleteRecording"></button>
+											<button class="btn btn-secondary fa fa-trash" title="Delete recording" data-bind="enable: (ko_status() == 'FINISHED' || ko_status() == 'WAITING'), click: ctbrec.deleteRecording"></button>
 										</td>
 									</tr>
 								</tbody>
@@ -253,6 +254,11 @@
 			percent: ko.observable(0),
 			text: ko.observable('')
 		};
+		let throughput = {
+			bytes: ko.observable(0),
+			timeframe: ko.observable(0),
+			text: ko.observable('')
+		};
 		let hmac;
 
 		function addModelKeyPressed(e) {
@@ -464,7 +470,8 @@
 				models : observableModelsArray,
 				recordings: observableRecordingsArray,
 				settings: observableSettingsArray,
-				space
+				space,
+				throughput
 			});
 
 			updateOnlineModels();
diff --git a/server/src/main/resources/html/static/recordings.js b/server/src/main/resources/html/static/recordings.js
index 6fbd79a1..9380eb82 100644
--- a/server/src/main/resources/html/static/recordings.js
+++ b/server/src/main/resources/html/static/recordings.js
@@ -192,6 +192,11 @@ function updateDiskSpace() {
             space.free(data.spaceFree);
             space.percent((data.spaceFree / data.spaceTotal * 100).toFixed(2));
             space.text(calculateSize(data.spaceFree) + ' / ' + calculateSize(data.spaceTotal));
+            throughput.bytes(data.throughput);
+            throughput.timeframe(data.throughputTimeframe);
+            let bytesPerSecond = data.throughput / data.throughputTimeframe;
+            console.log(data.throughput, data.throughputTimeframe, bytesPerSecond, calculateSize(bytesPerSecond) + '/s');
+            throughput.text(calculateSize(bytesPerSecond) + '/s');
         } else {
             if (console)
                 console.log('request failed', data);