Changes for LibreELEC 9.2.0 with Kodi 18.5

piejanssens · Dec 9, 2019 · 93855b2 · 93855b2
1 parent de140bb
commit 93855b2
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 7 deletions.
diff --git a/addon.xml b/addon.xml
@@ -6,12 +6,12 @@
 <addon id="plugin.video.nfl.gamepass"
        name="NFL Game Pass"
        version="2018.09.08"
-       provider-name="Alexqw,divingmule,BaumSchorle,eriksoderblom,kaileu,emilsvennesson">
+       provider-name="Alexqw,Codekloeppler,divingmule,BaumSchorle,eriksoderblom,kaileu,emilsvennesson">
   <requires>
-    <import addon="xbmc.python" version="2.25.0"/>
+    <import addon="xbmc.python" version="2.26.0"/>
     <import addon="script.module.m3u8" version="0.2.10"/>
     <import addon="script.module.requests" version="2.7.0"/>
-    <import addon="xbmc.gui" version="5.12.0"/>
+    <import addon="xbmc.gui" version="5.14.0"/>
   </requires>
   <extension point="xbmc.python.script" library="default.py">
     <provides>video</provides>

diff --git a/default.py b/default.py
@@ -505,7 +505,9 @@ def select_stream_url(self, streams):
         try:
             url = streams['chromecast']
         except KeyError:
-            url = streams['hls']
+            for key in streams:
+                logger.debug('KeyError: stream[' +  key + '] url is ' + streams[key])
+            url = streams['hls-v3']
 
         if addon.getSetting('use_inputstream_adaptive') == 'true' and self.has_inputstream_adaptive:
             return url

diff --git a/resources/language/resource.language.de_de/strings.po b/resources/language/resource.language.de_de/strings.po
@@ -121,6 +121,10 @@ msgctxt "#30030"
 msgid "Display/Video"
 msgstr "Anzeige"
 
+msgctxt "#30031"
+msgid "Advanced"
+msgstr "Erweitert"
+
 msgctxt "#30032"
 msgid "Coaches Film"
 msgstr ""
@@ -188,3 +192,7 @@ msgstr "Nutze InputStream Adaptive"
 msgctxt "#30050"
 msgid "Please enter the username and password for your NFL Game Pass subscription."
 msgstr "Bitte geben Sie Benutzernamen und Passwort für Ihr NFL Game Pass Abo ein."
+
+msgctxt "#30051"
+msgid "Enable Debugging"
+msgstr "Debug-Meldungen aktivieren"
diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
@@ -121,6 +121,10 @@ msgctxt "#30030"
 msgid "Display/Video"
 msgstr ""
 
+msgctxt "#30031"
+msgid "Advanced"
+msgstr ""
+
 msgctxt "#30032"
 msgid "Coaches Film"
 msgstr ""
@@ -188,3 +192,7 @@ msgstr ""
 msgctxt "#30050"
 msgid "Please enter the username and password for your NFL Game Pass subscription."
 msgstr ""
+
+msgctxt "#30051"
+msgid "Enable Debugging"
+msgstr ""
diff --git a/resources/language/resource.language.ja_jp/strings.po b/resources/language/resource.language.ja_jp/strings.po
@@ -122,6 +122,10 @@ msgctxt "#30030"
 msgid "Display/Video"
 msgstr "デイスプレイ・ビデオ"
 
+msgctxt "#30031"
+msgid "Advanced"
+msgstr "詳細"
+
 msgctxt "#30032"
 msgid "Coaches Film"
 msgstr "監督フィルム集"
@@ -189,3 +193,7 @@ msgstr ""
 msgctxt "#30050"
 msgid "Please enter the username and password for your NFL Game Pass subscription."
 msgstr ""
+
+msgctxt "#30051"
+msgid "Enable Debugging"
+msgstr ""
diff --git a/resources/language/resource.language.nl_nl/strings.po b/resources/language/resource.language.nl_nl/strings.po
@@ -121,6 +121,10 @@ msgctxt "#30030"
 msgid "Display/Video"
 msgstr "Weergave/Video"
 
+msgctxt "#30031"
+msgid "Advanced"
+msgstr "Geavanceerd"
+
 msgctxt "#30032"
 msgid "Coaches Film"
 msgstr "Coaches Film"
@@ -188,3 +192,7 @@ msgstr "Gebruik Inputstream Adaptive"
 msgctxt "#30050"
 msgid "Please enter the username and password for your NFL Game Pass subscription."
 msgstr "Vul de gebruikersnaam en wachtwoord in van uw NFL Game Pass abonnement."
+
+msgctxt "#30051"
+msgid "Enable Debugging"
+msgstr ""
diff --git a/resources/language/resource.language.ru_ru/strings.po b/resources/language/resource.language.ru_ru/strings.po
@@ -192,3 +192,7 @@ msgstr ""
 msgctxt "#30050"
 msgid "Please enter the username and password for your NFL Game Pass subscription."
 msgstr ""
+
+msgctxt "#30051"
+msgid "Enable Debugging"
+msgstr ""
diff --git a/resources/language/resource.language.uk_ua/strings.po b/resources/language/resource.language.uk_ua/strings.po
@@ -192,3 +192,7 @@ msgstr ""
 msgctxt "#30050"
 msgid "Please enter the username and password for your NFL Game Pass subscription."
 msgstr ""
+
+msgctxt "#30051"
+msgid "Enable Debugging"
+msgstr ""
diff --git a/resources/lib/pigskin/pigskin.py b/resources/lib/pigskin/pigskin.py
@@ -20,7 +20,6 @@
 import requests
 import m3u8
 
-
 class pigskin(object):
     def __init__(
             self,
@@ -322,7 +321,7 @@ def login(self, username, password, force=False):
             except Exception:
                 self.logger.warn('subscription check failed; continuing on.')
 
-        for auth in [self._gp_auth, self._gigya_auth]:
+        for auth in [self._gigya_auth, self._gp_auth]:
             self.logger.debug('Trying {0} authentication.'.format(auth.__name__))
             try:
                 data = auth(username, password)
@@ -941,7 +940,7 @@ def _get_diva_streams(self, video_id, diva_config_url):
         }
         for vs in akamai_xml.iter('videoSource'):
             try:
-                vs_format = vs.attrib['name'].lower()
+                vs_format = vs.attrib['format'].lower()
                 vs_url = vs.find('uri').text
             except (KeyError, AttributeError):
                 continue

diff --git a/resources/settings.xml b/resources/settings.xml
@@ -19,4 +19,7 @@
     <setting id="proxy_username" type="text" label="30038" default="" enable="eq(-1,true)"/>
     <setting id="proxy_password" type="text" label="30039" default="" option="hidden" enable="eq(-2,true)"/>
   </category>
+  <category label="30031">
+    <setting id="debug" type="bool" label="30051" default="false"/>
+  </category>
 </settings>