eric: comparison src/eric7/RemoteServerInterface/EricServerFileSystemInterface.py

-:8264ea1f42e5
+:2114cc7275e8
 Module implementing the file system interface to the eric-ide server.
 """
 import base64
 import contextlib
+import fnmatch
+import os
+import re
 import stat
 from PyQt6.QtCore import QEventLoop, QObject
 from eric7.RemoteServer.EricRequestCategory import EricRequestCategory
 from eric7.SystemUtilities import FileSystemUtilities
-# TODO: sanitize all file names with FileSystemUtilities.plainFileName()
 class EricServerFileSystemInterface(QObject):
 """
 Class implementing the file system interface to the eric-ide server.
 """
+_MagicCheck = re.compile("([*?[])")
 def __init__(self, serverInterface):
 """
 Constructor
 @param serverInterface reference to the eric-ide server interface
 @type EricServerInterface
 """
 super().__init__(parent=serverInterface)
 self.__serverInterface = serverInterface
+def __hasMagic(self, pathname):
+"""
+Private method to check, if a given path contains glob style magic characters.
+Note: This was taken from 'glob.glob'.
+@param pathname path name to be checked
+@type str
+@return flag indicating the presence of magic characters
+@rtype bool
+"""
+match = self._MagicCheck.search(pathname)
+return match is not None
 def getcwd(self):
 """
 Public method to get the current working directory of the eric-ide server.
 raise OSError(error)
 return listedDirectory, separator, listing
 def direntries(
-self, directory, filesonly=False, pattern=None, followsymlinks=True, ignore=None
+self,
+directory,
+filesonly=False,
+pattern=None,
+followsymlinks=True,
+ignore=None,
+recursive=True,
+dirsonly=False,
 ):
 """
 Public method to get a list of all files and directories of a given directory.
 @param directory root of the tree to check
 @param followsymlinks flag indicating whether symbolic links should be
 followed (defaults to True)
 @type bool (optional)
 @param ignore list of entries to be ignored (defaults to None)
 @type list of str (optional)
+@param recursive flag indicating a recursive search (defaults to True)
+@type bool (optional)
+@param dirsonly flag indicating to return only directories. When True it has
+precedence over the 'filesonly' parameter ((defaults to False)
+@type bool
 @return list of all files and directories in the tree rooted at path.
 The names are expanded to start with the given directory name.
 @rtype list of str
 @exception OSError raised in case the server reported an issue
 """
 "directory": FileSystemUtilities.plainFileName(directory),
 "files_only": filesonly,
 "pattern": [] if pattern is None else pattern,
 "follow_symlinks": followsymlinks,
 "ignore": [] if ignore is None else ignore,
+"recursive": recursive,
+"dirs_only": dirsonly,
 },
 callback=callback,
 )
 loop.exec()
 if not ok:
 raise OSError(error)
+return result
+def glob(self, pathname, recursive=False, includeHidden=False):
+"""
+Public method to get a list of of all files matching a given pattern
+like 'glob.glob()'.
+@param pathname path name pattern with simple shell-style wildcards
+@type str
+@param recursive flag indicating a recursive list (defaults to False)
+@type bool (optional)
+@param includeHidden flag indicating to include hidden files (defaults to False)
+@type bool (optional)
+@return list of all files matching the pattern
+@rtype list of str
+"""
+result = []
+pathname = FileSystemUtilities.plainFileName(pathname)
+dirname, basename = os.path.split(pathname)
+if dirname and not self.__hasMagic(dirname):
+with contextlib.suppress(OSError):
+entries = self.direntries(
+dirname, pattern=basename, recursive=recursive, filesonly=True
+)
+if includeHidden:
+result = entries
+else:
+result = [e for e in entries if not e.startswith(".")]
 return result
 def stat(self, filename, stNames):
 """

Mercurial Repositories > eric / file comparison

comparison: src/eric7/RemoteServerInterface/EricServerFileSystemInterface.py

src/eric7/RemoteServerInterface/EricServerFileSystemInterface.py