Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2025-10-03 08:36:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update AppImage

Browse Source
This commit is contained in:
MacRimi
2025-10-02 23:41:31 +02:00
parent 2ab49cc545
commit 2658331fd2
2 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
AppImage/components/storage-overview.tsx
View File

@@ -147,11 +147,15 @@ export function StorageOverview() {
)
}
const disksWithTemp = storageData.disks.filter((disk) => disk.temperature > 0)
const avgTemp =
storageData.disks.length > 0
? Math.round(storageData.disks.reduce((sum, disk) => sum + disk.temperature, 0) / storageData.disks.length)
disksWithTemp.length > 0
? Math.round(disksWithTemp.reduce((sum, disk) => sum + disk.temperature, 0) / disksWithTemp.length)
: 0
const usagePercent =
storageData.total > 0 ? ((storageData.used / (storageData.total * 1024)) * 100).toFixed(2) : "0.00"
return (
<div className="space-y-6">
{/* Storage Summary */}
@@ -174,9 +178,7 @@ export function StorageOverview() {
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{storageData.used.toFixed(1)} GB</div>
<p className="text-xs text-muted-foreground mt-1">
{storageData.total > 0 ? ((storageData.used / (storageData.total * 1024)) * 100).toFixed(1) : 0}% used
</p>
<p className="text-xs text-muted-foreground mt-1">{usagePercent}% used</p>
</CardContent>
</Card>
@@ -331,13 +333,15 @@ export function StorageOverview() {
<span className="text-sm font-medium">{disk.usage_percent}%</span>
)}
</div>
{disk.usage_percent !== undefined && <Progress value={disk.usage_percent} className="h-2" />}
{disk.total && disk.used && disk.available && (
<div className="flex justify-between text-xs text-muted-foreground mt-1">
<span>{disk.used} GB used</span>
<span>
{disk.available} GB free of {disk.total} GB
</span>
{disk.usage_percent !== undefined && (
<div className="space-y-1">
<Progress value={disk.usage_percent} className="h-2" />
<div className="flex justify-between text-xs text-muted-foreground">
<span className="text-blue-400">{disk.used} GB used</span>
<span className="text-green-400">
{disk.available} GB free of {disk.total} GB
</span>
</div>
</div>
)}
</div>
@@ -447,11 +451,11 @@ export function StorageOverview() {
</div>
<div className="flex justify-between text-sm">
<span className="text-muted-foreground">Used:</span>
<span className="font-medium">{selectedDisk.used} GB</span>
<span className="font-medium text-blue-400">{selectedDisk.used} GB</span>
</div>
<div className="flex justify-between text-sm">
<span className="text-muted-foreground">Available:</span>
<span className="font-medium">{selectedDisk.available} GB</span>
<span className="font-medium text-green-400">{selectedDisk.available} GB</span>
</div>
{selectedDisk.usage_percent !== undefined && (
<div className="mt-2">

29
AppImage/scripts/flask_server.py
View File

@@ -363,7 +363,8 @@ def get_storage_info():
if len(parts) >= 3 and parts[2] == 'disk':
disk_name = parts[0]
disk_size_bytes = int(parts[1])
disk_size_gb = round(disk_size_bytes / (1024**3), 1)
disk_size_gb = disk_size_bytes / (1024**3)
disk_size_tb = disk_size_bytes / (1024**4)
total_disk_size_bytes += disk_size_bytes
@@ -372,9 +373,14 @@ def get_storage_info():
smart_data = get_smart_data(disk_name)
print(f"[v0] SMART data for {disk_name}: {smart_data}")
if disk_size_tb >= 1:
size_str = f"{disk_size_tb:.1f}T"
else:
size_str = f"{disk_size_gb:.1f}G"
physical_disks[disk_name] = {
'name': disk_name,
'size': f"{disk_size_gb}T" if disk_size_gb >= 1000 else f"{disk_size_gb}G",
'size': size_str,
'size_bytes': disk_size_bytes,
'temperature': smart_data.get('temperature', 0),
'health': smart_data.get('health', 'unknown'),
@@ -399,7 +405,7 @@ def get_storage_info():
except Exception as e:
print(f"Error getting disk list: {e}")
storage_data['total'] = round(total_disk_size_bytes / (1024**3), 1)
storage_data['total'] = round(total_disk_size_bytes / (1024**4), 1)
# Get disk usage for mounted partitions
try:
@@ -643,6 +649,23 @@ def get_smart_data(disk_name):
smart_data['health'] = 'critical'
elif smart_data['temperature'] >= 60:
smart_data['health'] = 'warning'
else:
print(f"[v0] smartctl returned code {result.returncode} for {disk_name}")
print(f"[v0] stderr: {result.stderr}")
# Intentar obtener al menos información básica del disco
try:
result_info = subprocess.run(['smartctl', '-i', f'/dev/{disk_name}'],
capture_output=True, text=True, timeout=5)
if result_info.returncode in [0, 4]:
output = result_info.stdout
for line in output.split('\n'):
line = line.strip()
if line.startswith('Device Model:') or line.startswith('Model Number:'):
smart_data['model'] = line.split(':', 1)[1].strip()
elif line.startswith('Serial Number:'):
smart_data['serial'] = line.split(':', 1)[1].strip()
except Exception as e:
print(f"[v0] Error getting basic info for {disk_name}: {e}")
except FileNotFoundError:
print(f"smartctl not found - install smartmontools package")