0.12.3-1 - added livestream and quality setting fix for kodi < 19

s0faking · Oct 24, 2021 · 0e47ea4 · 0e47ea4
1 parent 3e87c19
commit 0e47ea4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 26 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,7 @@
 * 0.12.3-1
  - bugfix livestream restart (kodi <19 only)
+ - removed quality setting
+ - livestream active bugfix
 
 * 0.12.3
  - service api fixes (auth & restart)

diff --git a/resources/lib/Addon.py b/resources/lib/Addon.py
@@ -19,9 +19,9 @@
 translation = settings.getLocalizedString
 
 # hardcoded
-video_delivery_list = ["HLS", "Progressive"]
-video_quality_list = ["Q1A", "Q4A", "Q6A", "Q8C", "QXB"]
 videoProtocol = "http"
+videoQuality = "QXB"
+videoDelivery = "HLS"
 
 input_stream_protocol = 'mpd'
 input_stream_drm_version = 'com.widevine.alpha'
@@ -48,8 +48,6 @@
 
 # load settings
 useServiceAPI = Settings.serviceAPI()
-videoQuality = Settings.videoQuality(video_quality_list)
-videoDelivery = Settings.videoDelivery(video_delivery_list)
 autoPlayPrompt = Settings.autoPlayPrompt()
 usePlayAllPlaylist = Settings.playAllPlaylist()
 

diff --git a/resources/lib/HtmlScraper.py b/resources/lib/HtmlScraper.py
@@ -740,13 +740,15 @@ def getLiveStreams(self):
         section = parseDOM(wrapper, name='section', attrs={'class': 'b-live-program.*?'})
         items = parseDOM(section, name='li', attrs={'class': 'channel orf.*?'})
 
+        if items:
+            debugLog("Found %d Livestream Channels" % len(items))
         for item in items:
             channel = parseDOM(item, name='img', attrs={'class': 'channel-logo'}, ret="alt")
             channel = replaceHTMLCodes(channel[0])
 
             debugLog("Processing %s Livestream" % channel)
             bundesland_article = parseDOM(item, name='li', attrs={'class': '.*?is-bundesland-heute.*?'}, ret='data-jsb')
-            article = parseDOM(item, name='article', attrs={'class': 'b-livestream-teaser is-live.*?'})
+            article = parseDOM(item, name='article', attrs={'class': 'b-livestream-teaser.*?'})
             if not len(bundesland_article) and len(article):
                 figure = parseDOM(article, name='figure', attrs={'class': 'teaser-img'}, ret=False)
                 image = parseDOM(figure, name='img', attrs={}, ret='data-src')

diff --git a/resources/lib/Settings.py b/resources/lib/Settings.py
@@ -27,24 +27,6 @@ def userAgent():
     return __addon__.getSetting('userAgent')
 
 
-def videoQuality(quality_list):
-    default_return_index = 2
-    videoQuality = __addon__.getSetting('videoQuality')
-    try:
-        return quality_list[int(videoQuality)]
-    except (IndexError, ValueError):
-        return quality_list[default_return_index]
-
-
-def videoDelivery(delivery_list):
-    default_return_index = 0
-    if serviceAPI():
-        videoDeliveryProgressive = __addon__.getSetting('videoDeliveryProgressive')
-        if videoDeliveryProgressive == "true":
-            return delivery_list[1]
-    return delivery_list[default_return_index]
-
-
 def autoPlayPrompt():
     return __addon__.getSetting("autoPlayPrompt") == "true"
 

diff --git a/resources/settings.xml b/resources/settings.xml
@@ -5,10 +5,8 @@
         <setting id="useSubtitles" type="bool" label="30029" default="false" />
         <setting id="enableBlacklist" type="bool" label="30043" visible="eq(1,false)" default="false" />
         <setting id="useServiceAPI" type="bool" label="30026" default="false" />
-        <setting id="videoDeliveryProgressive" label="30056" type="bool" visible="eq(-1,true)" default="false" />
-        <setting id="showLiveStreamSchedule" label="30061" type="bool" visible="eq(-2,true)" default="false" />
+        <setting id="showLiveStreamSchedule" label="30061" type="bool" visible="eq(-1,true)" default="false" />
         <setting id="usePlayAllPlaylist" label="30058" type="bool" default="true" />
-        <setting id="videoQuality" type="enum"  label="30022" lvalues="30023|30024|30025|30044|30053" default="3"/>
         <setting id="userAgent" default="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36" visible="false" />
     </category>
 </settings>