Create option to choose Widevine version to install from repo.

Author: horstle

lib/inputstreamhelper/__init__.py

@@ -9,10 +9,10 @@
 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, 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, store, system_os, temp_path, unzip, userspace64
 from .widevine.arm import dl_extract_widevine, extract_widevine, install_widevine_arm
-from .widevine.widevine import (backup_path, cdm_from_repo, has_widevinecdm, ia_cdm_path, install_cdm_from_backup, latest_available_widevine_from_repo,
-                                latest_widevine_version, load_widevine_config, missing_widevine_libs, widevine_config_path, widevine_eula, widevinecdm_path)
+from .widevine.widevine import (backup_path, cdm_from_repo, choose_widevine_from_repo, has_widevinecdm, ia_cdm_path, install_cdm_from_backup, latest_widevine_available_from_repo,
+                                latest_widevine_version, load_widevine_config, missing_widevine_libs, widevines_available_from_repo, widevine_config_path, widevine_eula, widevinecdm_path)
 from .unicodes import compat_path
 
 # NOTE: Work around issue caused by platform still using os.popen()
@@ -173,12 +173,15 @@ def _supports_widevine(self):
         return True
 
     @staticmethod
-    def _install_widevine_from_repo(bpath):
+    def _install_widevine_from_repo(bpath, choose_version=False):
         """Install Widevine CDM from Google's library CDM repository"""
-        cdm = latest_available_widevine_from_repo()
+        if choose_version:
+            cdm = choose_widevine_from_repo()
+        else:
+            cdm = latest_widevine_available_from_repo()
         cdm_version = cdm.get('version')
 
-        if not store('download_path'):
+        if not exists(download_path(cdm.get('url'))):
             downloaded = http_download(cdm.get('url'))
         else:
             downloaded = True
@@ -211,7 +214,7 @@ def install_and_finish(self, progress, version):
         return False
 
     @cleanup_decorator
-    def install_widevine(self):
+    def install_widevine(self, choose_version=False):
         """Wrapper function that calls Widevine installer method depending on architecture"""
         if not self._supports_widevine():
             return False
@@ -220,8 +223,10 @@ def install_widevine(self):
             return False
 
         if cdm_from_repo():
-            result = self._install_widevine_from_repo(backup_path())
+            result = self._install_widevine_from_repo(backup_path(), choose_version=choose_version)
         else:
+            if choose_version:
+                log(1, "Choosing a version to install is only implemented if the lib is found in googles repo.")
             result = install_widevine_arm(backup_path())
         if not result:
             return result
@@ -310,7 +315,7 @@ def _update_widevine(self):
         elif cdm_from_repo():
             component = 'Widevine CDM'
             current_version = wv_config['version']
-            latest_version = latest_available_widevine_from_repo().get('version')
+            latest_version = latest_widevine_available_from_repo().get('version')
         else:
             component = 'Chrome OS'
             current_version = wv_config['version']

lib/inputstreamhelper/api.py

@@ -11,7 +11,10 @@ def run(params):
     """Route to API method"""
     if 2 <= len(params) <= 4:
         if params[1] == 'widevine_install':
-            widevine_install()
+            if len(params) == 3:
+                widevine_install(choose_version=params[2])
+            else:
+                widevine_install()
         elif params[1] == 'widevine_remove':
             widevine_remove()
         elif params[1] in ('rollback', 'widevine_rollback'):
@@ -39,9 +42,10 @@ def check_inputstream(protocol, drm=None):
     Helper(protocol, drm=drm).check_inputstream()
 
 
-def widevine_install():
+def widevine_install(choose_version=False):
     """The API interface to install Widevine CDM"""
-    Helper('mpd', drm='widevine').install_widevine()
+    choose_version = choose_version in ("True", "true")
+    Helper('mpd', drm='widevine').install_widevine(choose_version=choose_version)
 
 
 def widevine_install_from():

lib/inputstreamhelper/kodiutils.py

