Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix PlaybackUtils for recent changes to downloadurl

Browse source
This commit is contained in:
angelblue05 2015-04-25 18:51:07 -05:00
parent fa80049df1
commit 6ec92da158
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
resources/lib/PlaybackUtils.py
View file

@ -43,11 +43,11 @@ class PlaybackUtils():
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, id) url = "{server}/mediabrowser/Users/{UserId}/Items/%s?format=json&ImageTypeLimit=1" % id
jsonData = self.downloadUtils.downloadUrl(url, suppress=False, popup=1 ) result = self.downloadUtils.downloadUrl(url)
result = json.loads(jsonData)
userData = result.get("UserData")
userData = result[u'UserData']
resume_result = 0 resume_result = 0
seekTime = 0 seekTime = 0
@ -151,7 +151,6 @@ class PlaybackUtils():
def setListItemProps(self, server, id, listItem, result): def setListItemProps(self, server, id, listItem, result):
# set up item and item info # set up item and item info
userid = self.downloadUtils.getUserId()
thumbID = id thumbID = id
eppNum = -1 eppNum = -1
seasonNum = -1 seasonNum = -1
@ -256,10 +255,10 @@ class PlaybackUtils():
for itemID in items: for itemID in items:
utils.logMsg("PlayBackUtils", "Adding Item to Playlist : " + itemID) utils.logMsg("PlayBackUtils", "Adding Item to Playlist : " + itemID)
item_url = "%s/mediabrowser/Users/%s/Items/%s?format=json" % (server, userid, itemID) item_url = "{server}/mediabrowser/Users/{UserId}/Items/%s?format=json" % itemID
jsonData = self.downloadUtils.downloadUrl(item_url, suppress=False, popup=1 ) jsonData = self.downloadUtils.downloadUrl(item_url)
item_data = json.loads(jsonData) item_data = jsonData
added = self.addPlaylistItem(playlist, item_data, server, userid) added = self.addPlaylistItem(playlist, item_data, server, userid)
if(added and started == False): if(added and started == False):
started = True started = True
@ -290,10 +289,10 @@ class PlaybackUtils():
for item in items: for item in items:
item_url = "%s/mediabrowser/Users/%s/Items/%s?format=json&ImageTypeLimit=1" % (server, userid, item["Id"]) item_url = "{server}/mediabrowser/Users/{UserId}/Items/%s?format=json&ImageTypeLimit=1" % item["Id"]
jsonData = self.downloadUtils.downloadUrl(item_url, suppress=False, popup=1 ) jsonData = self.downloadUtils.downloadUrl(item_url)
item_data = json.loads(jsonData) item_data = jsonData
self.addPlaylistItem(playlist, item_data, server, userid) self.addPlaylistItem(playlist, item_data, server, userid)
xbmc.Player().play(playlist) xbmc.Player().play(playlist)
@ -311,10 +310,10 @@ class PlaybackUtils():
for itemID in itemIds: for itemID in itemIds:
utils.logMsg("PlayBackUtils", "Adding Item to Playlist : " + itemID) utils.logMsg("PlayBackUtils", "Adding Item to Playlist : " + itemID)
item_url = "%s/mediabrowser/Users/%s/Items/%s?format=json" % (server, userid, itemID) item_url = "{server}/mediabrowser/Users/{UserId}/Items/%s?format=json" % itemID
jsonData = self.downloadUtils.downloadUrl(item_url, suppress=False, popup=1 ) jsonData = self.downloadUtils.downloadUrl(item_url)
item_data = json.loads(jsonData) item_data = jsonData
self.addPlaylistItem(playlist, item_data, server, userid) self.addPlaylistItem(playlist, item_data, server, userid)
return playlist return playlist