Remove the store function. http_download now returns the download path. (#562)

Author: horstle

lib/inputstreamhelper/__init__.py

@@ -10,7 +10,7 @@
 from .kodiutils import (addon_version, browsesingle, delete, exists, get_proxies, get_setting, get_setting_bool, get_setting_float, get_setting_int, jsonrpc,
                         kodi_to_ascii, kodi_version, listdir, localize, log, notification, ok_dialog, progress_dialog, select_dialog,
                         set_setting, set_setting_bool, textviewer, translate_path, yesno_dialog)
-from .utils import arch, download_path, http_download, parse_version, remove_tree, store, system_os, temp_path, unzip, userspace64
+from .utils import arch, download_path, http_download, parse_version, remove_tree, system_os, temp_path, unzip, userspace64
 from .widevine.arm import dl_extract_widevine_chromeos, extract_widevine_chromeos, install_widevine_arm
 from .widevine.arm_lacros import cdm_from_lacros, latest_lacros
 from .widevine.widevine import (backup_path, has_widevinecdm, ia_cdm_path,
@@ -189,16 +189,15 @@ def _install_widevine_from_repo(bpath, choose_version=False):
             return cdm
 
         cdm_version = cdm.get('version')
+        dl_path = download_path(cdm.get('url'))
 
-        if not exists(download_path(cdm.get('url'))):
-            downloaded = http_download(cdm.get('url'))
-        else:
-            downloaded = True
+        if not exists(dl_path):
+            dl_path = http_download(cdm.get('url'))
 
-        if downloaded:
+        if dl_path:
             progress = progress_dialog()
             progress.create(heading=localize(30043), message=localize(30044))  # Extracting Widevine CDM
-            unzip(store('download_path'), os.path.join(bpath, cdm_version, ''))
+            unzip(dl_path, os.path.join(bpath, cdm_version, ''))
 
             return (progress, cdm_version)
 

lib/inputstreamhelper/utils.py

@@ -211,8 +211,7 @@ def http_download(url, message=None, checksum=None, hash_alg='sha1', dl_size=Non
         else:
             return False
 
-    store('download_path', dl_path)
-    return True
+    return dl_path
 
 
 def unzip(source, destination, file_to_unzip=None, result=[]):  # pylint: disable=dangerous-default-value
@@ -256,19 +255,6 @@ def system_os():
     return sys_name
 
 
-def store(name, val=None):
-    """Store arbitrary value across functions"""
-
-    if val is not None:
-        setattr(store, name, val)
-        log(0, 'Stored {} in {}'.format(val, name))
-        return val
-
-    if not hasattr(store, name):
-        return None
-    return getattr(store, name)
-
-
 def diskspace():
     """Return the free disk space available (in bytes) in temp_path."""
     statvfs = os.statvfs(compat_path(temp_path()))

lib/inputstreamhelper/widevine/arm.py

@@ -8,7 +8,7 @@
 
 from .. import config
 from ..kodiutils import browsesingle, localize, log, ok_dialog, open_file, progress_dialog, yesno_dialog
-from ..utils import diskspace, http_download, http_get, parse_version, sizeof_fmt, store, system_os, update_temp_path, userspace64
+from ..utils import diskspace, http_download, http_get, parse_version, sizeof_fmt, system_os, update_temp_path, userspace64
 from .arm_chromeos import ChromeOSImage
 from .arm_lacros import cdm_from_lacros, install_widevine_arm_lacros
 
@@ -111,19 +111,17 @@ def install_widevine_arm_chromeos(backup_path):
 def dl_extract_widevine_chromeos(url, backup_path, arm_device=None):
     """Download the ChromeOS image and extract Widevine from it"""
     if arm_device:
-        downloaded = http_download(url, message=localize(30022), checksum=arm_device['sha1'], hash_alg='sha1',
+        dl_path = http_download(url, message=localize(30022), checksum=arm_device['sha1'], hash_alg='sha1',
                                    dl_size=int(arm_device['zipfilesize']))  # Downloading the recovery image
         image_version = arm_device['version']
     else:
-        downloaded = http_download(url, message=localize(30022))
+        dl_path = 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')
-
-        progress = extract_widevine_chromeos(backup_path, image_path, image_version)
+    if dl_path:
+        progress = extract_widevine_chromeos(backup_path, dl_path, image_version)
         if not progress:
             return False
 

lib/inputstreamhelper/widevine/arm_lacros.py

@@ -9,7 +9,7 @@
 from .repo import cdm_from_repo
 from .. import config
 from ..kodiutils import exists, localize, log, mkdirs, open_file, progress_dialog
-from ..utils import http_download, http_get, store, system_os, userspace64
+from ..utils import http_download, http_get, system_os, userspace64
 from ..unsquash import SquashFs
 
 
@@ -67,10 +67,10 @@ def install_widevine_arm_lacros(backup_path, img_version=None):
 
     url = config.LACROS_DOWNLOAD_URL.format(version=img_version, arch=("arm64" if userspace64() else "arm"))
 
-    downloaded = http_download(url, message=localize(30072))
+    dl_path = http_download(url, message=localize(30072))
 
-    if downloaded:
-        progress = extract_widevine_lacros(store("download_path"), backup_path, img_version)
+    if dl_path:
+        progress = extract_widevine_lacros(dl_path, backup_path, img_version)
         if progress:
             return (progress, img_version)
 

lib/inputstreamhelper/widevine/widevine.py

@@ -9,7 +9,7 @@
 from .. import config
 from ..kodiutils import (addon_profile, exists, get_setting_int, listdir, localize, log, mkdirs,
                          ok_dialog, open_file, set_setting, translate_path, yesno_dialog)
-from ..utils import arch, cmd_exists, hardlink, http_download, parse_version, remove_tree, run_cmd, store, system_os
+from ..utils import arch, cmd_exists, hardlink, http_download, parse_version, remove_tree, run_cmd, system_os
 from ..unicodes import compat_path, to_unicode
 from .arm_lacros import cdm_from_lacros, latest_lacros
 from .repo import cdm_from_repo, latest_widevine_available_from_repo
@@ -42,12 +42,12 @@ def widevine_eula():
         cdm_arch = 'x64'
 
     url = config.WIDEVINE_DOWNLOAD_URL.format(version=cdm_version, os=cdm_os, arch=cdm_arch)
-    downloaded = http_download(url, message=localize(30025), background=True)  # Acquiring EULA
-    if not downloaded:
+    dl_path = http_download(url, message=localize(30025), background=True)  # Acquiring EULA
+    if not dl_path:
         return False
 
     from zipfile import ZipFile
-    with ZipFile(compat_path(store('download_path'))) as archive:
+    with ZipFile(compat_path(dl_path)) as archive:
         with archive.open(config.WIDEVINE_LICENSE_FILE) as file_obj:
             eula = file_obj.read().decode().strip().replace('\n', ' ')