eric: comparison src/eric7/SystemUtilities/FileSystemUtilities.py

-:a5bbcf506ef0
+:d63911a89570
 """
 Module implementing file system related utility functions.
 """
 import contextlib
-import ctypes
 import fnmatch
 import os
 import pathlib
 import shutil
 import subprocess  # secok
 return dirs
 except OSError:
 return []
-def findVolume(volumeName, findAll=False):
+def findVolume(volumeName, findAll=False, markerFile=None):
 """
 Function to find the directory belonging to a given volume name.
 @param volumeName name of the volume to search for
 @type str
 @param findAll flag indicating to get the directories for all volumes
 starting with the given name (defaults to False)
 @type bool (optional)
+@param markerFile name of a file to check for its existence (defaults to None)
+@type str (optional)
 @return directory path or list of directory paths for the given volume
 name
 @rtype str or list of str
 """
-volumeDirectories = []
-volumeDirectory = None
 if OSUtilities.isWindowsPlatform():
 # we are on a Windows platform
-def getVolumeName(diskName):
+drives = []
-"""
+output = subprocess.run(
-Local function to determine the volume of a disk or device.
+[
+"wmic",
-Each disk or external device connected to windows has an
+"PATH",
-attribute called "volume name". This function returns the
+"Win32_LogicalDisk",
-volume name for the given disk/device.
+"get",
+"DeviceID,",
-Code from http://stackoverflow.com/a/12056414
+"DriveType,",
-"""
+"FileSystem,",
-volumeNameBuffer = ctypes.create_unicode_buffer(1024)
+"VolumeName",
-ctypes.windll.kernel32.GetVolumeInformationW(
+],
-ctypes.c_wchar_p(diskName),
+check=True,
-volumeNameBuffer,
+capture_output=True,
-ctypes.sizeof(volumeNameBuffer),
+text=True,
-None,
+encoding="utf-8",
-None,
+).stdout.splitlines()
-None,
-None,
+for line in output:
-0,
+words = line.split()
-)
+if len(words) >= 4 and words[1] == "2" and words[2] == "FAT":
-return volumeNameBuffer.value
+drive = words[0]
+volume = " ".join(words[3:])
-#
+if findAll:
-# In certain circumstances, volumes are allocated to USB
+if volume.startswith(volumeName):
-# storage devices which cause a Windows popup to raise if their
+drives.append(f"{drive}\\")
-# volume contains no media. Wrapping the check in SetErrorMode
+else:
-# with SEM_FAILCRITICALERRORS (1) prevents this popup.
+if volume == volumeName:
-#
+return f"{drive}\\"
-oldMode = ctypes.windll.kernel32.SetErrorMode(1)
-try:
+return drives
-for disk in "ABCDEFGHIJKLMNOPQRSTUVWXYZ":
-dirpath = "{0}:\\".format(disk)
-if os.path.exists(dirpath):
-if findAll:
-if getVolumeName(dirpath).startswith(volumeName):
-volumeDirectories.append(dirpath)
-else:
-if getVolumeName(dirpath) == volumeName:
-volumeDirectory = dirpath
-break
-finally:
-ctypes.windll.kernel32.SetErrorMode(oldMode)
 else:
 # we are on a Linux, FreeBSD or macOS platform
-for mountCommand in ["mount", "/sbin/mount", "/usr/sbin/mount"]:
+# FreeBSD needs a marker file because it does not use the volume name.
-with contextlib.suppress(FileNotFoundError):
+directories = []
-mountOutput = subprocess.run(  # secok
+if OSUtilities.isMacPlatform():
-mountCommand, check=True, capture_output=True, text=True
+# macOS
-).stdout.splitlines()
+mountPathStart = "/Volumes"
-mountedVolumes = [
+elif OSUtilities.isLinuxPlatform():
-x.split(" type", 1)[0].split(" (", 1)[0].split(maxsplit=2)[-1]
+# Linux
-for x in mountOutput
+mountPathStart = "/media/{0}/".format(OSUtilities.getUserName())
-]
+if not os.path.isdir(mountPathStart):
-if findAll:
+# no user mount available
-for volume in mountedVolumes:
+return [] if findAll else None
-if os.path.basename(volume).startswith(volumeName):
+elif OSUtilities.isFreeBsdPlatform():
-volumeDirectories.append(volume)
+# FreeBSD
-if volumeDirectories:
+mountPathStart = "/media/"
-break
+else:
-else:
+# unsupported platform
-for volume in mountedVolumes:
+return [] if findAll else None
-if os.path.basename(volume) == volumeName:
-volumeDirectory = volume
+for d in os.listdir(mountPathStart):
-break
+dPath = os.path.join(mountPathStart, d)
-if volumeDirectory:
+if findAll:
-break
+if d.startswith(volumeName) or (
+markerFile is not None
-if findAll:
+and os.path.exists(os.path.join(dPath, markerFile))
-return volumeDirectories
+):
-else:
+directories.append(dPath)
-return volumeDirectory
+else:
+if d == volumeName or (
+markerFile is not None
+and os.path.exists(os.path.join(dPath, markerFile))
+):
+return dPath
+return directories
 def getUserMounts():
 """
 Function to determine all available user mounts.
 Note: On Windows platforms all available drives are returned.
 @return list of user mounts or drives
 @rtype list of str
 """
-mountedPaths = []
 if OSUtilities.isWindowsPlatform():
 # we are on a Windows platform
-for disk in "ABCDEFGHIJKLMNOPQRSTUVWXYZ":
+return [
-dirpath = "{0}:\\".format(disk)
+f"{disk}:\\"
-if os.path.exists(dirpath):
+for disk in "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-mountedPaths.append(dirpath)
+if os.path.exists(f"{disk}:\\")
+]
 else:
 # we are on a Linux, FreeBSD or macOS platform
 if OSUtilities.isMacPlatform():
 # macOS
 mountPathStart = "/Volumes/"
 elif OSUtilities.isLinuxPlatform():
 # Linux
 mountPathStart = "/media/{0}/".format(OSUtilities.getUserName())
+if not os.path.isdir(mountPathStart):
+# no user mount available
+return []
 elif OSUtilities.isFreeBsdPlatform():
 # FreeBSD
 mountPathStart = "/media/"
 else:
 # unsupported platform
 return []
-for mountCommand in ["mount", "/sbin/mount", "/usr/sbin/mount"]:
+return [os.path.join(mountPathStart, d) for d in os.listdir(mountPathStart)]
-with contextlib.suppress(FileNotFoundError):
-mountOutput = subprocess.run(  # secok
-mountCommand, check=True, capture_output=True, text=True
-).stdout.splitlines()
-mounts = [
-x.split(" type", 1)[0].split(" (", 1)[0].split(maxsplit=2)[-1]
-for x in mountOutput
-]
-mountedPaths = [x for x in mounts if x.startswith(mountPathStart)]
-break
-return mountedPaths
 def startfile(filePath):
 """
 Function to open the given file path with the system default application.

Mercurial Repositories > eric / file comparison

comparison: src/eric7/SystemUtilities/FileSystemUtilities.py

src/eric7/SystemUtilities/FileSystemUtilities.py