diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ce416cb..30e9611 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,9 @@ +6.0.5 (unreleased) +------------------ + +- Configurable prefix in `iterate_bucket_page` method + [j-durbin] + 6.0.4 (unreleased) ------------------ diff --git a/VERSION b/VERSION index 1aa5e41..288b2cd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.4 +6.0.5 diff --git a/guillotina_gcloudstorage/storage.py b/guillotina_gcloudstorage/storage.py index 5aecf6b..f459ac9 100644 --- a/guillotina_gcloudstorage/storage.py +++ b/guillotina_gcloudstorage/storage.py @@ -86,7 +86,6 @@ def _is_uploaded_file(file): for_=(IResource, IRequest, IGCloudFileField), provides=IGCloudFileStorageManager ) class GCloudFileManager(object): - file_class = GCloudFile def __init__(self, context, request, field): @@ -540,10 +539,11 @@ async def iterate_bucket(self): yield item page_token = data.get("nextPageToken") - async def iterate_bucket_page(self, page_token=None): + async def iterate_bucket_page(self, page_token=None, prefix=None): url = "{}/{}/o".format(OBJECT_BASE_URL, await self.get_bucket_name()) container = task_vars.container.get() - params = {"prefix": container.id + "/"} + prefix = prefix or container.id + "/" + params = {"prefix": prefix} if page_token: params["pageToken"] = page_token