downloadfiles: rework and simplify config-handling

Author: frank-w

downloadfiles.py

@@ -39,6 +39,8 @@ def read_settings(infile):
     config=read_settings(conffile)
     print(config)
 
+newconfig = config.copy()
+
 def download(url, file_name=None):
     # get request
     response = requests.get(url)
@@ -215,41 +217,31 @@ def getInitrdInfo():
     else: print(f"kernel not set!")
 else: print(f"{board} not found in ubootfiles")
 
-newconfig={}
-newconfig["variant"]=config.get("variant","")
-
-if config and config.get("skipubootdownload"):
-    newconfig["skipubootdownload"]=config.get("skipubootdownload")
-    newconfig["imgfile"]=config.get("imgfile","")
-    newconfig["bl2file"]=config.get("bl2file","")
-    newconfig["fipfile"]=config.get("fipfile","")
-elif ufile and "mmc" in device:
-    fname=ufile.get("name")
-    a = urlparse(ufile.get("url"))
-    #fname=os.path.basename(a.path)
-    print(f"ubootfile: {ufile} filename: {fname}")
-    if os.path.isfile(fname):
-        print(fname,"already exists")
-        c=input('overwrite it [yn]? ').lower()
-    else: c='y'
-    if c=='y':
-        download(ufile.get("url"),fname)
-    newconfig["imgfile"]=fname
-elif ufile and device in ['spim-nand','nor']:
-    bl2=ufile.get("bl2")
-    fip=ufile.get("fip")
-    if bl2:
-        download(bl2.get("url"),bl2.get("name"))
-        newconfig["bl2file"]=bl2.get("name")
-    if fip:
-        download(fip.get("url"),fip.get("name"))
-        newconfig["fipfile"]=fip.get("name")
+if not config.get("skipubootdownload") and ufile:
+    if "mmc" in device:
+        fname=ufile.get("name")
+        a = urlparse(ufile.get("url"))
+        #fname=os.path.basename(a.path)
+        print(f"ubootfile: {ufile} filename: {fname}")
+        if os.path.isfile(fname):
+            print(fname,"already exists")
+            c=input('overwrite it [yn]? ').lower()
+        else: c='y'
+        if c=='y':
+            download(ufile.get("url"),fname)
+            newconfig["imgfile"]=fname
+    elif device in ['spim-nand','nor']:
+        bl2=ufile.get("bl2")
+        fip=ufile.get("fip")
+        if bl2:
+            download(bl2.get("url"),bl2.get("name"))
+            newconfig["bl2file"]=bl2.get("name")
+        if fip:
+            download(fip.get("url"),fip.get("name"))
+            newconfig["fipfile"]=fip.get("name")
 else: print("no uboot image defined!")
 
-if config and config.get("skipkerneldownload"):
-    newconfig["skipkerneldownload"]=config.get("skipkerneldownload")
-    newconfig["kernelfile"]=config.get("kernelfile")
-elif kfile:
+if not config.get("skipkerneldownload") and kfile:
     a = urlparse(kfile)
     fname=os.path.basename(a.path)
     print(f"kernelfile: {kfile} filename: {fname}")
@@ -259,9 +251,6 @@ def getInitrdInfo():
     newconfig["kernelfile"]=fname
 else: print("no kernel defined!")
 
-if config and config.get("userpackages"):
-    newconfig["userpackages"]=config.get("userpackages")
-
 for replacement in ["hostapd","wpa_supplicant","iperf","iproute2"]:
     if config and config.get("replace"+replacement):
         newconfig["replace"+replacement]=config.get("replace"+replacement)
@@ -275,11 +264,8 @@ def getInitrdInfo():
             newconfig[replacement+"file"]=fname
         else: print("no bfiles defined!")
 
-if config and config.get("skipinitrddownload"):
-    newconfig["skipinitrddownload"]=config.get("skipinitrddownload")
-    newconfig["initrd"]=config.get("initrd","")
-elif device in ["spim-nand","nor"]:
-    if ifiles:
+if not config.get("skipinitrddownload") and ifiles:
+    if device in ["spim-nand","nor"]:
         fname="rootfs_arm64.cpio.zst"
         if fname in ifiles:
             print(f"initrd-file: {fname}")