AskaEth/SenSu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix: Windows分区设备名 — 用盘符(C:)替代设备路径"

Browse Source 
This reverts commit 7cdae4d954.
This commit is contained in:
qinglong
2026-06-14 10:02:09 +08:00
parent 7cdae4d954
commit cb6beca067
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web_panel/utils/system_info.py
+2 -9
View File
@@ -154,12 +154,8 @@ class SystemInfoCollector:
continue continue
try: try:
usage = self.psutil.disk_usage(p.mountpoint) usage = self.psutil.disk_usage(p.mountpoint)
# Windows: 用盘符作为设备名 (C:, D:)
dev = p.device
if os.name == 'nt':
dev = p.mountpoint.rstrip('\\') # C:\ → C:
parts.append({ parts.append({
"device": dev, "device": p.device,
"mount": p.mountpoint, "mount": p.mountpoint,
"fstype": p.fstype or "", "fstype": p.fstype or "",
"total_gb": round(usage.total / 1073741824, 1), "total_gb": round(usage.total / 1073741824, 1),
@@ -167,11 +163,8 @@ class SystemInfoCollector:
"percent": usage.percent, "percent": usage.percent,
}) })
except (PermissionError, OSError): except (PermissionError, OSError):
dev = p.device
if os.name == 'nt':
dev = p.mountpoint.rstrip('\\')
parts.append({ parts.append({
"device": dev, "device": p.device,
"mount": p.mountpoint, "mount": p.mountpoint,
"fstype": p.fstype or "", "fstype": p.fstype or "",
"total_gb": 0, "used_gb": 0, "percent": 0, "total_gb": 0, "used_gb": 0, "percent": 0,