Skip to content

Commit f018a50

Browse files
committed
Adressed last comments
1 parent 32a8514 commit f018a50

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

mergin/client.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ def workspace_usage(self, workspace_id):
383383
try:
384384
response = self.get(f"/v1/workspace/{workspace_id}/usage")
385385
except ClientError as e:
386-
self.log.debug(f"Unable to query for /workspace/{workspace_id}/usage endpoint")
387-
return
386+
e.extra = f"Unable to query for /workspace/{workspace_id}/usage endpoint"
387+
raise e
388388

389389
response = json.loads(response.read())
390390

@@ -718,7 +718,7 @@ def project_info(self, project_path_or_id, since=None, version=None):
718718
resp = self.get("/v1/project/{}".format(project_path_or_id), params)
719719
return json.load(resp)
720720

721-
def project_versions_page(self, project_path, page, per_page=100, descending=False):
721+
def paginated_project_versions(self, project_path, page, per_page=100, descending=False):
722722
"""
723723
Get records of project's versions (history) using calculated pagination.
724724
wrapper around the /v1/project/versions/paginated/{} API end point
@@ -786,15 +786,15 @@ def project_versions(self, project_path, since=1, to=None):
786786
start_page = math.ceil(num_since / per_page)
787787
if not num_to:
788788
# let's get first page and count
789-
versions, num_to = self.project_versions_page(project_path, start_page, per_page)
789+
versions, num_to = self.paginated_project_versions(project_path, start_page, per_page)
790790

791791
latest_version = int_version(versions[-1]["name"])
792792
if latest_version < num_to:
793793
versions += self.project_versions(project_path, f"v{latest_version+1}", f"v{num_to}")
794794
else:
795795
end_page = math.ceil(num_to / per_page)
796796
for page in range(start_page, end_page + 1):
797-
page_versions, _ = self.project_versions_page(project_path, page, per_page)
797+
page_versions, _ = self.paginated_project_versions(project_path, page, per_page)
798798
versions += page_versions
799799

800800
# filter out versions not within range

mergin/test/test_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2016,7 +2016,7 @@ def test_project_versions_list(mc):
20162016
versions_count = mc.project_versions_count(project)
20172017
assert versions_count == 5
20182018

2019-
versions, _ = mc.project_versions_page(project, page=1, descending=True)
2019+
versions, _ = mc.paginated_project_versions(project, page=1, descending=True)
20202020
assert len(versions) == 5
20212021
assert versions[0]["name"] == "v5"
20222022
assert versions[-1]["name"] == "v1"

0 commit comments

Comments
 (0)