Merge pull request #26 from anxdpanic/dev

5.0.1
anxdpanic · Apr 20, 2020 · 44be8d7 · 44be8d7
2 parents c23f886 + ae84082
commit 44be8d7
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 9 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.playthis" name="PlayThis" version="5.0.0" provider-name="anxdpanic">
+<addon id="plugin.video.playthis" name="PlayThis" version="5.0.1" provider-name="anxdpanic">
     <requires>
         <import addon="xbmc.python" version="2.24.0"/>
         <import addon="script.module.six" version="1.11.0"/>
@@ -11,7 +11,9 @@
     </extension>
     <extension point="xbmc.addon.metadata">
         <news>
-[chg] only use youtube-dl to resolve content
+[fix] progress dialog in Kodi 19 nightlies
+[fix] inputstream property in Kodi 19 nightlies
+[fix] handling of inputstream.adaptive not being installed
         </news>
         <assets>
             <icon>icon.png</icon>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+5.0.1
+[fix] progress dialog in Kodi 19 nightlies
+[fix] inputstream property in Kodi 19 nightlies
+[fix] handling of inputstream.adaptive not being installed
+
 5.0.0
 [chg] only use youtube-dl to resolve content
 

diff --git a/resources/lib/addon_lib/kodi.py b/resources/lib/addon_lib/kodi.py
@@ -438,7 +438,11 @@ def __create_dialog(self, line1, line2, line3):
             pd.create(self.heading, msg)
         else:
             pd = xbmcgui.DialogProgress()
-            pd.create(self.heading, line1, line2, line3)
+            if get_kodi_version().major <= 18:
+                pd.create(self.heading, line1, line2, line3)
+            else:
+                msg = '[CR]'.join([line1, line2, line3])
+                pd.create(self.heading, msg)
         return pd
 
     def __enter__(self):
@@ -463,7 +467,11 @@ def update(self, percent, line1='', line2='', line3=''):
                 msg = line1 + line2 + line3
                 self.pd.update(percent, self.heading, msg)
             else:
-                self.pd.update(percent, line1, line2, line3)
+                if get_kodi_version().major <= 18:
+                    self.pd.update(percent, line1, line2, line3)
+                else:
+                    msg = '[CR]'.join([line1, line2, line3])
+                    self.pd.update(percent, msg)
 
 
 class CountdownDialog(object):

diff --git a/resources/lib/addon_lib/playback.py b/resources/lib/addon_lib/playback.py
@@ -59,8 +59,12 @@
 
 adaptive_version = None
 if dash_supported:
-    adaptive_version = kodi.Addon('inputstream.adaptive').getAddonInfo('version')
-hls_supported = False if adaptive_version is None else (kodi.loose_version(adaptive_version) >= kodi.loose_version('2.0.10'))  # Kodi 17.4
+    try:
+        adaptive_version = kodi.Addon('inputstream.adaptive').getAddonInfo('version')
+        hls_supported = False if adaptive_version is None else (kodi.loose_version(adaptive_version) >= kodi.loose_version('2.0.10'))  # Kodi 17.4
+    except RuntimeError:
+        dash_supported = False
+        hls_supported = False
 
 user_cache_limit = int(kodi.get_setting('cache-expire-time'))
 resolver_cache_limit = 0.11  # keep resolver caching to 10 > minutes > 5, resolved sources expire
@@ -649,16 +653,19 @@ def play(source, player=True):
             playback_item.setProperty('IsPlayable', 'true')
             playback_item.setArt(source['art'])
             playback_item.addStreamInfo(source['content_type'], {})
+            inputstream_property = 'inputstream'
+            if kodi.get_kodi_version().major < 19:
+                inputstream_property += 'addon'
             if source['is_dash']:
                 playback_item.setContentLookup(False)
                 playback_item.setMimeType('application/xml+dash')
-                playback_item.setProperty('inputstreamaddon', 'inputstream.adaptive')
+                playback_item.setProperty(inputstream_property, 'inputstream.adaptive')
                 playback_item.setProperty('inputstream.adaptive.manifest_type', 'mpd')
             elif (source['url'].startswith('rtmp')) and (inputstream_rtmp):
                 if kodi.addon_enabled('inputstream.rtmp'):
-                    playback_item.setProperty('inputstreamaddon', 'inputstream.rtmp')
+                    playback_item.setProperty(inputstream_property, 'inputstream.rtmp')
             elif ('.m3u8' in source['url']) and (hls_supported):
-                playback_item.setProperty('inputstreamaddon', 'inputstream.adaptive')
+                playback_item.setProperty(inputstream_property, 'inputstream.adaptive')
                 playback_item.setProperty('inputstream.adaptive.manifest_type', 'hls')
             playback_item.setInfo(source['content_type'], source['info'])
             if kodi.get_handle() == -1: