Merge lp:~sil2100/click-sync/lock-separate-dir into lp:click-sync

[Łukasz Zemczak]

Support having a different directory with locked clicks.

Support having a different directory with locked clicks.

[lp:~sil2100/click-sync/lock-separate-dir]

21. By Łukasz Zemczak on 2016-03-10

locked_list does not exist enymore, use locked_clicks_dir instead.

[Łukasz Zemczak (sil2100)]

Tested as working on a local setup.

=== modified file 'click-sync.py'
--- click-sync.py	2016-03-09 12:29:41 +0000
+++ click-sync.py	2016-03-10 14:56:12 +0000
@@ -14,6 +14,7 @@
 import subprocess
 import urllib
 import logging
+import shutil
 
 logging.basicConfig(level=logging.INFO)
 log = logging.getLogger()
@@ -124,13 +125,21 @@
     os.rename(new_target_file, target_file)
 
 
-def get_store_apps(download_dir, auth=None, locked_list=[]):
+def get_store_apps(download_dir, auth=None, locked_clicks_dir=None):
     """
     Gets click apps from the store.
     """
     http_client = httplib2.Http()
     download_list = []
 
+    locked_list = []
+    if locked_clicks_dir:
+        locked_clicks_path = os.path.join(locked_clicks_dir,
+                                          'locked_clicks_list')
+        if os.path.exists(locked_clicks_path):
+            locked_list = [line.strip() for line in 
+                           open(locked_clicks_path, 'r')]
+
     for click in store_click_packages:
         # Skip packages that are manually locked down
         click_locked = False
@@ -140,7 +149,16 @@
                 click_locked = True
                 break
 
-        if not click_locked:
+        if click_locked:
+            # Copy the click from the locked directory (if present)
+            source_click = os.path.join(locked_clicks_dir, click_file)
+            dest_click = os.path.join(download_dir, click_file)
+            if os.path.exists(source_click):
+                shutil.copyfile(source_click, dest_click)
+
+            if not os.path.exists(dest_click):
+                continue
+        else:
             # Download the click from the store if not locked
             json_content = get_json_for_uri(store_uri % click)
             click_file = json_content['download_url'].split('/')[-1]
@@ -171,9 +189,12 @@
                         help='jenkins url to download click packages from.')
     parser.add_argument('download_dir',
                         help='''Path to store the downloaded click packages.
-                                The path must exist''')
+                                The path must exist.''')
     parser.add_argument('--credentials-file', default=None, required=False,
                         help='''json dictionary with tokens for oauth.''')
+    parser.add_argument('--locked-clicks-dir', default=None,
+                        help='Path where the locked clicks and their list are '
+                             'stored.')
     return parser.parse_args()
 
 
@@ -203,13 +224,11 @@
         auth = OAuthClient.credentials_from_file(args.credentials_file)
 
     # Look for the manual-lock list
-    locked_list = []
-    locked_clicks_path = os.path.join(args.download_dir, 'locked_clicks_list')
-    if os.path.exists(locked_clicks_path):
-        locked_list = [line.strip() for line in open(locked_clicks_path, 'r')]
+    locked_clicks_dir = args.locked_clicks_dir if args.locked_clicks_dir \
+                        else args.download_dir
 
     download_list = download_list + get_store_apps(args.download_dir, auth,
-                                                   locked_list)
+                                                   locked_clicks_dir)
 
     click_list = os.path.join(args.download_dir, 'click_list')
     with open(click_list, 'w') as f: