Skip to content

Short-circuit 'easy' rglob/glob patterns #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pjbull merged 1 commit into from
Nov 2, 2022
Merged

Short-circuit 'easy' rglob/glob patterns #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions cloudpathlib/cloudpath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,12 @@ def _glob(self, selector):
yield self.client.CloudPath(f"{self.cloud_prefix}{self.drive}{p}")

def glob(self, pattern):
if pattern == "*":
yield from (path for path, is_file in self.client._list_dir(self, recursive=False))
return
if pattern == "**/*":
yield from (path for path, is_file in self.client._list_dir(self, recursive=True))
return
self._glob_checks(pattern)

pattern_parts = PurePosixPath(pattern).parts
Expand All @@ -369,6 +375,9 @@ def glob(self, pattern):
yield from self._glob(selector)

def rglob(self, pattern):
if pattern == "*":
yield from (path for path, is_file in self.client._list_dir(self, recursive=True))
return
self._glob_checks(pattern)

pattern_parts = PurePosixPath(pattern).parts
Expand Down
3 changes: 3 additions & 0 deletions tests/test_cloudpath_file_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ def _check_glob(pattern, glob_method):
)

# glob_common
_check_glob("**/*", "glob")
_check_glob("*", "glob")
_check_glob("fileA", "glob")
_check_glob("fileB", "glob")
_check_glob("dir*/file*", "glob")
Expand All @@ -157,6 +159,7 @@ def _check_glob(pattern, glob_method):
_check_glob("*/fileB", "glob")

# rglob_common
_check_glob("*", "rglob")
_check_glob("fileA", "rglob")
_check_glob("fileB", "rglob")
_check_glob("*/fileA", "rglob")
Expand Down