Add: more checks in webui

nzbgetcom · Jan 29, 2025 · 308b608 · 308b608
1 parent 29e68b7
commit 308b608
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 20 deletions.
diff --git a/webui/system-info.js b/webui/system-info.js
@@ -490,7 +490,7 @@ var SystemInfo = (new function($)
 
 	function renderNetworkSpeedTestBtn()
 	{
-		var savedResults = Util.getFromLocalStorage(NETWORK_SPEED_TEST_LS_KEY);
+		var savedResults = Number(Util.getFromLocalStorage(NETWORK_SPEED_TEST_LS_KEY));
 		if (savedResults && !NETWORK_SPEED_TEST_RUNNING)
 		{
 			renderNetworkSpeedTestResults(savedResults);
@@ -500,7 +500,7 @@ var SystemInfo = (new function($)
 			$SysInfo_NetworkSpeedTestBtn.html(SPINNER);
 		}
 
-		var savedDate = Util.getFromLocalStorage(NETWORK_SPEED_TEST_DATE_LS_KEY);
+		var savedDate = Number(Util.getFromLocalStorage(NETWORK_SPEED_TEST_DATE_LS_KEY));
 		if (savedDate)
 		{
 			renderNetworkSpeedTestBtnTitle(savedDate);
@@ -519,15 +519,17 @@ var SystemInfo = (new function($)
 					var date = Date.now();
 					Util.saveToLocalStorage(NETWORK_SPEED_TEST_LS_KEY, rawRes.SpeedMbps);
 					Util.saveToLocalStorage(NETWORK_SPEED_TEST_DATE_LS_KEY, date);
-					$SysInfo_NetworkSpeedTestBtn.html(Util.formatNetworkSpeed(rawRes.SpeedMbps));
+					$SysInfo_NetworkSpeedTestBtn
+						.html(Util.formatNetworkSpeed(rawRes.SpeedMbps))
+						.removeClass('btn--disabled');
 					renderNetworkSpeedTestBtnTitle(date);
-					$SysInfo_NetworkSpeedTestBtn.removeClass('btn--disabled');
 					NETWORK_SPEED_TEST_RUNNING = false;
 				}, 
 				function(res) 
 				{
-					$SysInfo_NetworkSpeedTestBtn.text(TEST_BTN_DEFAULT_TEXT);
-					$SysInfo_NetworkSpeedTestBtn.removeClass('btn--disabled');
+					$SysInfo_NetworkSpeedTestBtn
+						.text(TEST_BTN_DEFAULT_TEXT)
+						.removeClass('btn--disabled');
 					removeNetworkSpeedTestBtnTitle();
 					var errTxt = res.split('<br>')[0];
 					$SysInfo_NetworkSpeedTestErrorTxt.html(errTxt);
@@ -556,7 +558,7 @@ var SystemInfo = (new function($)
 		var formatted = Util.formatNetworkSpeed(results);
 		if (formatted)
 		{
-			$SysInfo_NetworkSpeedTestBtn.text(Util.formatNetworkSpeed(results));
+			$SysInfo_NetworkSpeedTestBtn.text(formatted);
 		}
 	}
 

diff --git a/webui/util.js b/webui/util.js
@@ -104,9 +104,14 @@ var Util = (new function($)
 		return seconds + 's';
 	}
 
+	this.isNumber = function(value)
+	{
+		return typeof value === 'number';
+	}
+
 	this.formatDateTime = function(unixTime)
 	{
-		if (!unixTime || unixTime < 0)
+		if (!Util.isNumber(unixTime) || unixTime < 0)
 		{
 			return '';
 		}
@@ -165,7 +170,7 @@ var Util = (new function($)
 
 	this.formatSpeed = function (bytesPerSec) 
 	{
-		if (bytesPerSec <= 0)
+		if (!Util.isNumber(speedMbps) || bytesPerSec <= 0) 
 		{
 			return '';
 		}
@@ -200,6 +205,11 @@ var Util = (new function($)
 
 	this.formatNetworkSpeed = function(speedMbps) 
 	{
+		if (!Util.isNumber(speedMbps))
+		{
+			return '';
+		}
+
 		if (!speedMbps || speedMbps < 0)
 		{
 			return '';
@@ -209,29 +219,24 @@ var Util = (new function($)
 		{
 			return Util.round1(speedMbps / 10000) + ' Gbps';
 		}
-
 		if (speedMbps >= 1000) 
 		{
 			return Util.round1(speedMbps / 1000) + ' Gbps';
-		}
+		} 
 		else if (speedMbps >= 100) 
 		{
-				return Util.round0(speedMbps) + ' Mbps';
-		}
+			return Util.round0(speedMbps) + ' Mbps';
+		} 
 		else if (speedMbps >= 10) 
 		{
 			return Util.round1(speedMbps) + ' Mbps';
-		}
+		} 
 		else if (speedMbps >= 1) 
 		{
 			return Util.round2(speedMbps) + ' Mbps';
 		}
-		else if (speedMbps >= 0.1)
-		{
-			return Util.round0(speedMbps * 1000) + ' Kbps';
-		}
-
-		return Util.round0(speedMbps * 1000) + ' Bbps';
+
+		return Util.round0(speedMbps * 1000) + ' Kbps';
 	}
 
 	this.formatSpeedWithCustomUnit = function (bytesPerSec, unit)