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

Beautify code

Browse source
This commit is contained in:
tomkat83 2016-07-19 15:08:28 +02:00
parent 8a2fdec248
commit d8a7218625
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
resources/lib/playlist.py
View file

@ -62,11 +62,10 @@ class Playlist():
playlist.clear() playlist.clear()
self.playlist = playlist self.playlist = playlist
def __addToPlaylist(self, itemids, startPlayer=False): def _addToPlaylist(self, itemids, startPlayer=False):
started = False started = False
with embydb.GetEmbyDB() as emby_db: with embydb.GetEmbyDB() as emby_db:
for itemid in itemids: for itemid in itemids:
self.logMsg("Adding %s to playlist." % itemid, 1)
embydb_item = emby_db.getItem_byId(itemid) embydb_item = emby_db.getItem_byId(itemid)
try: try:
dbid = embydb_item[0] dbid = embydb_item[0]
@ -78,9 +77,12 @@ class Playlist():
self.logMsg('Could not download itemid %s' self.logMsg('Could not download itemid %s'
% itemid, -1) % itemid, -1)
else: else:
self.logMsg('Downloaded item metadata, adding now', 1)
self.addtoPlaylist_xbmc(item) self.addtoPlaylist_xbmc(item)
else: else:
# Add to playlist # Add to playlist
self.logMsg("Adding %s PlexId %s, KodiId %s to playlist."
% (mediatype, itemid, dbid), 1)
self.addtoPlaylist(dbid, mediatype) self.addtoPlaylist(dbid, mediatype)
if started is False and startPlayer is True: if started is False and startPlayer is True:
started = True started = True
@ -100,7 +102,7 @@ class Playlist():
if startat != 0: if startat != 0:
# Seek to the starting position # Seek to the starting position
utils.window('plex_customplaylist.seektime', str(startat)) utils.window('plex_customplaylist.seektime', str(startat))
self.__addToPlaylist(itemids, startPlayer=True) self._addToPlaylist(itemids, startPlayer=True)
self.verifyPlaylist() self.verifyPlaylist()
def modifyPlaylist(self, itemids): def modifyPlaylist(self, itemids):
@ -108,7 +110,7 @@ class Playlist():
self.logMsg("Items: %s" % itemids, 1) self.logMsg("Items: %s" % itemids, 1)
self.__initiatePlaylist(itemids) self.__initiatePlaylist(itemids)
self.__addToPlaylist(itemids, startPlayer=True) self._addToPlaylist(itemids, startPlayer=True)
self.verifyPlaylist() self.verifyPlaylist()
@ -133,6 +135,7 @@ class Playlist():
int(dbid)} int(dbid)}
else: else:
pl['params']['item'] = {'file': url} pl['params']['item'] = {'file': url}
self.logMsg('JSONRPC question: %s' % json.dumps(pl), 2)
self.logMsg(xbmc.executeJSONRPC(json.dumps(pl)), 2) self.logMsg(xbmc.executeJSONRPC(json.dumps(pl)), 2)
def addtoPlaylist_xbmc(self, item): def addtoPlaylist_xbmc(self, item):