From f0bd794fe997c669266e8f93272c93f8bc74b8c8 Mon Sep 17 00:00:00 2001
From: Valentin Buira <valentin.buira@gmail.com>
Date: Fri, 29 Nov 2024 15:38:06 +0100
Subject: [PATCH] * Revert back function name * Simplify project_versions
 parameter

---
 mergin/client.py           | 7 ++-----
 mergin/report.py           | 2 +-
 mergin/test/test_client.py | 8 ++++----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/mergin/client.py b/mergin/client.py
index be0780d..d945a4a 100644
--- a/mergin/client.py
+++ b/mergin/client.py
@@ -754,7 +754,7 @@ def project_versions_count(self, project_path):
         resp_json = json.load(resp)
         return resp_json["count"]
 
-    def project_versions_in_range(self, project_path, since=None, to=None):
+    def project_versions(self, project_path, since=1, to=None):
         """
         Get records of project's versions (history) in ascending order.
         If neither 'since' nor 'to' is specified it will return all versions.
@@ -773,8 +773,6 @@ def project_versions_in_range(self, project_path, since=None, to=None):
 
         if type(since) == str:
             num_since = int_version(since)
-        elif since == None:
-            num_since = 1
         else:
             # keep the since parameter as is
             num_since = since
@@ -792,8 +790,7 @@ def project_versions_in_range(self, project_path, since=None, to=None):
             num_to = self.project_versions_count(project_path)
             latest_version = int_version(versions[-1]["name"])
             if latest_version < num_to:
-                # add yield here
-                versions += self.project_versions_in_range(project_path, f"v{latest_version+1}", f"v{num_to}")
+                versions += self.project_versions(project_path, f"v{latest_version+1}", f"v{num_to}")
         else:
             end_page = math.ceil(num_to / per_page)
             for page in range(start_page, end_page + 1):
diff --git a/mergin/report.py b/mergin/report.py
index e5ee018..5b9cae4 100644
--- a/mergin/report.py
+++ b/mergin/report.py
@@ -216,7 +216,7 @@ def create_report(mc, directory, since, to, out_file):
     mp = MerginProject(directory)
     project = mp.project_full_name()
     mp.log.info(f"--- Creating changesets report for {project} from {since} to {to if to else 'latest'} versions ----")
-    versions = mc.project_versions_in_range(project, since, to if to else None)
+    versions = mc.project_versions(project, since, to if to else None)
     versions_map = {v["name"]: v for v in versions}
     headers = ["file", "table", "author", "date", "time", "version", "operation", "length", "area", "count"]
     records = []
diff --git a/mergin/test/test_client.py b/mergin/test/test_client.py
index 8f2c3f2..656ccf4 100644
--- a/mergin/test/test_client.py
+++ b/mergin/test/test_client.py
@@ -1989,23 +1989,23 @@ def test_project_versions_list(mc):
     assert project_info["version"] == "v5"
 
     # get all versions
-    versions = mc.project_versions_in_range(project)
+    versions = mc.project_versions(project)
     assert len(versions) == 5
     assert versions[0]["name"] == "v1"
     assert versions[-1]["name"] == "v5"
 
     # get first 3 versions
-    versions = mc.project_versions_in_range(project, to="v3")
+    versions = mc.project_versions(project, to="v3")
     assert len(versions) == 3
     assert versions[-1]["name"] == "v3"
 
     # get last 2 versions
-    versions = mc.project_versions_in_range(project, since="v4")
+    versions = mc.project_versions(project, since="v4")
     assert len(versions) == 2
     assert versions[0]["name"] == "v4"
 
     # get range v2-v4
-    versions = mc.project_versions_in_range(project, since="v2", to="v4")
+    versions = mc.project_versions(project, since="v2", to="v4")
     assert len(versions) == 3
     assert versions[0]["name"] == "v2"
     assert versions[-1]["name"] == "v4"