Add option to install Widevine from ChromeOS image specified by URL or local. (#499)

Author: horstle

.github/workflows/addon-check.yml

@@ -20,6 +20,7 @@ jobs:
         python-version: 3.8
     - name: Install dependencies
       run: |
+        sudo apt-get update
         sudo apt-get install libxml2-utils xmlstarlet
         python -m pip install --upgrade pip packaging
         pip install kodi-addon-checker

.github/workflows/release.yml

@@ -12,6 +12,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Build zip files
         run: |
+          sudo apt-get update
           sudo apt-get install libxml2-utils
           make multizip release=1
       - name: Get Krypton filename

lib/inputstreamhelper/__init__.py

@@ -6,11 +6,11 @@
 import os
 
 from . import config
-from .kodiutils import (addon_version, delete, exists, get_proxies, get_setting, get_setting_bool, get_setting_float, get_setting_int, jsonrpc,
+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
-from .widevine.arm import install_widevine_arm
+from .widevine.arm import dl_extract_widevine, extract_widevine, install_widevine_arm
 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
@@ -229,6 +229,33 @@ def install_widevine(self):
         ok_dialog(localize(30004), localize(30005))  # An error occurred
         return False
 
+    @cleanup_decorator
+    def install_widevine_from(self):
+        """Install Widevine from a given URL or file."""
+        if yesno_dialog(None, localize(30066)): # download resource with widevine from url? no means specify local
+            result = dl_extract_widevine(get_setting("image_url"), backup_path())
+            if not result:
+                return result
+
+            if self.install_and_finish(*result):
+                return True
+
+        else:
+            image_path = browsesingle(1, localize(30067), "files")
+            if not image_path:
+                return False
+
+            image_version = os.path.basename(image_path).split("_")[1]
+            progress = extract_widevine(backup_path(), image_path, image_version)
+            if not progress:
+                return False
+
+            if self.install_and_finish(progress, image_version):
+                return True
+
+        return False
+
+
     @staticmethod
     def remove_widevine():
         """Removes Widevine CDM"""

lib/inputstreamhelper/api.py

@@ -23,6 +23,8 @@ def run(params):
                 check_inputstream(params[2], drm=params[3])
         elif params[1] == 'info':
             info_dialog()
+        elif params[1] == 'widevine_install_from':
+            widevine_install_from()
         else:
             log(4, "Invalid API call method '{method}'", method=params[1])
 
@@ -42,6 +44,11 @@ def widevine_install():
     Helper('mpd', drm='widevine').install_widevine()
 
 
+def widevine_install_from():
+    """The API interface to install Widevine CDM from a given resource (URL or local ChromeOS image)."""
+    Helper('mpd', drm='widevine').install_widevine_from()
+
+
 def widevine_remove():
     """The API interface to remove Widevine CDM"""
     Helper('mpd', drm='widevine').remove_widevine()

lib/inputstreamhelper/widevine/arm.py

@@ -92,29 +92,58 @@ def install_widevine_arm(backup_path):
 
         log(2, 'Downloading ChromeOS image for Widevine: {hwid} ({version})'.format(**arm_device))
         url = arm_device['url']
+
+        extracted = dl_extract_widevine(url, backup_path, arm_device)
+        if extracted:
+            recovery_file = os.path.join(backup_path, arm_device['version'], os.path.basename(config.CHROMEOS_RECOVERY_URL))
+            with open_file(recovery_file, 'w') as reco_file:  # pylint: disable=unspecified-encoding
+                reco_file.write(json.dumps(devices, indent=4))
+
+            return extracted
+
+    return False
+
+
+def dl_extract_widevine(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_size=int(arm_device['zipfilesize']))  # Downloading the recovery image
-        if downloaded:
-            progress = progress_dialog()
-            progress.create(heading=localize(30043), message=localize(30044))  # Extracting Widevine CDM
+        image_version = arm_device['version']
+    else:
+        downloaded = http_download(url, message=localize(30022))
+        image_version = os.path.basename(url).split('_')[1]
 
-            extracted = ChromeOSImage(store('download_path')).extract_file(
-                filename=config.WIDEVINE_CDM_FILENAME[system_os()],
-                extract_path=os.path.join(backup_path, arm_device['version']),
-                progress=progress)
+    if downloaded:
+        image_path = store('download_path')
 
-            if not extracted:
-                log(4, 'Extracting widevine from the zip failed!')
-                progress.close()
-                return False
+        progress = extract_widevine(backup_path, image_path, image_version)
+        if not progress:
+            return False
 
-            recovery_file = os.path.join(backup_path, arm_device['version'], os.path.basename(config.CHROMEOS_RECOVERY_URL))
-            config_file = os.path.join(backup_path, arm_device['version'], 'config.json')
-            with open_file(recovery_file, 'w') as reco_file:  # pylint: disable=unspecified-encoding
-                reco_file.write(json.dumps(devices, indent=4))
+        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))
 
