Improve getting Widevine CDM from repo (#436)

Author: mediaminister

lib/inputstreamhelper/__init__.py

@@ -11,8 +11,8 @@
                         set_setting, set_setting_bool, textviewer, translate_path, yesno_dialog)
 from .utils import arch, http_download, remove_tree, run_cmd, store, system_os, temp_path, unzip
 from .widevine.arm import install_widevine_arm, unmount
-from .widevine.widevine import (backup_path, has_widevinecdm, ia_cdm_path, install_cdm_from_backup, latest_widevine_version,
-                                load_widevine_config, missing_widevine_libs, widevine_config_path, widevine_eula, widevinecdm_path)
+from .widevine.widevine import (backup_path, 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 .unicodes import compat_path
 
 # NOTE: Work around issue caused by platform still using os.popen()
@@ -171,14 +171,11 @@ def _supports_widevine():
     @staticmethod
     def _install_widevine_x86(bpath):
         """Install Widevine CDM on x86 based architectures."""
-        cdm_version = latest_widevine_version()
+        cdm = latest_available_widevine_from_repo()
+        cdm_version = cdm.get('version')
 
         if not store('download_path'):
-            cdm_os = config.WIDEVINE_OS_MAP[system_os()]
-            cdm_arch = config.WIDEVINE_ARCH_MAP_X86[arch()]
-            url = config.WIDEVINE_DOWNLOAD_URL.format(version=cdm_version, os=cdm_os, arch=cdm_arch)
-
-            downloaded = http_download(url)
+            downloaded = http_download(cdm.get('url'))
         else:
             downloaded = True
 
@@ -279,13 +276,13 @@ def _update_widevine(self):
         elif 'x86' in arch():
             component = 'Widevine CDM'
             current_version = wv_config['version']
+            latest_version = latest_available_widevine_from_repo().get('version')
         else:
             component = 'Chrome OS'
             current_version = wv_config['version']
-
-        latest_version = latest_widevine_version()
+            latest_version = latest_widevine_version()
         if not latest_version:
-            log(3, 'Updating widevine failed. Could not determine latest version.')
+            log(3, 'Updating Widevine CDM failed. Could not determine latest version.')
             return
 
         log(0, 'Latest {component} version is {version}', component=component, version=latest_version)

lib/inputstreamhelper/utils.py

@@ -73,6 +73,17 @@ def http_get(url):
     return content.decode()
 
 
+def http_head(url):
+    """Perform an HTTP HEAD request and return status code"""
+    req = Request(url)
+    req.get_method = lambda: 'HEAD'
+    try:
+        resp = urlopen(req)
+        return resp.getcode()
+    except HTTPError as exc:
+        return exc.getcode()
+
+
 def http_download(url, message=None, checksum=None, hash_alg='sha1', dl_size=None, background=False):  # pylint: disable=too-many-statements
     """Makes HTTP request and displays a progress dialog on download."""
     if checksum:

lib/inputstreamhelper/widevine/widevine.py

@@ -8,7 +8,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, http_get, remove_tree, run_cmd, store, system_os
+from ..utils import arch, cmd_exists, hardlink, http_download, http_get, http_head, remove_tree, run_cmd, store, system_os
 from ..unicodes import compat_path, to_unicode
 
 
@@ -28,13 +28,13 @@ def install_cdm_from_backup(version):
 
 def widevine_eula():
     """Displays the Widevine EULA and prompts user to accept it."""
-
-    cdm_version = latest_widevine_version(eula=True)
     if 'x86' in arch():
+        cdm_version = latest_available_widevine_from_repo().get('version')
         cdm_os = config.WIDEVINE_OS_MAP[system_os()]
         cdm_arch = config.WIDEVINE_ARCH_MAP_X86[arch()]
     else:  # grab the license from the x86 files
         log(0, 'Acquiring Widevine EULA from x86 files.')
+        cdm_version = latest_widevine_version(eula=True)
         cdm_os = 'mac'
         cdm_arch = 'x64'
 
@@ -170,6 +170,20 @@ def latest_widevine_version(eula=False):
     return arm_device['version']
 
 
+def latest_available_widevine_from_repo():
+    """Returns the latest available Widevine CDM version and url 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_X86[arch()]
+    available_cdms = []
+    for cdm_version in cdm_versions:
+        cdm_url = config.WIDEVINE_DOWNLOAD_URL.format(version=cdm_version, os=cdm_os, arch=cdm_arch)
+        http_status = http_head(cdm_url)
+        if http_status == 200:
+            available_cdms.append(dict(version=cdm_version, url=cdm_url))
+    return available_cdms[-1]
+
+
 def remove_old_backups(bpath):
     """Removes old Widevine backups, if number of allowed backups is exceeded"""
     from distutils.version import LooseVersion  # pylint: disable=import-error,no-name-in-module,useless-suppression