mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2025-11-20 12:36:18 +00:00
Update AppImage
This commit is contained in:
@@ -674,14 +674,18 @@ export function SystemOverview() {
|
|||||||
<div className="flex justify-between items-center">
|
<div className="flex justify-between items-center">
|
||||||
<span className="text-sm text-muted-foreground">Received:</span>
|
<span className="text-sm text-muted-foreground">Received:</span>
|
||||||
<span className="text-lg font-semibold text-green-500 flex items-center gap-1">
|
<span className="text-lg font-semibold text-green-500 flex items-center gap-1">
|
||||||
↓ {networkData.traffic.bytes_recv.toFixed(2)} {networkUnit === "Bits" ? "Gb" : "GB"}
|
↓ {networkUnit === "Bytes"
|
||||||
|
? `${networkTotals.received.toFixed(2)} GB`
|
||||||
|
: `${(networkTotals.received * 8).toFixed(2)} Gb`}
|
||||||
<span className="text-xs text-muted-foreground">({getTimeframeLabel(networkTimeframe)})</span>
|
<span className="text-xs text-muted-foreground">({getTimeframeLabel(networkTimeframe)})</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex justify-between items-center">
|
<div className="flex justify-between items-center">
|
||||||
<span className="text-sm text-muted-foreground">Sent:</span>
|
<span className="text-sm text-muted-foreground">Sent:</span>
|
||||||
<span className="text-lg font-semibold text-blue-500 flex items-center gap-1">
|
<span className="text-lg font-semibold text-blue-500 flex items-center gap-1">
|
||||||
↑ {networkData.traffic.bytes_sent.toFixed(2)} {networkUnit === "Bits" ? "Gb" : "GB"}
|
↑ {networkUnit === "Bytes"
|
||||||
|
? `${networkTotals.sent.toFixed(2)} GB`
|
||||||
|
: `${(networkTotals.sent * 8).toFixed(2)} Gb`}
|
||||||
<span className="text-xs text-muted-foreground">({getTimeframeLabel(networkTimeframe)})</span>
|
<span className="text-xs text-muted-foreground">({getTimeframeLabel(networkTimeframe)})</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ const formatBytes = (bytes: number | undefined, isNetwork: boolean = false): str
|
|||||||
|
|
||||||
if (isNetwork) {
|
if (isNetwork) {
|
||||||
const networkUnit = getNetworkUnit()
|
const networkUnit = getNetworkUnit()
|
||||||
return formatNetworkTraffic(bytes, networkUnit)
|
return formatNetworkTraffic(bytes, networkUnit, 2)
|
||||||
}
|
}
|
||||||
|
|
||||||
// For non-network (disk), use standard bytes
|
// For non-network (disk), use standard bytes
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ export function formatNetworkTraffic(
|
|||||||
if (bytes === 0) return unit === 'Bits' ? '0 b' : '0 B';
|
if (bytes === 0) return unit === 'Bits' ? '0 b' : '0 B';
|
||||||
|
|
||||||
const k = unit === 'Bits' ? 1000 : 1024;
|
const k = unit === 'Bits' ? 1000 : 1024;
|
||||||
const dm = decimals < 0 ? 0 : decimals;
|
const dm = decimals < 0 ? 0 : Math.min(decimals, 2);
|
||||||
|
|
||||||
// For Bits: convert bytes to bits first (multiply by 8)
|
// For Bits: convert bytes to bits first (multiply by 8)
|
||||||
const value = unit === 'Bits' ? bytes * 8 : bytes;
|
const value = unit === 'Bits' ? bytes * 8 : bytes;
|
||||||
@@ -30,7 +30,8 @@ export function formatNetworkTraffic(
|
|||||||
: ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
|
: ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
|
||||||
|
|
||||||
const i = Math.floor(Math.log(value) / Math.log(k));
|
const i = Math.floor(Math.log(value) / Math.log(k));
|
||||||
const formattedValue = parseFloat((value / Math.pow(k, i)).toFixed(dm));
|
const finalDecimals = i >= 3 ? 2 : 2;
|
||||||
|
const formattedValue = parseFloat((value / Math.pow(k, i)).toFixed(finalDecimals));
|
||||||
|
|
||||||
return `${formattedValue} ${sizes[i]}`;
|
return `${formattedValue} ${sizes[i]}`;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user