-            return (progress, arm_device['version'])
+        return (progress, image_version)
 
     return False
+
+
+def extract_widevine(backup_path, image_path, image_version):
+    """Extract Widevine from the given ChromeOS image"""
+    progress = progress_dialog()
+    progress.create(heading=localize(30043), message=localize(30044))  # Extracting Widevine CDM
+
+    extracted = ChromeOSImage(image_path).extract_file(
+        filename=config.WIDEVINE_CDM_FILENAME[system_os()],
+        extract_path=os.path.join(backup_path, image_version),
+        progress=progress)
+
+    if not extracted:
+        log(4, 'Extracting widevine from the zip failed!')
+        progress.close()
+        return False
+
+    return progress

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

@@ -257,6 +257,14 @@ msgctxt "#30065"
 msgid "Shall we try again?"
 msgstr ""
 
+msgctxt "#30066"
+msgid "Should the resource containing the Widevine library be downloaded from the URL specified in settings?\nNo means specifying the resource locally."
+msgstr ""
+
+msgctxt "#30067"
+msgid "Specify the resource Widevine should be extracted from."
+msgstr ""
+
 
 ### INFORMATION DIALOG
 msgctxt "#30800"
@@ -336,3 +344,15 @@ msgstr ""
 msgctxt "#30915"
 msgid "Restore Widevine CDM library..."
 msgstr ""
+
+msgctxt "#30950"
+msgid "Debug"
+msgstr ""
+
+msgctxt "#30953"
+msgid "Install Widevine from:"
+msgstr ""
+
+msgctxt "#30955"
+msgid "Install Widevine CDM library from specific source..."
+msgstr ""

resources/settings.xml

@@ -7,8 +7,6 @@
         <setting id="version" default="" visible="false"/>
         <setting label="30901" help="30902" type="action" action="RunScript(script.module.inputstreamhelper, info)"/>
         <setting type="sep"/>
-        <setting label="30903" help="30904" type="bool" id="disabled" default="false"/>
-        <setting label="30904" type="text" enable="false"/> <!-- disabled_warning -->
         <setting label="30905" help="30906" type="slider" id="update_frequency" default="31" range="1,3,90" option="int" enable="eq(-2,false)" visible="![System.Platform.Android | String.StartsWith(System.BuildVersion, 17)]"/>
         <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)]"/>
@@ -17,4 +15,10 @@
         <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>
+    <category label="30950">
+        <setting label="30903" help="30904" type="bool" id="disabled" default="false"/>
+        <setting label="30904" type="text" enable="false"/> <!-- disabled_warning -->
+        <setting label="30953" help="30954" type="text" id="image_url" option="urlencoded" default="https://dl.google.com/dl/edgedl/chromeos/recovery/chromeos_14092.77.0_veyron-fievel_recovery_stable-channel_fievel-mp.bin.zip"/>
+        <setting label="30955" help="30956" type="action" action="RunScript(script.module.inputstreamhelper, widevine_install_from)" enable="String.StartsWith(System.BuildVersion,18) + System.HasAddon(inputstream.adaptive) | System.AddonIsEnabled(inputstream.adaptive)" visible="![System.Platform.Android | String.StartsWith(System.BuildVersion, 17)]"/>
+    </category>
 </settings>