Fixed: Vier/Play.tv channel (Fixes #1921).

Author: basrieter

changelog.txt

@@ -10,4 +10,5 @@ _None_
 
 [B]Channel related[/B]
 * Fixed: TV4 Recents.
-* Fixed: NPO TV programmes (See #1931).
+* Fixed: NPO TV programmes (See #1931).
+* Fixed: Vier/Play.tv channel (Fixes #1921).

channels/channel.be/vier/chn_vier.py

@@ -40,7 +40,9 @@ def __call__(self, data: str) -> Tuple[Union[JsonHelper, str], List[MediaItem]]:
         elif self._key:
             result_data = JsonHelper.find_dict_by_key_from(result_data, self._key)
 
-        if result_data:
+        if result_data and isinstance(result_data, str):
+            return result_data, []
+        elif result_data:
             return JsonHelper(result_data), []
 
         Logger.warning("Could not find NextJs data for key: %s, value: %s", self._key, self._value)
@@ -49,6 +51,7 @@ def __call__(self, data: str) -> Tuple[Union[JsonHelper, str], List[MediaItem]]:
     def __str__(self):
         return f"NextJsParser(key={self._key}, value={self._value})"
 
+
 class Channel(chn_class.Channel):
     """
     main class from resources.lib.which all channels inherit
@@ -89,6 +92,10 @@ def __init__(self, channel_info):
                               parser=[-1], creator=self.create_season_item,
                               postprocessor=self.show_single_season)
 
+        self._add_data_parser("https://www.play.tv/tv-gids/", json=True, name="TV Guide parser",
+                              preprocessor=NextJsParser(key="className", value="bg-gray-background w-full pt-8"),
+                              parser=["children"], creator=self.create_epg_item)
+
         # self._add_data_parser("https://www.play.tv/", json=True, name="Main show parser without children",
         #                       preprocessor=NextJsParser(r"[A-F0-9]+:(\[[^\n\r]+playlists[^\n\r]+)"),
         #                       parser=[-1, "playlists", -1], creator=self.create_season_item,
@@ -375,7 +382,7 @@ def create_epg_item(self, result_set: dict) -> MediaItemResult:
         if isinstance(result_set, str):
             return None
 
-        data = result_set["program"]
+        data = result_set[-1]["program"]
         if not data["video"]:
             return None
 
@@ -508,10 +515,10 @@ def update_video_item(self, item: MediaItem) -> MediaItem:
 
     def update_video_item_from_nextjs(self, item: MediaItem) -> MediaItem:
         data = UriHandler.open(item.url, additional_headers=self.httpHeaders)
-        json_data = Regexer.do_regex(r"({\"video\":{[^\n\r]+})]]}", data)[0]
-        nextjs_json = JsonHelper(json_data)
-        video_id = nextjs_json.get_value("videoId")
-        item.metaData["whatsonId"] = nextjs_json.get_value("video", "tracking", "whatsonId")
+        video_id, _ = NextJsParser("videoId")(data)
+        whats_on_id, _ = NextJsParser("whatsonId")(data)
+
+        item.metaData["whatsonId"] = whats_on_id
         item.url = f"https://api.play.tv/web/v1/videos/long-form/{video_id}"
         return self.update_video_item_with_id(item)
 

resources/lib/helpers/jsonhelper.py

@@ -127,8 +127,8 @@ def get_value(self, *args, **kwargs):
     def find_dict_by_key_value(self, key: str, value: Any) -> Optional[Dict]:
         return JsonHelper.find_dict_by_key_value_from(self.json, key, value)
 
-    def find_dict_by_key(self, key: str, value: Any) -> Optional[Dict]:
-        return JsonHelper.find_dict_by_key_from(self.json, key, value)
+    def find_dict_by_key(self, key: str) -> Optional[Dict]:
+        return JsonHelper.find_dict_by_key_from(self.json, key)
 
     @staticmethod
     def find_dict_by_key_value_from(data: Union[List, Dict], key: str, value: Any) -> Optional[Dict]:

tests/channel_tests/test_chn_vier.py

@@ -3,14 +3,14 @@
 import os
 import unittest
 
+from resources.lib.addonsettings import AddonSettings
 from . channeltest import ChannelTest
 
 
-@unittest.skipIf("CI" in os.environ, "Skipping in CI due to broken api")
 class TestVierBeChannel(ChannelTest):
     # noinspection PyPep8Naming
     def __init__(self, methodName):  # NOSONAR
-        super(TestVierBeChannel, self).__init__(methodName, "channel.be.vier", None)
+        super(TestVierBeChannel, self).__init__(methodName, "channel.be.vier", "playtv")
 
     def test_channel_exists(self):
         self.assertIsNotNone(self.channel)
@@ -19,41 +19,25 @@ def test_main_list_vier(self):
         items = self.channel.process_folder_list(None)
         self.assertGreaterEqual(len(items), 20, "No items found in mainlist")
 
-    def test_tv4_tv_shows(self):
-        url = "https://www.goplay.be/programmas/"
-        items = self._test_folder_url(url, 20)
-        # Should be significantly less than the total list of about 500.
-        self.assertLess(len(items), 150)
+    def test_go_play_tv_show(self):
+        url = "https://www.play.tv/vik-gert"
+        self._test_folder_url(url, 5)
 
-    def test_go_play_tv_shows(self):
-        self._switch_channel("goplay")
-        url = "https://www.goplay.be/programmas/"
-        self._test_folder_url(url, 200)
+    def test_recent_day_list(self):
+        yesterday = datetime.datetime.now() - datetime.timedelta(days=1)
+        url = f"https://www.play.tv/tv-gids/play/{yesterday.year}-{yesterday.month:02d}-{yesterday.day:02d}"
+        self._test_folder_url(url, 5)
 
-    def test_search(self):
-        media_items = self.channel.search_site(needle="cops")
-        self.assertGreater(len(media_items), 5)
-
-    def test_show_seasons_listing(self):
-        url = "https://www.goplay.be/komen-eten-celebs"
-        self._test_folder_url(url, 1)
-
-    def test_season_listing(self):
-        url = "https://www.goplay.be/bake-off-vlaanderen-kerst"
-        self._test_folder_url(url, 1)
-
-    @unittest.skip("Requires a log in.")
-    def test_resolve_via_url(self):
-        url = "https://www.goplay.be/video/hetisingewikkeld/hetisingewikkeld-seizoen-1/hetisingewikkeld-s1-aflevering-8"
+    @unittest.skipIf("PLAY_TV_TOKEN" not in os.environ, "Not testing updating without credentials")
+    def test_go_play_video_in_main_list(self):
+        token = os.environ["PLAY_TV_TOKEN"]
+        AddonSettings.set_setting("viervijfzes_refresh_token", token)
+        url = "https://www.play.tv/video/killer-in-law"
         self._test_video_url(url)
 
-    @unittest.skip("Requires a log in.")
-    def test_resolve_via_url_2(self):
-        url = "https://www.goplay.be/video/junior-bake-off-vlaanderen/junior-bake-off-vlaanderen-s5/junior-bake-off-vlaanderen-s5-aflevering-6"
+    @unittest.skipIf("PLAY_TV_TOKEN" not in os.environ, "Not testing updating without credentials")
+    def test_video_url(self):
+        token = os.environ["PLAY_TV_TOKEN"]
+        AddonSettings.set_setting("viervijfzes_refresh_token", token)
+        url = "https://www.play.tv/video/vik-gert/vik-gert-s1/vik-gert-s1-aflevering-12"
         self._test_video_url(url)
-
-    def test_epg_listing(self):
-        day = datetime.datetime.now() - datetime.timedelta(days=2)
-        url = "https://www.goplay.be/tv-gids/vier/{:04d}-{:02d}-{:02d}".format(
-            day.year, day.month, day.day)
-        self._test_folder_url(url, 2)