Merge pull request #4597 from basrieter/retrospect-matrix

[plugin.video.retrospect] v5.7.21

Author: basrieter

plugin.video.retrospect/addon.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.retrospect"
-        version="5.7.20"
+        version="5.7.21"
         name="Retrospect"
         provider-name="Bas Rieter">
 
@@ -123,19 +123,22 @@
         <platform>all</platform>
         <license>GPL-3.0-or-later</license>
         <language>en nl de sv no lt lv fi</language>
-        <news>[B]Retrospect v5.7.20 - Changelog - 2024-10-21[/B]
+        <news>[B]Retrospect v5.7.21 - Changelog - 2024-11-26[/B]
 
-Fixed the NPO channel that broke.
+Fixed some minor channel issues for Dutch and Swedish channels.
 
 [B]Framework related[/B]
-_None_
+* Added: Patch option to UriHandler.
 
 [B]GUI/Settings/Language related[/B]
 _None_
 
 [B]Channel related[/B]
-* Fixed: NPO streams (Fixes #1854).
-
+* Fixed: NPO Plus content not showing (Fixes #1862).
+* Fixed: Some TV4 content (with encryption) was not playing (Fixes #1853).
+* Fixed: Revoking a device from Videoland.nl broke Retrospect listing (Fixes #1852).
+* Fixed: BVN Images did not show (Fixes #1864).
+* Fixed: Don&#x27;t use HVEC for SVT (Fixes #1865).
         </news>
         <assets>
             <icon>resources/media/icon.png</icon>

plugin.video.retrospect/channels/channel.be/ketnet/chn_ketnet.json

@@ -12,7 +12,8 @@
       "channelcode": "ketnet",
       "sortorder": 12,
       "language": "be",
-      "fanart": "ketnetfanart.jpg"
+      "fanart": "ketnetfanart.jpg",
+      "ignore": true
     }
   ],
   "settings": [

plugin.video.retrospect/channels/channel.be/vier/chn_vier.py

@@ -319,7 +319,7 @@ def create_season_item(self, result_set):
             title = video_info["title"]
             url = f"{self.baseUrl}{video_info['path']}"
             video_date = video_info["dateCreated"]
-            description = video_info["description"]
+            description = video_info.get("description")
             # video_id = video_info["uuid"]
             episode = video_info.get("episodeNumber", 0)
 

plugin.video.retrospect/channels/channel.nos/bvntv/chn_bvntv.py

@@ -101,7 +101,10 @@ def create_episode_item(self, result_set):
         if not item.url.endswith("/"):
             item.url = "{}/".format(item.url)
 
-        item.thumb = "{}{}".format(self.baseUrl, result_set["thumburl"])
+        thumb_url = result_set["thumburl"]
+        if "://" not in thumb_url:
+            item.thumb = "{}{}".format(self.baseUrl, thumb_url)
+
         item.fanart = item.thumb.replace("600/338", "1280/720")
         return item
 
@@ -117,7 +120,10 @@ def create_video_item(self, result_set):
         # date_time = DateHelper.get_date_from_string(date_value, "%  Y-%m-%d %H:%M:%S")
         # item.set_date(*date_time[0:6])
 
-        item.thumb = "{}{}".format(self.baseUrl, result_set["thumburl"])
+        thumb_url = result_set["thumburl"]
+        if "://" not in thumb_url:
+            item.thumb = "{}{}".format(self.baseUrl, thumb_url)
+
         item.metaData["pow"] = result_set["pow"]
 
         return item

plugin.video.retrospect/channels/channel.nos/nos2010/chn_nos2010.py

@@ -1307,7 +1307,7 @@ def __has_premium(self) -> bool:
 
             data = UriHandler.open("https://npo.nl/start/api/auth/session")
             json = JsonHelper(data)
-            subscriptions = json.get_value("subscription", fallback=None)
+            subscriptions = json.get_value("hasSubscription", fallback=None)
             self.__has_premium_cache = subscriptions is not None
             Logger.debug("Found subscriptions: %s", subscriptions)
 

plugin.video.retrospect/channels/channel.nos/nosnl/chn_nosnl.py

@@ -6,6 +6,7 @@
 
 from resources.lib.logger import Logger
 from resources.lib.mediaitem import MediaItem, FolderItem
+from resources.lib.regexer import Regexer
 from resources.lib.urihandler import UriHandler
 from resources.lib.helpers.jsonhelper import JsonHelper
 from resources.lib.helpers.encodinghelper import EncodingHelper
@@ -62,8 +63,10 @@ def __init__(self, channel_info):
                               # No longer used: preprocessor=self.AddNextPage,
                               json=True,
                               parser=['items', ],
-                              creator=self.create_json_video, updater=self.update_json_video,
+                              creator=self.create_json_video, #  updater=self.update_json_video,
                               postprocessor=self.filter_duplicate_streams)
+
+        self._add_data_parser("https://nos.nl/video/", updater=self.update_video_item)
         self._add_data_parser("*",
                               json=True,
                               parser=['links', ],
@@ -164,7 +167,8 @@ def create_json_video(self, result_set):
         # category = result_set["maincategory"].title()
         # subcategory = result_set["subcategory"].title()
 
-        url = "https://api.nos.nl/mobile/video/%s/phone.json" % (video_id, )
+        # url = "https://api.nos.nl/mobile/video/%s/phone.json" % (video_id, )
+        url = f"https://nos.nl/video/{video_id}"
         item = MediaItem(result_set['title'], url, media_type=mediatype.VIDEO)
         item.description = result_set["description"]
         item.complete = False
@@ -223,6 +227,35 @@ def update_resolved_stream(self, item):
         item.complete = M3u8.update_part_with_m3u8_streams(item, url, bitrate=0)
         return item
 
+    def update_video_item(self, item):
+        """ Updates an existing MediaItem with more data.
+
+        Used to update none complete MediaItems (self.complete = False). This
+        could include opening the item's URL to fetch more data and then process that
+        data or retrieve it's real media-URL.
+
+        The method should at least:
+        * cache the thumbnail to disk (use self.noImage if no thumb is available).
+        * set at least one MediaStream.
+        * set self.complete = True.
+
+        if the returned item does not have a MediaSteam then the self.complete flag
+        will automatically be set back to False.
+
+        :param MediaItem item: the original MediaItem that needs updating.
+
+        :return: The original item with more data added to it's properties.
+        :rtype: MediaItem
+
+        """
+
+        Logger.debug('Starting update_video_item: %s', item.name)
+
+        data = UriHandler.open(item.url, additional_headers=self.httpHeaders)
+        stream_url = Regexer.do_regex(r"contentUrl\"\W+\"([^\"]+)\"", data)[0]
+        item.url = stream_url
+        return self.update_resolved_stream(item)
+
     def update_json_video(self, item):
         """ Updates an existing MediaItem with more data.
 

plugin.video.retrospect/channels/channel.regionalnl/regiogroei/chn_regiogroei.py

@@ -247,6 +247,7 @@ def create_program_item(self, result_set):
         base = result_set["_links"]["page"]["href"]
         slug = result_set["_links"]["web"]["slug"]
         origin = result_set["_links"]["web"]["originId"]
+        # url = f"{self.baseUrl}{base}"
         url = "{}{}?slug={}&origin={}".format(self.baseUrl, base, slug, origin)
 
         item = FolderItem(title, url, content_type=contenttype.EPISODES, media_type=mediatype.TVSHOW)

plugin.video.retrospect/channels/channel.se/svt/chn_svt.py

@@ -1358,11 +1358,12 @@ def __update_item_from_video_references(self, item, videos, subtitles=None, righ
         # For HLS:
         # "hls-cmaf-full" has x264/x264 with 5.1
         # "hls"/"hls-ts-avc" has x264 and 2.0 audio
+        # hls-ts-full has x264 with 5.1 audio
 
         # LB = Low Bandwidth
 
         if in_sweden or not item.isGeoLocked:
-            supported_formats = {"hls": 10, "hls-ts-full": 12, "hls-cmaf-full": 13}
+            supported_formats = {"hls": 10, "hls-ts-full": 12, "hls-cmaf-full": 0}
             if not is_drm_protected:
                 supported_formats.update({"dash": 3, "dash-hbbtv-avc": 4, "dashhbbtv": 4})
         else:

plugin.video.retrospect/channels/channel.se/tv4se/chn_tv4se.py

@@ -201,7 +201,7 @@ def __create_item(lang_id: int, url: str, json: Optional[dict] = None):
             use_get=True)
         items.append(__create_item(LanguageHelper.TvShows, tvshow_url, tvshow_data))
 
-        recent_url, recent_data = self.__get_api_query("Panel", {"panelId": "5qGBwTBSPdxO55EzbpOeNg", "limit": self.__max_page_size, "offset": 0})
+        recent_url, recent_data = self.__get_api_query("Panel", {"panelId": "2K0BCBpDDfhpW1NRLY0jET", "limit": self.__max_page_size, "offset": 0})
         items.append(__create_item(LanguageHelper.Recent, recent_url, recent_data))
 
         popular_url, popular_data = self.__get_api_query("Panel", {"panelId": "4nNp00Z12bjEiNboaW2uxB", "limit": self.__max_page_size, "offset": 0})
@@ -951,7 +951,7 @@ def __update_dash_video(self, item, stream_info):
 
         license_info = playback_item.get("license", None)
         if license_info is not None:
-            license_key_token = license_info["token"]
+            license_key_token = license_info.get("token")
             auth_token = license_info["castlabsToken"]
             header = {
                 "x-dt-auth-token": auth_token,

plugin.video.retrospect/channels/channel.videoland/videolandnl/chn_videolandnl.json

@@ -35,6 +35,11 @@
       "order": 4,
       "value": "type=\"select\" lvalues=\"30126|30127|30128\" default=\"0\" label=\"30081\"",
       "id": "filter_premium"
+    },
+    {
+      "order": 5,
+      "id": "re-authenticate",
+      "value": "label=\"30129\" type=\"action\" action=\"RunScript(plugin.video.retrospect, 0, ?channel=channel.videoland.videolandnl&action=execute&command=log_off)\" option=\"close\""
     }
   ]
 }