Support vendor widevine library

This adds support for a vendor-supported Widevine library.

Author: dagwieers

lib/inputstreamhelper/__init__.py

@@ -6,13 +6,14 @@
 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,
-                        kodi_to_ascii, kodi_version, localize, log, notification, ok_dialog, progress_dialog, select_dialog,
+from .kodiutils import (addon_version, delete, exists, get_proxies, get_setting, get_setting_bool, get_setting_float, get_setting_int,
+                        jsonrpc, kodi_to_ascii, kodi_version, 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, run_cmd, store, system_os, temp_path, unzip
 from .widevine.arm import install_widevine_arm, select_best_chromeos_image, 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_vendor_widevinecdm, 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)
 
 # NOTE: Work around issue caused by platform still using os.popen()
 #       This helps to survive 'IOError: [Errno 10] No child processes'
@@ -293,6 +294,9 @@ def _check_widevine(self):
         if system_os() == 'Android':  # no checks needed for Android
             return True
 
+        if has_vendor_widevinecdm():  # no checks needed for vendor-supplied Widevine
+            return True
+
         if not exists(widevine_config_path()):
             log(4, 'Widevine or Chrome OS recovery.conf is missing. Reinstall is required.')
             ok_dialog(localize(30001), localize(30031))  # An update of Widevine is required
@@ -417,14 +421,19 @@ def info_dialog(self):
         text += localize(30820) + '\n'  # Widevine information
         if system_os() == 'Android':
             text += ' - ' + localize(30821) + '\n'
+        elif has_vendor_widevinecdm():
+            text += ' - ' + localize(30822, version=self._get_lib_version(widevinecdm_path())) + '\n'
         else:
             from datetime import datetime
-            wv_updated = datetime.fromtimestamp(get_setting_float('last_update', 0.0)).strftime("%Y-%m-%d %H:%M") if get_setting_float('last_update', 0.0) else 'Never'
-            text += ' - ' + localize(30822, version=self._get_lib_version(widevinecdm_path()), date=wv_updated) + '\n'
-            text += ' - ' + localize(30823, path=ia_cdm_path()) + '\n'
+            if get_setting_float('last_update', 0.0):
+                wv_updated = datetime.fromtimestamp(get_setting_float('last_update', 0.0)).strftime("%Y-%m-%d %H:%M")
+            else:
+                wv_updated = 'Never'
+            text += ' - ' + localize(30823, version=self._get_lib_version(widevinecdm_path()), date=wv_updated) + '\n'
+            text += ' - ' + localize(30824, path=ia_cdm_path()) + '\n'
 
             if arch() in ('arm', 'arm64'):  # Chrome OS version
-                text += ' - ' + localize(30824, version=select_best_chromeos_image(load_widevine_config())['version']) + '\n'
+                text += ' - ' + localize(30825, version=select_best_chromeos_image(load_widevine_config())['version']) + '\n'
 
         text += '\n'
 

lib/inputstreamhelper/kodiutils.py

@@ -56,17 +56,17 @@ def get_addon_info(key):
 
 
 def addon_id():
-    """Cache and return add-on ID"""
+    """Return add-on ID"""
     return get_addon_info('id')
 
 
 def addon_profile():
-    """Cache and return add-on profile"""
+    """Return add-on profile"""
     return translate_path(ADDON.getAddonInfo('profile'))
 
 
 def addon_version():
-    """Cache and return add-on version"""
+    """Return add-on version"""
     return get_addon_info('version')
 
 
@@ -311,6 +311,31 @@ def kodi_to_ascii(string):
     return string
 
 
+def samefile(src, dest):
+    """Check if file is identical"""
+    stat_src = stat_file(src)
+    stat_dest = stat_file(dest)
+    # Check if this is a hardlink
+    if (stat_src.st_dev(), stat_src.st_ino()) == (stat_dest.st_dev(), stat_dest.st_ino()):
+        return True
+
+    # Check file sizes
+    if stat_src.st_size() != stat_dest.st_size():
+        return False
+
+    # Check if this is a symlink
+    from os.path import samefile as opsamefile
+    if opsamefile(src, dest):
+        return True
+
+    # Otherwise compare content (may be slow)
+    with open(src, 'r') as srcfd, open(dest, 'r') as destfd:
+        if srcfd.read() == destfd.read():
+            return True
+
+    return False
+
+
 def copy(src, dest):
     """Copy a file (using xbmcvfs)"""
     from xbmcvfs import copy as vfscopy

