voussoir/voussoirkit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

If given glob pattern is an existing path, just return that.

Browse source
This commit is contained in:
voussoir 2022-08-21 13:57:19 -07:00
parent 6b26a4bd93
commit 2996283344
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
voussoirkit/pathclass.py
View file

@ -320,6 +320,10 @@ class Path:
Return Paths that match a glob pattern within this directory. Return Paths that match a glob pattern within this directory.
''' '''
pattern = normalize_basename_glob(pattern) pattern = normalize_basename_glob(pattern)
trychild = self.with_child(pattern)
if trychild.exists:
return [trychild.correct_case()]
# By sidestepping the glob function and going straight for fnmatch # By sidestepping the glob function and going straight for fnmatch
# filter, we have slightly different behavior than normal, which is # filter, we have slightly different behavior than normal, which is
# that glob.glob treats .* as hidden files and won't match them with # that glob.glob treats .* as hidden files and won't match them with
@ -331,6 +335,10 @@ class Path:
def glob_directories(self, pattern): def glob_directories(self, pattern):
pattern = normalize_basename_glob(pattern) pattern = normalize_basename_glob(pattern)
trychild = self.with_child(pattern)
if trychild.is_directory:
return [trychild.correct_case()]
# Instead of turning all children into Path objects and filtering by # Instead of turning all children into Path objects and filtering by
# the stat, let's filter by the stat from scandir first. # the stat, let's filter by the stat from scandir first.
children = (e.name for e in os.scandir(self) if e.is_dir()) children = (e.name for e in os.scandir(self) if e.is_dir())
@ -340,6 +348,10 @@ class Path:
def glob_files(self, pattern): def glob_files(self, pattern):
pattern = normalize_basename_glob(pattern) pattern = normalize_basename_glob(pattern)
trychild = self.with_child(pattern)
if trychild.is_file:
return [trychild.correct_case()]
children = (e.name for e in os.scandir(self) if e.is_file()) children = (e.name for e in os.scandir(self) if e.is_file())
children = winglob.fnmatch_filter(children, pattern) children = winglob.fnmatch_filter(children, pattern)
items = [self.with_child(c, _case_correct=self._case_correct) for c in children] items = [self.with_child(c, _case_correct=self._case_correct) for c in children]
@ -648,14 +660,26 @@ def glob(pattern):
elif pattern == '..': elif pattern == '..':
return [cwd().parent] return [cwd().parent]
trypath = Path(pattern)
if trypath.exists:
return [trypath.correct_case()]
(dirname, pattern) = os.path.split(pattern) (dirname, pattern) = os.path.split(pattern)
return Path(dirname).glob(pattern) return Path(dirname).glob(pattern)
def glob_directories(pattern): def glob_directories(pattern):
trypath = Path(pattern)
if trypath.is_directory:
return [trypath.correct_case()]
(dirname, pattern) = os.path.split(pattern) (dirname, pattern) = os.path.split(pattern)
return Path(dirname).glob_directories(pattern) return Path(dirname).glob_directories(pattern)
def glob_files(pattern): def glob_files(pattern):
trypath = Path(pattern)
if trypath.is_file:
return [trypath.correct_case()]
(dirname, pattern) = os.path.split(pattern) (dirname, pattern) = os.path.split(pattern)
return Path(dirname).glob_files(pattern) return Path(dirname).glob_files(pattern)