From 7953e7a8539fc487bc56e7ff3fddc8dabf1cc03d Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 6 Aug 2019 11:54:24 +1200 Subject: [PATCH] import_layers: show basic progress Show an info message with a counter when importing layers. Signed-off-by: Paul Eggleton --- layerindex/tools/import_layers.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/layerindex/tools/import_layers.py b/layerindex/tools/import_layers.py index e6d19a8..d40c391 100755 --- a/layerindex/tools/import_layers.py +++ b/layerindex/tools/import_layers.py @@ -129,7 +129,7 @@ def main(): try: with transaction.atomic(): # Get layers - logger.debug('Importing layers') + logger.info('Importing layers') rq = urllib.request.Request(layers_url) data = urllib.request.urlopen(rq).read() jsdata = json.loads(data.decode('utf-8'), object_hook=datetime_hook) @@ -287,7 +287,8 @@ def main(): existing_layerbranches = list(LayerBranch.objects.filter(branch__in=branch_idmap.values()).values_list('id', flat=True)) exclude_fields = ['id', 'layer', 'branch', 'yp_compatible_version', 'updated'] - for layerbranchjs in jsdata: + layercount = len(jsdata) + for i, layerbranchjs in enumerate(jsdata): branch = branch_idmap.get(layerbranchjs['branch'], None) if not branch: # We don't have this branch, skip it @@ -308,11 +309,14 @@ def main(): logger.debug('Skipping layerbranch %s, already up-to-date' % layerbranchjs['id']) layerbranch_idmap[layerbranchjs['id']] = layerbranch continue + logger.info('Updating %s (%d/%d)' % (layerbranch, i+1, layercount)) else: + logger.info('Importing %s (%d/%d)' % (layerbranch, i+1, layercount)) layerbranch = LayerBranch() layerbranch.branch = branch layerbranch.layer = layer + for key, value in layerbranchjs.items(): if key in exclude_fields: continue @@ -380,7 +384,7 @@ def main(): layerbranch.delete() # Get layer dependencies - logger.debug('Importing layer dependencies') + logger.info('Importing layer dependencies') rq = urllib.request.Request(layerdeps_url) data = urllib.request.urlopen(rq).read() jsdata = json.loads(data.decode('utf-8'))