Fix issue with new install_from option, where no config.json is created and thus the version couldn't be determined reliably. (#515)

Author: horstle

lib/inputstreamhelper/widevine/arm.py

@@ -113,6 +113,8 @@ def dl_extract_widevine(url, backup_path, arm_device=None):
     else:
         downloaded = http_download(url, message=localize(30022))
         image_version = os.path.basename(url).split('_')[1]
+        # minimal info for config.json, "version" is definitely needed e.g. in load_widevine_config:
+        arm_device = {"file": os.path.basename(url), "url": url, "version": image_version}
 
     if downloaded:
         image_path = store('download_path')
@@ -121,10 +123,9 @@ def dl_extract_widevine(url, backup_path, arm_device=None):
         if not progress:
             return False
 
-        if arm_device:
-            config_file = os.path.join(backup_path, image_version, 'config.json')
-            with open_file(config_file, 'w') as conf_file:
-                conf_file.write(json.dumps(arm_device))
+        config_file = os.path.join(backup_path, image_version, 'config.json')
+        with open_file(config_file, 'w') as conf_file:
+            conf_file.write(json.dumps(arm_device))
 
         return (progress, image_version)
 

lib/inputstreamhelper/widevine/widevine.py

@@ -192,7 +192,11 @@ def remove_old_backups(bpath):
     if len(versions) < 2:
         return
 
-    installed_version = load_widevine_config()['version']
+    try:
+        installed_version = load_widevine_config()['version']
+    except TypeError:
+        log(2, "could not determine installed version. Aborting cleanup of old versions.")
+        return
 
     while len(versions) > max_backups + 1:
         remove_version = str(versions[1] if versions[0] == parse_version(installed_version) else versions[0])