Jellyfin
/
jellyfin-kodi
mirror of https://github.com/jellyfin/jellyfin-kodi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjusting to use the new method

This commit is contained in:
angelblue05 2015-04-23 12:17:24 -05:00
parent df7b5349b8
commit 7e17bf5c84
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
resources/lib/KodiMonitor.py
View File

@ -46,10 +46,10 @@ class Kodi_Monitor(xbmc.Monitor):
userid = WINDOW.getProperty('userId%s' % username) userid = WINDOW.getProperty('userId%s' % username)
server = WINDOW.getProperty('server%s' % username) server = WINDOW.getProperty('server%s' % username)
url = "%s/mediabrowser/Users/%s/Items/%s?format=json&ImageTypeLimit=1" % (server, userid, embyid) url = "{server}/mediabrowser/Users/{UserId}/Items/%s?format=json&ImageTypeLimit=1" % embyid
jsonData = downloadUtils.downloadUrl(url) result = downloadUtils.downloadUrl(url)
result = json.loads(jsonData)
userData = result.get("UserData") userData = result[u'UserData']
playurl = PlayUtils().getPlayUrl(server, embyid, result) playurl = PlayUtils().getPlayUrl(server, embyid, result)
@ -62,13 +62,13 @@ class Kodi_Monitor(xbmc.Monitor):
WINDOW.setProperty(playurl+"positionurl", positionurl) WINDOW.setProperty(playurl+"positionurl", positionurl)
WINDOW.setProperty(playurl+"deleteurl", "") WINDOW.setProperty(playurl+"deleteurl", "")
WINDOW.setProperty(playurl+"deleteurl", deleteurl) WINDOW.setProperty(playurl+"deleteurl", deleteurl)
if result.get("Type")=="Episode": if result[u'Type']=="Episode":
WINDOW.setProperty(playurl+"refresh_id", result.get("SeriesId")) WINDOW.setProperty(playurl+"refresh_id", result[u'SeriesId'])
else: else:
WINDOW.setProperty(playurl+"refresh_id", embyid) WINDOW.setProperty(playurl+"refresh_id", embyid)
WINDOW.setProperty(playurl+"runtimeticks", str(result.get("RunTimeTicks"))) WINDOW.setProperty(playurl+"runtimeticks", str(result[u'RunTimeTicks']))
WINDOW.setProperty(playurl+"type", result.get("Type")) WINDOW.setProperty(playurl+"type", result[u'Type'])
WINDOW.setProperty(playurl+"item_id", embyid) WINDOW.setProperty(playurl+"item_id", embyid)
if PlayUtils().isDirectPlay(result) == True: if PlayUtils().isDirectPlay(result) == True:
@ -78,12 +78,12 @@ class Kodi_Monitor(xbmc.Monitor):
WINDOW.setProperty(playurl+"playmethod", playMethod) WINDOW.setProperty(playurl+"playmethod", playMethod)
mediaSources = result.get("MediaSources") mediaSources = result[u'MediaSources']
if(mediaSources != None): if(mediaSources != None):
if mediaSources[0].get('DefaultAudioStreamIndex') != None: if mediaSources[0].get('DefaultAudioStreamIndex') != None:
WINDOW.setProperty(playurl+"AudioStreamIndex", str(mediaSources[0].get('DefaultAudioStreamIndex'))) WINDOW.setProperty(playurl+"AudioStreamIndex", str(mediaSources[0][u'DefaultAudioStreamIndex']))
if mediaSources[0].get('DefaultSubtitleStreamIndex') != None: if mediaSources[0].get('DefaultSubtitleStreamIndex') != None:
WINDOW.setProperty(playurl+"SubtitleStreamIndex", str(mediaSources[0].get('DefaultSubtitleStreamIndex'))) WINDOW.setProperty(playurl+"SubtitleStreamIndex", str(mediaSources[0][u'DefaultSubtitleStreamIndex']))
if method == "VideoLibrary.OnUpdate": if method == "VideoLibrary.OnUpdate":
jsondata = json.loads(data) jsondata = json.loads(data)