Improve fetching of logical disks

This commit is contained in:
Ivan Kravets
2017-08-31 20:56:25 +03:00
parent 3fe9ea1b01
commit 49244072c4

View File

@@ -458,14 +458,17 @@ def get_logicaldisks():
match = disknamere.match(line.strip())
if not match:
continue
disks.append({"disk": match.group(1), "name": match.group(2)})
disks.append({
"disk": match.group(1) + "\\",
"name": match.group(2)
})
return disks
except WindowsError: # pylint: disable=undefined-variable
pass
# try "fsutil"
result = exec_command(["fsutil", "fsinfo", "drives"]).get("out", "")
for disk in re.findall(r"[A-Z]:\\", result):
disks.append({"disk": disk[:-1], "name": disk})
disks.append({"disk": disk, "name": None})
return disks
else:
result = exec_command(["df"]).get("out")