brennen/Portable-Computing-Toolkit-Installer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed logic error that caused roots of NTFS drives to return as not NTFS

Browse Source
This commit is contained in:
Brennen Raimer
2019-05-25 11:29:06 -04:00
parent 76d1121206
commit fdf8e7d0a2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
portable_computing_toolkit_installer/validators/location_validator.py
View File

@@ -18,9 +18,9 @@ class Location_Validator(QtGui.QValidator):
opening a warning window for each subdirectory in the location path was to track this and return the same
value that was returned the last time it was validated."""
@property
def ntfs_location_selected(self):
return Location_Validator._ntfs_location_selected
@property
def ntfs_location_selected(self):
return Location_Validator._ntfs_location_selected
def _onNTFSDrive(self, location):
"""Tests if location is a path on an NTFS-formatted drive. Returns True if path is on NTFS-formatted drive.
@@ -28,7 +28,9 @@ class Location_Validator(QtGui.QValidator):
Arguments:
location {str} -- A string representing a folder path
"""
match = [drive for drive in psutil.disk_partitions(all = True) if (Path(drive.mountpoint) in Path(location).parents and drive.fstype.lower() == "ntfs")]
match = [drive for drive in psutil.disk_partitions(all = True)
if (Path(drive.mountpoint) in Path(location).parents or Path(drive.mountpoint) == Path(location))
and drive.fstype.lower() == "ntfs"]
if match:
self._ntfs_location_selected = True
return True