Merge pull request #210 from chescales/fix/pull-media-without-remote-id

Fixed bug where pulling media without remote id was not possible.

Author: chescales

divio_cli/cli.py

@@ -215,7 +215,7 @@ def project_deploy_log(obj, remote_id, stage):
 @click.pass_obj
 def project_dashboard(obj, remote_id):
     """Open project dashboard"""
-    click.launch(get_cp_url(obj.client, remote_id))
+    click.launch(get_cp_url(client=obj.client, project_id=remote_id))
 
 
 @project.command(name='up')
@@ -310,15 +310,15 @@ def environment_variables(obj, remote_id, stage, show_all_vars,
 @click.pass_obj
 def project_open_test(obj, remote_id):
     """Open project test site"""
-    open_project_cloud_site(obj.client, remote_id, 'test')
+    open_project_cloud_site(obj.client, project_id=remote_id, stage='test')
 
 
 @project.command(name='live')
 @allow_remote_id_override
 @click.pass_obj
 def project_open_live(obj, remote_id):
     """Open project live site"""
-    open_project_cloud_site(obj.client, remote_id, 'live')
+    open_project_cloud_site(obj.client, project_id=remote_id, stage='live')
 
 
 @project.command(name='status')
@@ -338,7 +338,11 @@ def project_stop():
 @click.pass_obj
 def project_cheatsheet(obj, remote_id):
     """Show useful commands for your project"""
-    click.launch(get_cp_url(obj.client, remote_id, 'local-development/'))
+    click.launch(get_cp_url(
+        obj.client,
+        project_id=remote_id,
+        section='local-development/'),
+    )
 
 
 @project.command(name='setup')
@@ -403,7 +407,7 @@ def pull_media(obj, remote_id, stage):
     Pull media files from your deployed website. Stage is either
     test (default) or live
     """
-    localdev.pull_media(obj.client, stage, remote_id)
+    localdev.pull_media(obj.client, stage=stage, remote_id=remote_id)
 
 
 @project.group(name='push')
@@ -432,13 +436,18 @@ def push_db(obj, remote_id, stage, dumpfile, noinput):
             click.secho(messages.PUSH_DB_WARNING.format(stage=stage), fg='red')
             if not click.confirm('\nAre you sure you want to continue?'):
                 return
-        localdev.push_db(obj.client, stage, remote_id)
+        localdev.push_db(obj.client, stage=stage, remote_id=remote_id)
     else:
         if not noinput:
             click.secho(messages.PUSH_DB_WARNING.format(stage=stage), fg='red')
             if not click.confirm('\nAre you sure you want to continue?'):
                 return
-        localdev.push_local_db(obj.client, stage, dumpfile, remote_id)
+        localdev.push_local_db(
+            obj.client,
+            stage=stage,
+            dump_filename=dumpfile,
+            website_id=remote_id,
+        )
 
 
 @project_push.command(name='media')
@@ -456,7 +465,7 @@ def push_media(obj, remote_id, stage, noinput):
         click.secho(messages.PUSH_MEDIA_WARNING.format(stage=stage), fg='red')
         if not click.confirm('\nAre you sure you want to continue?'):
             return
-    localdev.push_media(obj.client, stage, remote_id)
+    localdev.push_media(obj.client, stage=stage, remote_id=remote_id)
 
 
 @project.group(name='import')

divio_cli/localdev/main.py

@@ -71,7 +71,10 @@ def setup_website_containers(client, stage, path):
 
     if docker_compose_config.has_service('db'):
         has_db_service = True
-        existing_db_container_id = utils.get_db_container_id(path, False)
+        existing_db_container_id = utils.get_db_container_id(
+            path=path,
+            raise_on_missing=False,
+        )
     else:
         has_db_service = False
         existing_db_container_id = None
@@ -133,16 +136,16 @@ def del_rw(action, name, exc):
             sys.exit(1)
 
     # clone git project
-    clone_project(website_slug, path)
+    clone_project(website_slug=website_slug, path=path)
 
     # check for new baseproject + add .aldryn
-    configure_project(website_slug, path, client)
+    configure_project(website_slug=website_slug, path=path, client=client)
 
     # setup docker website containers
-    setup_website_containers(client, stage, path)
+    setup_website_containers(client=client, stage=stage, path=path)
 
     # download media files
-    pull_media(client, stage, path)
+    pull_media(client=client, stage=stage, path=path)
 
     instructions = (
         "Your workspace is setup and ready to start.",
@@ -359,7 +362,8 @@ def setup(self):
         click.secho(' ---> Preparing download', nl=False)
         start_preparation = time()
         response = self.client.download_db_request(
-            self.remote_id, self.stage) or {}
+            self.remote_id, self.stage,
+        ) or {}
         progress_url = response.get('progress_url')
         if not progress_url:
             click.secho(' error!', fg='red')
@@ -387,10 +391,11 @@ def get_db_restore_command(self):
         return cmd.format(self.db_dump_path)
 
 
-def pull_media(client, stage, remote_id, path=None):
+def pull_media(client, stage, remote_id=None, path=None):
     project_home = utils.get_project_home(path)
     website_id = utils.get_aldryn_project_settings(project_home)['id']
     website_slug = utils.get_aldryn_project_settings(project_home)['slug']
+    remote_id = remote_id or website_id
     remote_project_name = (
         website_slug if remote_id == website_id
         else 'Project {}'.format(remote_id)