Added project cloning

small changes

Author: vsklencar

mergin/cli.py

@@ -372,16 +372,16 @@ def modtime(directory):
 
 
 @cli.command()
-@click.argument('project_fullname', required=True)
-@click.argument('project_namespace', required=True)
-@click.argument('project_name', required=True)
-def clone(project_fullname, project_namespace, project_name):
+@click.argument('source_project_path', required=True)
+@click.argument('cloned_project_name', required=True)
+@click.argument('cloned_project_namespace', required=False)
+def clone(source_project_path, cloned_project_name, cloned_project_namespace=None):
     """Clone project from server."""
     c = _init_client()
     if c is None:
         return
     try:
-        c.clone_project(project_fullname, project_namespace, project_name)
+        c.clone_project(source_project_path, cloned_project_name, cloned_project_namespace)
         click.echo('Done')
     except Exception as e:
         _print_unhandled_exception()

mergin/client.py

@@ -399,23 +399,23 @@ def pull_project(self, directory):
         pull_project_wait(job)
         return pull_project_finalize(job)
 
-    def clone_project(self, full_project_name, namespace, name):
+    def clone_project(self, source_project_path, cloned_project_name, cloned_project_namespace=None):
         """
         Clone project on server.
+        :param source_project_path: Project's full name (<namespace>/<name>)
+        :type source_project_path: String
+        :param cloned_project_name: Cloned project's name
+        :type cloned_project_name: String
+        :param cloned_project_namespace: Cloned project's namespace, username is used if not defined
+        :type cloned_project_namespace: String
 
-        :param project_path: Project's full name (<namespace>/<name>)
-        :type project_path: String
-        :param namespace: Cloned project's namespace
-        :type namespace: String
-        :param name: Cloned project's name
-        :type name: String
         """
-        path = "/v1/project/clone/%s" % full_project_name
+        path = "/v1/project/clone/%s" % source_project_path
         url = urllib.parse.urljoin(self.url, urllib.parse.quote(path))
         json_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
         data = {
-            'namespace': namespace,
-            'project': name
+            'namespace': cloned_project_namespace,
+            'project': cloned_project_name if cloned_project_name else self.username()
         }
 
         request = urllib.request.Request(url, data=json.dumps(data).encode(), headers=json_headers, method="POST")

mergin/test/test_client.py

@@ -461,22 +461,25 @@ def test_empty_file_in_subdir(mc):
     mc.pull_project(project_dir_2)
     assert os.path.exists(os.path.join(project_dir_2, 'subdir2', 'empty2.txt'))
 
-def test_clone_delete_project(mc):
+def test_clone_project(mc):
+    test_project = 'test_clone_project'
+    test_project_fullname = API_USER + '/' + test_project
+
+    # cleanups
+    project_dir = os.path.join(TMP_DIR, test_project)
+    cleanup(mc, test_project_fullname, [project_dir])
+
     # create new (empty) project on server
-    test_project = 'test_clone_delete'
     mc.create_project(test_project)
     projects = mc.projects_list(flag='created')
     assert any(p for p in projects if p['name'] == test_project and p['namespace'] == API_USER)
 
-    # clone project
     cloned_project_name = test_project + "_cloned"
-    test_project_fullname = API_USER + '/' + test_project
-    mc.clone_project(test_project_fullname, API_USER, cloned_project_name)
-    projects = mc.projects_list(flag='created')
-    assert any(p for p in projects if p['name'] == cloned_project_name and p['namespace'] == API_USER)
-
-    project_dir = os.path.join(TMP_DIR, test_project)
-    cleanup(mc, test_project_fullname, [project_dir])
-
+    # cleanup cloned project
     cloned_project_dir = os.path.join(TMP_DIR, cloned_project_name)
     cleanup(mc, API_USER + '/' + cloned_project_name, [cloned_project_dir])
+
+    # clone project
+    mc.clone_project(test_project_fullname, cloned_project_name, API_USER)
+    projects = mc.projects_list(flag='created')
+    assert any(p for p in projects if p['name'] == cloned_project_name and p['namespace'] == API_USER)