platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-08-04 04:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve fetching of logical disks

Browse Source
This commit is contained in:
Ivan Kravets
2017-08-31 20:56:25 +03:00
parent 3fe9ea1b01
commit 49244072c4
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platformio/util.py
View File

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