JeroenED/plugin.video.viervijfzes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Don't use cached episode info for playback (#82)

Browse Source
This commit is contained in:
Michaël Arnauts 2021-03-22 13:40:26 +01:00 committed by GitHub
parent 8f59c16eab
commit 4a47c5c933
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
resources/lib/modules/menu.py
View File

@ -3,6 +3,8 @@
from __future__ import absolute_import, division, unicode_literals from __future__ import absolute_import, division, unicode_literals
import logging
from resources.lib import kodiutils from resources.lib import kodiutils
from resources.lib.kodiutils import TitleItem from resources.lib.kodiutils import TitleItem
from resources.lib.viervijfzes import STREAM_DICT from resources.lib.viervijfzes import STREAM_DICT
@ -13,6 +15,8 @@ try: # Python 3
except ImportError: # Python 2 except ImportError: # Python 2
from urllib import quote from urllib import quote
_LOGGER = logging.getLogger(__name__)
class Menu: class Menu:
""" Menu code """ """ Menu code """
@ -184,13 +188,12 @@ class Menu:
'duration': item.duration, 'duration': item.duration,
}) })
if item.path: if item.uuid:
# We have an UUID and can play this item directly
path = kodiutils.url_for('play_catalog', uuid=item.uuid)
else:
# We don't have an UUID, and first need to fetch the video information from the page # We don't have an UUID, and first need to fetch the video information from the page
path = kodiutils.url_for('play_from_page', page=quote(item.path, safe='')) path = kodiutils.url_for('play_from_page', page=quote(item.path, safe=''))
else:
# We have an UUID and can play this item directly
# This is not preferred since we will lack metadata
path = kodiutils.url_for('play_catalog', uuid=item.uuid)
return TitleItem(title=info_dict['title'], return TitleItem(title=info_dict['title'],
path=path, path=path,

4
resources/lib/modules/player.py
View File

@ -10,7 +10,7 @@ from resources.lib.modules.menu import Menu
from resources.lib.viervijfzes import CHANNELS, ResolvedStream from resources.lib.viervijfzes import CHANNELS, ResolvedStream
from resources.lib.viervijfzes.auth import AuthApi from resources.lib.viervijfzes.auth import AuthApi
from resources.lib.viervijfzes.aws.cognito_idp import AuthenticationException, InvalidLoginException from resources.lib.viervijfzes.aws.cognito_idp import AuthenticationException, InvalidLoginException
from resources.lib.viervijfzes.content import ContentApi, GeoblockedException, UnavailableException from resources.lib.viervijfzes.content import CACHE_PREVENT, ContentApi, GeoblockedException, UnavailableException
try: # Python 3 try: # Python 3
from urllib.parse import quote, urlencode from urllib.parse import quote, urlencode
@ -45,7 +45,7 @@ class Player:
:type path: string :type path: string
""" """
# Get episode information # Get episode information
episode = self._api.get_episode(path) episode = self._api.get_episode(path, cache=CACHE_PREVENT)
resolved_stream = None resolved_stream = None
if episode is None: if episode is None: