Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-11-13 21:56:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update theme media

Browse source
This commit is contained in:
angelblue05 2018-01-09 19:31:14 -06:00
parent 3bccc195da
commit 1ec3b32919
4 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/lib/downloadutils.py
View file

@ -54,9 +54,7 @@ class DownloadUtils(object):
log.debug("Set info for server %s: %s", self.session['ServerId'], self.session) log.debug("Set info for server %s: %s", self.session['ServerId'], self.session)
def get_token(self): def get_token(self):
user = self._get_session_info() return self._get_session_info()['Token']
token = user['Token']
return token
def add_server(self, server, ssl): def add_server(self, server, ssl):
# Reserved for userclient only # Reserved for userclient only

11
resources/lib/entrypoint.py
View file

@ -548,6 +548,7 @@ def getThemeMedia():
doUtils = downloadutils.DownloadUtils() doUtils = downloadutils.DownloadUtils()
dialog = xbmcgui.Dialog() dialog = xbmcgui.Dialog()
dummy_listitem = xbmcgui.ListItem()
playback = None playback = None
# Choose playback method # Choose playback method
@ -613,11 +614,11 @@ def getThemeMedia():
pathstowrite = "" pathstowrite = ""
# May be more than one theme # May be more than one theme
for theme in result['Items']: for theme in result['Items']:
putils = playutils.PlayUtils(theme) putils = playutils.PlayUtils(theme, dummy_listitem)
if playback == "DirectPlay": if playback == "DirectPlay":
playurl = putils.directPlay() playurl = api.API(theme).get_file_path()
else: else:
playurl = putils.directStream() playurl = putils.get_direct_url(theme['MediaSources'][0])
pathstowrite += ('<file>%s</file>' % playurl.encode('utf-8')) pathstowrite += ('<file>%s</file>' % playurl.encode('utf-8'))
# Check if the item has theme songs and add them # Check if the item has theme songs and add them
@ -629,7 +630,7 @@ def getThemeMedia():
if playback == "DirectPlay": if playback == "DirectPlay":
playurl = api.API(theme).get_file_path() playurl = api.API(theme).get_file_path()
else: else:
playurl = playutils.PlayUtils(theme).directStream() playurl = playutils.PlayUtils(theme, dummy_listitem).get_direct_url(theme['MediaSources'][0])
pathstowrite += ('<file>%s</file>' % playurl.encode('utf-8')) pathstowrite += ('<file>%s</file>' % playurl.encode('utf-8'))
nfo_file.write( nfo_file.write(
@ -676,7 +677,7 @@ def getThemeMedia():
if playback == "DirectPlay": if playback == "DirectPlay":
playurl = api.API(theme).get_file_path() playurl = api.API(theme).get_file_path()
else: else:
playurl = playutils.PlayUtils(theme).directStream() playurl = playutils.PlayUtils(theme, dummy_listitem).get_direct_url(theme['MediaSources'][0])
pathstowrite += ('<file>%s</file>' % playurl.encode('utf-8')) pathstowrite += ('<file>%s</file>' % playurl.encode('utf-8'))
nfo_file.write( nfo_file.write(

3
resources/lib/playbackutils.py
View file

@ -88,7 +88,8 @@ class PlaybackUtils(object):
# Stack: [(url, listitem), (url, ...), ...] # Stack: [(url, listitem), (url, ...), ...]
self.stack[0][1].setPath(self.stack[0][0]) self.stack[0][1].setPath(self.stack[0][0])
try: try:
if not xbmc.getCondVisibility('Window.IsVisible(MyVideoNav.xml)') and not xbmc.getCondVisibility('Window.IsVisible(VideoFullScreen.xml)'): if (not xbmc.getCondVisibility('Window.IsVisible(MyVideoNav.xml)') and
not xbmc.getCondVisibility('Window.IsVisible(VideoFullScreen.xml)')):
# widgets do not fill artwork correctly # widgets do not fill artwork correctly
log.info("Detected widget.") log.info("Detected widget.")
raise IndexError raise IndexError

9
resources/lib/playutils.py
View file

@ -209,9 +209,6 @@ class PlayUtils():
play_url = self.get_transcode_url(source) if transcode else self.get_direct_url(source) play_url = self.get_transcode_url(source) if transcode else self.get_direct_url(source)
user_token = downloadutils.DownloadUtils().get_token()
play_url += "&api_key=" + user_token
return play_url return play_url
def get_direct_url(self, source): def get_direct_url(self, source):
@ -227,6 +224,9 @@ class PlayUtils():
if settings('enableExternalSubs') == "true": if settings('enableExternalSubs') == "true":
self.set_external_subs(source, play_url) self.set_external_subs(source, play_url)
user_token = downloadutils.DownloadUtils().get_token()
play_url += "&api_key=" + user_token
return play_url return play_url
def get_transcode_url(self, source): def get_transcode_url(self, source):
@ -252,6 +252,9 @@ class PlayUtils():
# Select audio and subtitles # Select audio and subtitles
play_url += self.get_audio_subs(source) play_url += self.get_audio_subs(source)
user_token = downloadutils.DownloadUtils().get_token()
play_url += "&api_key=" + user_token
return play_url return play_url
def set_external_subs(self, source, play_url): def set_external_subs(self, source, play_url):