diff --git a/resources/lib/viervijfzes/__init__.py b/resources/lib/viervijfzes/__init__.py index 0dcb357..a5dcb63 100644 --- a/resources/lib/viervijfzes/__init__.py +++ b/resources/lib/viervijfzes/__init__.py @@ -50,16 +50,16 @@ CHANNELS = OrderedDict([ ), ], )), - # ('Play7', dict( - # name='Play7', - # epg_id='zeven', - # url='https://www.goplay.be', - # logo='play7.png', - # background='play7-background.png', - # iptv_preset=7, - # iptv_id='play7.be', - # youtube=[], - # )), + ('Play7', dict( + name='Play7', + epg_id='zeven', + url='https://www.goplay.be', + logo='play7.png', + background='play7-background.png', + iptv_preset=17, + iptv_id='play7.be', + youtube=[], + )), ('GoPlay', dict( name='Go Play', url='https://www.goplay.be', diff --git a/resources/lib/viervijfzes/content.py b/resources/lib/viervijfzes/content.py index 386e1e6..cf01a87 100644 --- a/resources/lib/viervijfzes/content.py +++ b/resources/lib/viervijfzes/content.py @@ -357,6 +357,9 @@ class ContentApi: response = self._get_url(self.API_VIERVIJFZES + '/content/%s' % uuid, authentication=True) data = json.loads(response) + if not data: + raise UnavailableException + if 'videoDash' in data: # DRM protected stream # See https://docs.unified-streaming.com/documentation/drm/buydrm.html#setting-up-the-client diff --git a/resources/lib/viervijfzes/epg.py b/resources/lib/viervijfzes/epg.py index 7bc2e30..6e616b1 100644 --- a/resources/lib/viervijfzes/epg.py +++ b/resources/lib/viervijfzes/epg.py @@ -72,7 +72,8 @@ class EpgApi: EPG_ENDPOINTS = { 'Play4': 'https://www.goplay.be/api/epg/vier/{date}', 'Play5': 'https://www.goplay.be/api/epg/vijf/{date}', - 'Play6': 'https://www.goplay.be/api/epg/zes/{date}' + 'Play6': 'https://www.goplay.be/api/epg/zes/{date}', + 'Play7': 'https://www.goplay.be/api/epg/zeven/{date}', } EPG_NO_BROADCAST = 'Geen uitzending' diff --git a/resources/logos/play4-background.png b/resources/logos/play4-background.png index 80f7f51..71bfbce 100644 Binary files a/resources/logos/play4-background.png and b/resources/logos/play4-background.png differ diff --git a/resources/logos/play4.png b/resources/logos/play4.png index 8607ace..a30cfb5 100644 Binary files a/resources/logos/play4.png and b/resources/logos/play4.png differ diff --git a/resources/logos/play5-background.png b/resources/logos/play5-background.png index db00d8f..13d762f 100644 Binary files a/resources/logos/play5-background.png and b/resources/logos/play5-background.png differ diff --git a/resources/logos/play5.png b/resources/logos/play5.png index 2dfac1e..7a44e2f 100644 Binary files a/resources/logos/play5.png and b/resources/logos/play5.png differ diff --git a/resources/logos/play6-background.png b/resources/logos/play6-background.png index 0c59764..1dce021 100644 Binary files a/resources/logos/play6-background.png and b/resources/logos/play6-background.png differ diff --git a/resources/logos/play6.png b/resources/logos/play6.png index a727649..9d12d78 100644 Binary files a/resources/logos/play6.png and b/resources/logos/play6.png differ diff --git a/resources/logos/play7-background.png b/resources/logos/play7-background.png new file mode 100644 index 0000000..576d9f7 Binary files /dev/null and b/resources/logos/play7-background.png differ diff --git a/resources/logos/play7.png b/resources/logos/play7.png new file mode 100644 index 0000000..67fe4ae Binary files /dev/null and b/resources/logos/play7.png differ diff --git a/tests/test_api.py b/tests/test_api.py index f53a8ed..a56089a 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -75,7 +75,7 @@ class TestApi(unittest.TestCase): @unittest.skipUnless(kodiutils.get_setting('username') and kodiutils.get_setting('password'), 'Skipping since we have no credentials.') def test_get_drm_stream(self): - resolved_stream = self._api.get_stream_by_uuid('01998ce7-b2ad-4524-a786-33d419a29d7b') # CSI 12x22 + resolved_stream = self._api.get_stream_by_uuid('c17ff150-368a-4628-b81f-c73d78c06992') # NCIS LA 9x24 self.assertIsInstance(resolved_stream, ResolvedStream)