diff --git a/app/src/components/admin/Status.js b/app/src/components/admin/Status.js
index 6d08b73c..17867a42 100644
--- a/app/src/components/admin/Status.js
+++ b/app/src/components/admin/Status.js
@@ -21,7 +21,8 @@ function DriveInfo({used, size, percent, mount}) {
}
function DiskBandwidthProgress({bytes_ps, total, label, ...props}) {
- let percent = bytes_ps / total;
+ // Calculate percent so colors can be shown.
+ let percent = (bytes_ps / total) * 100;
percent = percent || 0;
let color = null;
if (percent >= 90) {
@@ -35,19 +36,17 @@ function DiskBandwidthProgress({bytes_ps, total, label, ...props}) {
return ;
}
-function DiskBandwidth({name, bytes_read_ps, bytes_write_ps}) {
- const total = 10_000_000; // Arbitrary size. What is the real speed of the disk?
-
+function DiskBandwidth({name, bytes_read_ps, bytes_write_ps, maximum_read_ps, maximum_write_ps}) {
const read = ;
const write = Tuple[List[NICBandwidthInfo], List[DiskBandwidthInfo]]:
- """Get all bandwidth information for all NICs."""
+ """Get all bandwidth information for all NICs and Disks."""
nics_info = []
disks_info = []
+
try:
for name in sorted(BANDWIDTH.keys()):
nic = BANDWIDTH[name]
@@ -402,11 +408,25 @@ async def get_bandwidth_info() -> Tuple[List[NICBandwidthInfo], List[DiskBandwid
if any(name.startswith(i) for i in IGNORED_DISK_NAMES):
continue
used_disks.append(name)
+
+ try:
+ maximum_read_ps = max(disk['bytes_read_ps'], MAX_DISKS_BANDWIDTH[name]['maximum_read_ps'])
+ maximum_write_ps = max(disk['bytes_write_ps'], MAX_DISKS_BANDWIDTH[name]['maximum_write_ps'])
+ except KeyError as e:
+ # Use a low first value. Hopefully all drives are capable of this speed.
+ maximum_read_ps = 500_000
+ maximum_write_ps = 500_000
+ # Always write the new maximums.
+ value = {name: {'maximum_read_ps': maximum_read_ps, 'maximum_write_ps': maximum_write_ps}}
+ MAX_DISKS_BANDWIDTH.update(value)
+
disks_info.append(DiskBandwidthInfo(
bytes_read_ps=disk['bytes_read_ps'],
bytes_write_ps=disk['bytes_write_ps'],
elapsed=disk['elapsed'],
name=name,
+ maximum_read_ps=maximum_read_ps,
+ maximum_write_ps=maximum_write_ps,
))
except Exception as e:
warn_once(e)
diff --git a/wrolpi/test/test_status.py b/wrolpi/test/test_status.py
index a7ce1b91..0d9a34d6 100644
--- a/wrolpi/test/test_status.py
+++ b/wrolpi/test/test_status.py
@@ -33,7 +33,6 @@ async def test_get_cpu_info():
info = await status.get_cpu_info()
assert isinstance(info, status.CPUInfo)
assert isinstance(info.percent, int)
- assert info.temperature >= 0
@pytest.mark.asyncio