diff --git a/addon.xml b/addon.xml index b1f435c..7480ca1 100644 --- a/addon.xml +++ b/addon.xml @@ -1,11 +1,10 @@ - + - @@ -32,6 +31,10 @@ resources/media/Screenshot3.jpg resources/media/Screenshot4.jpg + [B]Version 6.4.5 - 2024-09-29[/B] + - Fix issue of dr returning 404 on some streams with 'sub' header, again.. + - remove inputstreamhelper from addon + [B]Version 6.4.4 - 2024-09-08[/B] - Fix issue of dr returning 404 on some streams with 'sub' header diff --git a/changelog.txt b/changelog.txt index dd31670..6c2fbeb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +[B]Version 6.4.5 - 2024-09-29[/B] +- Fix issue of dr returning 404 on some streams with 'sub' header, again... +- remove inputstreamhelper from addon + [B]Version 6.4.4 - 2024-09-08[/B] - Fix issue of dr returning 404 on some streams with 'sub' header diff --git a/resources/lib/addon.py b/resources/lib/addon.py index 3b32691..c5bb1a3 100644 --- a/resources/lib/addon.py +++ b/resources/lib/addon.py @@ -29,7 +29,6 @@ import xbmcgui import xbmcplugin from xbmcvfs import translatePath -from inputstreamhelper import Helper from resources.lib import tvapi from resources.lib import tvgui @@ -457,11 +456,9 @@ def playVideo(self, id, kids_channel, path): listItem = xbmcgui.ListItem(path=video['url'], offscreen=True) if int(get_setting('inputstream')) == 0: - is_helper = Helper('hls') - if is_helper.check_inputstream(): - listItem.setProperty('inputstream', is_helper.inputstream_addon) - if kodi_version_major() <= 20: - listItem.setProperty('inputstream.adaptive.manifest_type', 'hls') + listItem.setProperty('inputstream', 'inputstream.adaptive') + if kodi_version_major() <= 20: + listItem.setProperty('inputstream.adaptive.manifest_type', 'hls') local_subs_bool = bool_setting('enable.localsubtitles') or int(get_setting('inputstream')) == 1 if local_subs_bool and video['srt_subtitles']: diff --git a/resources/lib/tvapi.py b/resources/lib/tvapi.py index 5c8096b..b59687c 100644 --- a/resources/lib/tvapi.py +++ b/resources/lib/tvapi.py @@ -50,6 +50,7 @@ def cache_path(path): return False return True + def full_login(user, password): ses = requests.Session() # start login flow @@ -479,8 +480,11 @@ def get_stream(self, id): 'lang': 'da', 'resolution': 'HD-1080', } - u = self.session.get(url, params=data, headers=headers, timeout=GET_TIMEOUT) + if u.status_code == 404 and u.json()['code'] == 8009: + data['sub'] = 'Registered' + u = self.session.get(url, params=data, headers=headers, timeout=GET_TIMEOUT) + if u.status_code == 200: for stream in u.json(): if stream['accessService'] == 'StandardVideo':