lib/inputstreamhelper/utils.py

@@ -19,7 +19,7 @@ def temp_path():
 
 
 def update_temp_path(new_temp_path):
-    """"Updates temp_path and merges files."""
+    """"Updates temp_path and merges files"""
     old_temp_path = temp_path()
 
     set_setting('temp_path', new_temp_path)
@@ -64,7 +64,7 @@ def http_get(url):
 
 
 def http_download(url, message=None, checksum=None, hash_alg='sha1', dl_size=None):
-    """Makes HTTP request and displays a progress dialog on download."""
+    """Makes HTTP request and displays a progress dialog on download"""
     if checksum:
         from hashlib import sha1, md5
         if hash_alg == 'sha1':
@@ -174,7 +174,7 @@ def store(name, val=None):
 
 
 def diskspace():
-    """Return the free disk space available (in bytes) in temp_path."""
+    """Return the free disk space available (in bytes) in temp_path"""
     statvfs = os.statvfs(temp_path())
     return statvfs.f_frsize * statvfs.f_bavail
 
@@ -220,7 +220,7 @@ def run_cmd(cmd, sudo=False, shell=False):
 
 
 def sizeof_fmt(num, suffix='B'):
-    """Return size of file in a human readable string."""
+    """Return size of file in a human readable string"""
     # https://stackoverflow.com/questions/1094841/reusable-library-to-get-human-readable-version-of-file-size
     for unit in ['', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi']:
         if abs(num) < 1024.0:
@@ -230,26 +230,36 @@ def sizeof_fmt(num, suffix='B'):
 
 
 def arch():
-    """Map together and return the system architecture."""
+    """Map together, cache and return the system architecture"""
+
+    if hasattr(arch, 'cached'):
+        return getattr(arch, 'cached')
+
     from platform import architecture, machine
     sys_arch = machine()
     if sys_arch == 'aarch64':
         import struct
         if struct.calcsize('P') * 8 == 32:
             # Detected 64-bit kernel in 32-bit userspace, use 32-bit arm widevine
             sys_arch = 'arm'
-    if sys_arch == 'AMD64':
+
+    elif sys_arch == 'AMD64':
         sys_arch_bit = architecture()[0]
         if sys_arch_bit == '32bit':
             sys_arch = 'x86'  # else, sys_arch = AMD64
+
     elif 'armv' in sys_arch:
         import re
         arm_version = re.search(r'\d+', sys_arch.split('v')[1])
         if arm_version:
             sys_arch = 'armv' + arm_version.group()
+
     if sys_arch in config.ARCH_MAP:
-        return config.ARCH_MAP[sys_arch]
+        sys_arch = config.ARCH_MAP[sys_arch]
+
+    log(0, 'Found system architecture {arch}', arch=sys_arch)
 
+    arch.cached = sys_arch
     return sys_arch
 
 

lib/inputstreamhelper/widevine/arm.py

@@ -196,7 +196,8 @@ def install_widevine_arm(backup_path):  # pylint: disable=too-many-statements
             return False
 
         url = arm_device['url']
-        downloaded = http_download(url, message=localize(30022), checksum=arm_device['sha1'], hash_alg='sha1', dl_size=int(arm_device['zipfilesize']))  # Downloading the recovery image
+        # Downloading the recovery image
+        downloaded = http_download(url, message=localize(30022), checksum=arm_device['sha1'], hash_alg='sha1', dl_size=int(arm_device['zipfilesize']))
         if downloaded:
             from threading import Thread
             from xbmc import sleep

lib/inputstreamhelper/widevine/widevine.py

@@ -6,7 +6,8 @@
 import os
 
 from .. import config
-from ..kodiutils import addon_profile, exists, get_setting_int, localize, log, mkdir, ok_dialog, translate_path, yesno_dialog
+from ..kodiutils import (addon_profile, exists, get_setting_int, localize, log, mkdir, ok_dialog, samefile, translate_path,
+                         yesno_dialog)
 from ..utils import arch, cmd_exists, hardlink, http_download, http_get, run_cmd, store, system_os
 
 
@@ -80,11 +81,18 @@ def widevinecdm_path():
     return os.path.join(ia_cdm_path(), widevinecdm_filename)
 
 
+def vendor_widevinecdm_path():
+    """Get full vendor Widevine CDM path"""
+    return '{0}_vendor{1}'.format(*os.path.splitext(widevinecdm_path()))
+
+
 def has_widevinecdm():
     """Whether a Widevine CDM is installed on the system"""
     if system_os() == 'Android':  # Widevine CDM is built into Android
         return True
 
+    hardlink_vendor_widevinecdm()  # If vendor Widevine is present, hardlink into place
+
     widevinecdm = widevinecdm_path()
     if widevinecdm is None:
         return False
@@ -95,6 +103,24 @@ def has_widevinecdm():
     return True
 
 
+def has_vendor_widevinecdm():
+    """Whether the system has a vendor-supplied widevine CDM"""
+    if not exists(vendor_widevinecdm_path()):
+        return False
+    return True
+
+
+def hardlink_vendor_widevinecdm():
+    """Hardlink vendor Widevine into place"""
+    vendor_widevinecdm = vendor_widevinecdm_path()
+    if not exists(vendor_widevinecdm):
+        return
+    widevinecdm = widevinecdm_path()
+    if exists(widevinecdm) and samefile(vendor_widevinecdm, widevinecdm):
+        return
+    hardlink(vendor_widevinecdm, widevinecdm)
+
+
 def ia_cdm_path():
     """Return the specified CDM path for inputstream.adaptive, usually ~/.kodi/cdm"""
     from xbmcaddon import Addon

resources/language/resource.language.de_de/strings.po

@@ -272,14 +272,18 @@ msgid "Widevine version: [B]Built into Android[/B]"
 msgstr "Widevine Version: [B]In Android eingebaut[/B]"
 
 msgctxt "#30822"
+msgid "Widevine version: [B]{version} [COLOR gray](supplied by vendor)[/COLOR][/B]"
+msgstr ""
+
+msgctxt "#30823"
 msgid "Widevine version: [B]{version}[/B] [COLOR gray](last updated on [B]{date}[/B])[/COLOR]"
 msgstr "Widevine Version: [B]{version}[/B] [COLOR gray](zuletzt aktualisiert am [B]{date}[/B])[/COLOR]"
 
-msgctxt "#30823"
+msgctxt "#30824"
 msgid "Widevine CDM path: [B]{path}[/B]"
 msgstr "Widevine CDM Pfad: [B]{path}[/B]"
 
-msgctxt "#30824"
+msgctxt "#30825"
 msgid "Chrome OS version: [B]{version}[/B]"
 msgstr "Chrome OS Version: [B]{version}[/B]"
 

resources/language/resource.language.el_gr/strings.po

@@ -272,14 +272,18 @@ msgid "Widevine version: [B]Built into Android[/B]"
 msgstr "Έκδοση Widevine: [B]Ενδωματωμένη στο Android[/B]"
 
 msgctxt "#30822"
+msgid "Widevine version: [B]{version} [COLOR gray](supplied by vendor)[/COLOR][/B]"
+msgstr ""
+
+msgctxt "#30823"
 msgid "Widevine version: [B]{version}[/B] [COLOR gray](last updated on [B]{date}[/B])[/COLOR]"
 msgstr "Έκδοση Widevina: [B]{version}[/B] [COLOR gray](τελευταία ενημερωση [B]{date}[/B])[/COLOR]"
 
-msgctxt "#30823"
+msgctxt "#30824"
 msgid "Widevine CDM path: [B]{path}[/B]"
 msgstr "Διαδρομη CDM του Widevine: [B]{path}[/B]"
 
-msgctxt "#30824"
+msgctxt "#30825"
 msgid "Chrome OS version: [B]{version}[/B]"
 msgstr "Έκδοση του Chrome OS: [B]{version}[/B]"
 

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

@@ -272,14 +272,18 @@ msgid "Widevine version: [B]Built into Android[/B]"
 msgstr ""
 
 msgctxt "#30822"
-msgid "Widevine version: [B]{version}[/B] [COLOR gray](last updated on [B]{date}[/B])[/COLOR]"
+msgid "Widevine version: [B]{version} [COLOR gray](supplied by vendor)[/COLOR][/B]"
 msgstr ""
 
 msgctxt "#30823"
-msgid "Widevine CDM path: [B]{path}[/B]"
+msgid "Widevine version: [B]{version}[/B] [COLOR gray](last updated on [B]{date}[/B])[/COLOR]"
 msgstr ""
 
 msgctxt "#30824"
+msgid "Widevine CDM path: [B]{path}[/B]"
+msgstr ""
+
+msgctxt "#30825"
 msgid "Chrome OS version: [B]{version}[/B]"
 msgstr ""
 

resources/language/resource.language.es_es/strings.po

@@ -272,14 +272,18 @@ msgid "Widevine version: [B]Built into Android[/B]"
 msgstr "Versión Widevine: [B]Incorporado en Android[/B]"
 
 msgctxt "#30822"
+msgid "Widevine version: [B]{version} [COLOR gray](supplied by vendor)[/COLOR][/B]"
+msgstr ""
+
+msgctxt "#30823"
 msgid "Widevine version: [B]{version}[/B] [COLOR gray](last updated on [B]{date}[/B])[/COLOR]"
 msgstr "Versión Widevine: [B]{versión}[/B] [COLOR gray](última actualización [B]{date}[/B])[/COLOR]"
 
-msgctxt "#30823"
+msgctxt "#30824"
 msgid "Widevine CDM path: [B]{path}[/B]"
 msgstr "Ruta Widevine CDM: [B]{path}[/B]"
 
-msgctxt "#30824"
+msgctxt "#30825"
 msgid "Chrome OS version: [B]{version}[/B]"
 msgstr "Versión Chrome OS: [B]{version}[/B]"
 

resources/language/resource.language.fr_fr/strings.po

@@ -272,14 +272,18 @@ msgid "Widevine version: [B]Built into Android[/B]"
 msgstr "Version Widevine : [B]Intégré dans Android[/B]"
 
 msgctxt "#30822"
+msgid "Widevine version: [B]{version} [COLOR gray](supplied by vendor)[/COLOR][/B]"
+msgstr ""
+
+msgctxt "#30823"
 msgid "Widevine version: [B]{version}[/B] [COLOR gray](last updated on [B]{date}[/B])[/COLOR]"
 msgstr "Version Widevine : [B]{version}[/B] [COLOR gray](mise à jour le [B]{date}[/B])[/COLOR]"
 
-msgctxt "#30823"
+msgctxt "#30824"
 msgid "Widevine CDM path: [B]{path}[/B]"
 msgstr "Emplacement de Widevine CDM : [B]{path}[/B]"
 
-msgctxt "#30824"
+msgctxt "#30825"
 msgid "Chrome OS version: [B]{version}[/B]"
 msgstr "Version de ChromeOS : [B]{version}[/B]"
 

resources/language/resource.language.hr_hr/strings.po

@@ -272,14 +272,18 @@ msgid "Widevine version: [B]Built into Android[/B]"
 msgstr "Widevine verzija: [B]Ugrađen u Android[/B]"
 
 msgctxt "#30822"
+msgid "Widevine version: [B]{version} [COLOR gray](supplied by vendor)[/COLOR][/B]"
+msgstr ""
+
+msgctxt "#30823"
 msgid "Widevine version: [B]{version}[/B] [COLOR gray](last updated on [B]{date}[/B])[/COLOR]"
 msgstr "Widevine verzija: [B]{version}[/B] [COLOR gray](zadnja nadogradnja [B]{date}[/B])[/COLOR]"
 
-msgctxt "#30823"
+msgctxt "#30824"
 msgid "Widevine CDM path: [B]{path}[/B]"
 msgstr "Widevine CDM mapa: [B]{path}[/B]"
 
-msgctxt "#30824"
+msgctxt "#30825"
 msgid "Chrome OS version: [B]{version}[/B]"
 msgstr "Chrome OS verzija: [B]{version}[/B]"
 

resources/language/resource.language.hu_hu/strings.po

@@ -272,14 +272,18 @@ msgid "Widevine version: [B]Built into Android[/B]"
 msgstr "Widevine verzió: [B]Androiddal telepített[/B]"
 
 msgctxt "#30822"
+msgid "Widevine version: [B]{version} [COLOR gray](supplied by vendor)[/COLOR][/B]"
+msgstr ""
+
+msgctxt "#30823"
 msgid "Widevine version: [B]{version}[/B] [COLOR gray](last updated on [B]{date}[/B])[/COLOR]"
 msgstr "Widevine verzió: [B]{version}[/B] [COLOR gray](utolsó frissítés [B]{date}[/B])[/COLOR]"
 
-msgctxt "#30823"
+msgctxt "#30824"
 msgid "Widevine CDM path: [B]{path}[/B]"
 msgstr "Widevine CDM elérési út: [B]{path}[/B]"
 
-msgctxt "#30824"
+msgctxt "#30825"
 msgid "Chrome OS version: [B]{version}[/B]"
 msgstr "Chrome OS verzió: [B]{version}[/B]"