Merge pull request #1950 from dimkroon/fix/npo_iptv_epg

Fixed: non-playable NPO IPTV streams.

Author: basrieter

channels/channel.nos/nos2010/chn_nos2010.py

@@ -1340,13 +1340,17 @@ def create_iptv_streams(self, parameter_parser):
         }
 
         for livestream in channel_data.json:
+            item_name = JsonHelper.get_from(livestream, "title")
+            if item_name not in logo_sources:
+                continue
+
             item = self.create_api_live_tv(livestream)
             items.append(item)
 
             iptv_streams.append(dict(
                 id=JsonHelper.get_from(livestream, "guid"),
-                name=JsonHelper.get_from(livestream, "title"),
-                logo=logo_sources.get(JsonHelper.get_from(livestream, "title"), ""),
+                name=item_name,
+                logo=logo_sources[item_name],
                 group=self.channelName,
                 stream=parameter_parser.create_action_url(self, action=action.PLAY_VIDEO, item=item,
                                                           store_id=parent_item.guid),

tests/channel_tests/test_chn_nos2010.py

@@ -127,3 +127,13 @@ def test_page(self):
     def test_update_stream_pow(self):
         url = "KN_1693383"
         self._test_video_url(url)
+
+    def test_iptv_streams(self):
+        from resources.lib.plugin import Plugin
+        result = self.channel.create_iptv_streams(Plugin('plugin.video.restrospect', ''))
+        self.assertEqual(len(result), 6)
+
+    def test_iptv_epg(self):
+        from resources.lib.plugin import Plugin
+        result = self.channel.create_iptv_epg(Plugin('plugin.video.restrospect', ''))
+        self.assertGreaterEqual(len(result), 6)