@@ -137,7 +137,7 @@ def select_dialog(heading='', opt_list=None, autoclose=0, preselect=-1, useDetai
     from xbmcgui import Dialog
     if not heading:
         heading = ADDON.getAddonInfo('name')
-    return Dialog().select(heading, opt_list, autoclose=autoclose, preselect=preselect, useDetails=useDetails)
+    return Dialog().select(heading, [str(opt) for opt in opt_list], autoclose=autoclose, preselect=preselect, useDetails=useDetails)
 
 
 def textviewer(heading='', text='', usemono=False):

lib/inputstreamhelper/utils.py

@@ -41,6 +41,13 @@ def update_temp_path(new_temp_path):
         move(old_temp_path, temp_path())
 
 
+def download_path(url):
+    """Choose download target directory based on url."""
+    filename = url.split('/')[-1]
+
+    return os.path.join(temp_path(), filename)
+
+
 def _http_request(url, headers=None, time_out=10):
     """Perform an HTTP request and return request"""
     log(0, 'Request URL: {url}', url=url)
@@ -102,11 +109,11 @@ def http_download(url, message=None, checksum=None, hash_alg='sha1', dl_size=Non
     if req is None:
         return None
 
-    filename = url.split('/')[-1]
+    dl_path = download_path(url)
+    filename = os.path.basename(dl_path)
     if not message:  # display "downloading [filename]"
         message = localize(30015, filename=filename)  # Downloading file
 
-    download_path = os.path.join(temp_path(), filename)
     total_length = int(req.info().get('content-length'))
     if dl_size and dl_size != total_length:
         log(2, 'The given file size does not match the request!')
@@ -120,7 +127,7 @@ def http_download(url, message=None, checksum=None, hash_alg='sha1', dl_size=Non
 
     starttime = time()
     chunk_size = 32 * 1024
-    with open(compat_path(download_path), 'wb') as image:
+    with open(compat_path(dl_path), 'wb') as image:
         size = 0
         while size < total_length:
             try:
@@ -163,7 +170,7 @@ def http_download(url, message=None, checksum=None, hash_alg='sha1', dl_size=Non
         log(4, 'Download failed, checksums do not match!')
         return False
 
-    if dl_size and stat_file(download_path).st_size() != dl_size:
+    if dl_size and stat_file(dl_path).st_size() != dl_size:
         progress.close()
         req.close()
         free_space = sizeof_fmt(diskspace())
@@ -172,7 +179,7 @@ def http_download(url, message=None, checksum=None, hash_alg='sha1', dl_size=Non
 
     progress.close()
     req.close()
-    store('download_path', download_path)
+    store('download_path', dl_path)
     return True
 
 

lib/inputstreamhelper/widevine/widevine.py

@@ -7,7 +7,7 @@
 from time import time
 
 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 ..kodiutils import addon_profile, exists, get_setting_int, listdir, localize, log, mkdirs, ok_dialog, open_file, select_dialog, set_setting, translate_path, yesno_dialog
 from ..utils import arch, cmd_exists, hardlink, http_download, http_get, http_head, parse_version, remove_tree, run_cmd, store, system_os
 from ..unicodes import compat_path, to_unicode
 
@@ -29,7 +29,7 @@ def install_cdm_from_backup(version):
 def widevine_eula():
     """Displays the Widevine EULA and prompts user to accept it."""
     if cdm_from_repo():
-        cdm_version = latest_available_widevine_from_repo().get('version')
+        cdm_version = latest_widevine_available_from_repo().get('version')
         cdm_os = config.WIDEVINE_OS_MAP[system_os()]
         cdm_arch = config.WIDEVINE_ARCH_MAP_REPO[arch()]
     else:  # Grab the license from the x86 files
@@ -176,9 +176,8 @@ def latest_widevine_version(eula=False):
         return ''
     return arm_device.get('version')
 
-
-def latest_available_widevine_from_repo():
-    """Returns the latest available Widevine CDM version and url from Google's library CDM repository"""
+def widevines_available_from_repo():
+    """Returns all available Widevine CDM versions and urls from Google's library CDM repository"""
     cdm_versions = http_get(config.WIDEVINE_VERSIONS_URL).strip('\n').split('\n')
     cdm_os = config.WIDEVINE_OS_MAP[system_os()]
     cdm_arch = config.WIDEVINE_ARCH_MAP_REPO[arch()]
@@ -188,8 +187,37 @@ def latest_available_widevine_from_repo():
         http_status = http_head(cdm_url)
         if http_status == 200:
             available_cdms.append({'version': cdm_version, 'url': cdm_url})
-    return available_cdms[-1]
 
+    return available_cdms
+
+def latest_widevine_available_from_repo(available_cdms=None):
+    """Returns the latest available Widevine CDM version and url from Google's library CDM repository"""
+    if not available_cdms:
+        available_cdms = widevines_available_from_repo()
+    latest = available_cdms[-1]  # That's probably correct, but the following for loop makes sure
+    for cdm in available_cdms:
+        if parse_version(cdm['version']) > parse_version(latest['version']):
+            latest = cdm
+
+    return latest
+
+def choose_widevine_from_repo():
+    """Choose from the widevine versions available in Google's library CDM repository"""
+    available_cdms = widevines_available_from_repo()
+    latest = latest_widevine_available_from_repo(available_cdms)
+
+    opts = tuple(cdm['version'] for cdm in available_cdms)
+    preselect = opts.index(latest['version'])
+
+    version_index = select_dialog(localize(30069), opts, preselect=preselect)
+    if version_index == -1:
+        log(1, 'User did not choose a version to install!')
+        return False
+
+    cdm = available_cdms[version_index]
+    log(0, 'User chose to install Widevine version {version} from {url}', version=cdm['version'], url=cdm['url'])
+
+    return cdm
 
 def remove_old_backups(bpath):
     """Removes old Widevine backups, if number of allowed backups is exceeded"""

resources/language/resource.language.en_gb/strings.po

@@ -265,6 +265,10 @@ msgctxt "#30068"
 msgid "On ARM64 with 64bit userspace, a newer version of {addon} is needed to use [B]Widevine CDM[/B] natively. Please either switch to a 32-bit userspace or install {addon} in version {version} or later."
 msgstr ""
 
+msgctxt "#30069"
+msgid "Choose which version to install"
+msgstr ""
+
 
 ### INFORMATION DIALOG
 msgctxt "#30800"

resources/settings.xml

@@ -12,7 +12,7 @@
         <setting label="30907" help="30908" type="folder" id="temp_path" source="" option="writeable" default="special://masterprofile/addon_data/script.module.inputstreamhelper" visible="![System.Platform.Android | String.StartsWith(System.BuildVersion, 17)]"/>
         <setting label="30913" help="30914" type="slider" id="backups" default="4" range="0,1,20" option="int" visible="![System.Platform.Android | String.StartsWith(System.BuildVersion, 17)]"/>
         <setting type="sep" visible="![System.Platform.Android | String.StartsWith(System.BuildVersion, 17)]"/>
-        <setting label="30909" help="30910" type="action" action="RunScript(script.module.inputstreamhelper, widevine_install)" enable="String.StartsWith(System.BuildVersion,18) + System.HasAddon(inputstream.adaptive) | System.AddonIsEnabled(inputstream.adaptive)" visible="![System.Platform.Android | String.StartsWith(System.BuildVersion, 17)]"/>
+        <setting label="30909" help="30910" type="action" action="RunScript(script.module.inputstreamhelper, widevine_install, True)" enable="String.StartsWith(System.BuildVersion,18) + System.HasAddon(inputstream.adaptive) | System.AddonIsEnabled(inputstream.adaptive)" visible="![System.Platform.Android | String.StartsWith(System.BuildVersion, 17)]"/>
         <setting label="30911" help="30912" type="action" action="RunScript(script.module.inputstreamhelper, widevine_remove)" enable="String.StartsWith(System.BuildVersion,18) + System.HasAddon(inputstream.adaptive) | System.AddonIsEnabled(inputstream.adaptive)" visible="![System.Platform.Android | String.StartsWith(System.BuildVersion, 17)]"/>
         <setting label="30915" help="30916" type="action" action="RunScript(script.module.inputstreamhelper, rollback)" enable="String.StartsWith(System.BuildVersion,18) + System.HasAddon(inputstream.adaptive) | System.AddonIsEnabled(inputstream.adaptive)" visible="![System.Platform.Android | String.StartsWith(System.BuildVersion, 17)]"/>
     </category>