Merge pull request #15 from itoffshore/testing

add template regeneration to template downloads

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "distrobuilder_menu"
-version = "0.2.0"
+version = "0.2.1"
 authors = [
   { name="Stuart Cardall", email="developer@it-offshore.co.uk" },
 ]

src/distrobuilder_menu/api/gethub.py

@@ -129,9 +129,9 @@ def check_url(self, url):
 
 
     def download_files(self, file_dict):
-        """ As input takes a dict with keys: 'url' / 'file' as the
-            source & destination of file downloads. Input is generated
-            by update_templates() in the main application.
+        """ As input takes a list of dicts with keys: 'url' / 'file' as the
+            source & destination of file downloads. Input is generated by
+            update_templates() in the main application.
         """
         for item in file_dict:
             url = item['url']

src/distrobuilder_menu/app.py

@@ -80,7 +80,9 @@ def main():
 
     # --regen menu option
     if ARGS.regenerate:
-        templates.create_custom_lists()
+        base_list, custom_list = templates.create_custom_lists()
+        templates.regenerate_template(base_list)
+        templates.regenerate_template(custom_list)
 
     # by default show the main menu & also show it after individual options run
     common.menu_default()

src/distrobuilder_menu/config/app.py

@@ -94,6 +94,6 @@ def get_args(argv=None):
                         help="regenerate custom templates")
     parser.add_argument("-v", "--version", action="version",
                         help="show dbmenu version",
-                        version='%(prog)s 0.2.0')
+                        version='%(prog)s 0.2.1')
 
     return parser.parse_args(argv)

src/distrobuilder_menu/templates.py

@@ -149,10 +149,43 @@ def update_templates():
     # download files
     if download_list:
         GETHUB.download_files(download_list)
+        # regenerate base / custom templates
+        process_updates(download_list)
     else:
         utils.die(0, f"Template files are up to date: {USER_CONFIG.subdir_images}\n")
 
 
+def process_updates(download_list):
+    """ Takes the list of dictionaries generated by update_templates() & compares
+        destination files with the 'source' key from JSON footers now added to
+        custom templates (so they can be regenerated)
+
+    Args:
+        download_list (list): list of dicts expecting keys: 'url' / 'file'
+    """
+    regenerate_base, regenerate_custom = [], []
+    base_list, custom_list = create_custom_lists()
+
+    # base_list
+    for item_file in download_list:
+        downloaded_file = str(item_file['file'])
+
+        for item_json in base_list:
+            if downloaded_file == item_json['source']:
+                regenerate_base.append(item_json)
+
+    # custom_list
+    for item_base in regenerate_base:
+        base_destination = item_base['destination']
+
+        for item_custom in custom_list:
+            if item_custom['source'] == base_destination:
+                regenerate_custom.append(item_custom)
+
+    regenerate_template(regenerate_base)
+    regenerate_template(regenerate_custom)
+
+
 def process_data(lxd_json_data):
     """Parses LXD json data & Returns a list of dicts with
        relevant template build options.
@@ -243,12 +276,11 @@ def create_custom_lists():
             fail_list.append(key)
 
     if fail_list:
-        print(f"WARN: unable to regenerate templates: {fail_list} => no dbmenu footer")
+        print(f"\nWARN: unable to regenerate templates: {fail_list} => no dbmenu footer")
     else:
-        print("INFO: all custom templates have a dbmenu footer")
+        print("\nINFO: all custom templates have a dbmenu footer")
 
-    regenerate_template(base_list)
-    regenerate_template(custom_list)
+    return base_list, custom_list
 
 
 def regenerate_template(json_data_list):