code reduce

This commit is contained in:
SpootDev 2016-03-31 13:35:23 -05:00
parent c6ba6d6f51
commit 8a130fe810
1 changed files with 29 additions and 74 deletions

View File

@ -308,11 +308,8 @@ class Read_EmbyServer():
else: else:
for item in items: for item in items:
name = item['Name'] item['Name'] = item['Name']
itemId = item['Id'] if item['Type'] == "Channel":
viewtype = item['Type']
if viewtype == "Channel":
# Filter view types # Filter view types
continue continue
@ -326,17 +323,17 @@ class Read_EmbyServer():
result = self.doUtils(url) result = self.doUtils(url)
for folder in result['Items']: for folder in result['Items']:
if itemId == folder['Id']: if item['Id'] == folder['Id']:
itemtype = folder.get('CollectionType', "mixed")''' itemtype = folder.get('CollectionType', "mixed")'''
if name not in ('Collections', 'Trailers'): if item['Name'] not in ('Collections', 'Trailers'):
if sortedlist: if sortedlist:
views.append({ views.append({
'name': name, 'name': item['Name'],
'type': itemtype, 'type': itemtype,
'id': itemId 'id': item['Id']
}) })
elif (itemtype == mediatype or elif (itemtype == mediatype or
@ -344,9 +341,9 @@ class Read_EmbyServer():
views.append({ views.append({
'name': name, 'name': item['Name'],
'type': itemtype, 'type': itemtype,
'id': itemId 'id': item['Id']
}) })
return views return views
@ -354,8 +351,6 @@ class Read_EmbyServer():
def verifyView(self, parentid, itemid): def verifyView(self, parentid, itemid):
belongs = False belongs = False
url = "{server}/emby/Users/{UserId}/Items?format=json"
params = { params = {
'ParentId': parentid, 'ParentId': parentid,
@ -365,7 +360,7 @@ class Read_EmbyServer():
'Recursive': True, 'Recursive': True,
'Ids': itemid 'Ids': itemid
} }
result = self.doUtils(url, parameters=params) result = self.doUtils("{server}/emby/Users/{UserId}/Items?format=json", parameters=params)
try: try:
total = result['TotalRecordCount'] total = result['TotalRecordCount']
except TypeError: except TypeError:
@ -378,40 +373,23 @@ class Read_EmbyServer():
return belongs return belongs
def getMovies(self, parentId, basic=False, dialog=None): def getMovies(self, parentId, basic=False, dialog=None):
return self.getSection(parentId, "Movie", basic=basic, dialog=dialog)
items = self.getSection(parentId, "Movie", basic=basic, dialog=dialog)
return items
def getBoxset(self, dialog=None): def getBoxset(self, dialog=None):
return self.getSection(None, "BoxSet", dialog=dialog)
items = self.getSection(None, "BoxSet", dialog=dialog)
return items
def getMovies_byBoxset(self, boxsetid): def getMovies_byBoxset(self, boxsetid):
return self.getSection(boxsetid, "Movie")
items = self.getSection(boxsetid, "Movie")
return items
def getMusicVideos(self, parentId, basic=False, dialog=None): def getMusicVideos(self, parentId, basic=False, dialog=None):
return self.getSection(parentId, "MusicVideo", basic=basic, dialog=dialog)
items = self.getSection(parentId, "MusicVideo", basic=basic, dialog=dialog)
return items
def getHomeVideos(self, parentId): def getHomeVideos(self, parentId):
items = self.getSection(parentId, "Video") return self.getSection(parentId, "Video")
return items
def getShows(self, parentId, basic=False, dialog=None): def getShows(self, parentId, basic=False, dialog=None):
return self.getSection(parentId, "Series", basic=basic, dialog=dialog)
items = self.getSection(parentId, "Series", basic=basic, dialog=dialog)
return items
def getSeasons(self, showId): def getSeasons(self, showId):
@ -421,13 +399,12 @@ class Read_EmbyServer():
'TotalRecordCount': 0 'TotalRecordCount': 0
} }
url = "{server}/emby/Shows/%s/Seasons?UserId={UserId}&format=json" % showId
params = { params = {
'IsVirtualUnaired': False, 'IsVirtualUnaired': False,
'Fields': "Etag" 'Fields': "Etag"
} }
result = self.doUtils(url, parameters=params) result = self.doUtils("{server}/emby/Shows/%s/Seasons?UserId={UserId}&format=json" % showId, parameters=params)
if result: if result:
items = result items = result
@ -435,21 +412,16 @@ class Read_EmbyServer():
def getEpisodes(self, parentId, basic=False, dialog=None): def getEpisodes(self, parentId, basic=False, dialog=None):
items = self.getSection(parentId, "Episode", basic=basic, dialog=dialog) return self.getSection(parentId, "Episode", basic=basic, dialog=dialog)
return items
def getEpisodesbyShow(self, showId): def getEpisodesbyShow(self, showId):
items = self.getSection(showId, "Episode") return self.getSection(showId, "Episode")
return items
def getEpisodesbySeason(self, seasonId): def getEpisodesbySeason(self, seasonId):
items = self.getSection(seasonId, "Episode") return self.getSection(seasonId, "Episode")
return items
def getArtists(self, dialog=None): def getArtists(self, dialog=None):
@ -506,28 +478,17 @@ class Read_EmbyServer():
return items return items
def getAlbums(self, basic=False, dialog=None): def getAlbums(self, basic=False, dialog=None):
return self.getSection(None, "MusicAlbum", sortby="DateCreated", basic=basic, dialog=dialog)
items = self.getSection(None, "MusicAlbum", sortby="DateCreated", basic=basic, dialog=dialog)
return items
def getAlbumsbyArtist(self, artistId): def getAlbumsbyArtist(self, artistId):
return self.getSection(artistId, "MusicAlbum", sortby="DateCreated")
items = self.getSection(artistId, "MusicAlbum", sortby="DateCreated")
return items
def getSongs(self, basic=False, dialog=None): def getSongs(self, basic=False, dialog=None):
return self.getSection(None, "Audio", basic=basic, dialog=dialog)
items = self.getSection(None, "Audio", basic=basic, dialog=dialog)
return items
def getSongsbyAlbum(self, albumId): def getSongsbyAlbum(self, albumId):
return self.getSection(albumId, "Audio")
items = self.getSection(albumId, "Audio")
return items
def getAdditionalParts(self, itemId): def getAdditionalParts(self, itemId):
@ -537,8 +498,7 @@ class Read_EmbyServer():
'TotalRecordCount': 0 'TotalRecordCount': 0
} }
url = "{server}/emby/Videos/%s/AdditionalParts?UserId={UserId}&format=json" % itemId result = self.doUtils("{server}/emby/Videos/%s/AdditionalParts?UserId={UserId}&format=json" % itemId)
result = self.doUtils(url)
if result: if result:
items = result items = result
@ -562,21 +522,16 @@ class Read_EmbyServer():
# Updates the user rating to Emby # Updates the user rating to Emby
if favourite: if favourite:
url = "{server}/emby/Users/{UserId}/FavoriteItems/%s?format=json" % itemid self.doUtils("{server}/emby/Users/{UserId}/FavoriteItems/%s?format=json" % itemid, type="POST")
self.doUtils(url, type="POST")
elif favourite == False: elif favourite == False:
url = "{server}/emby/Users/{UserId}/FavoriteItems/%s?format=json" % itemid self.doUtils("{server}/emby/Users/{UserId}/FavoriteItems/%s?format=json" % itemid, type="DELETE")
self.doUtils(url, type="DELETE")
if not deletelike and like: if not deletelike and like:
url = "{server}/emby/Users/{UserId}/Items/%s/Rating?Likes=true&format=json" % itemid self.doUtils("{server}/emby/Users/{UserId}/Items/%s/Rating?Likes=true&format=json" % itemid, type="POST")
self.doUtils(url, type="POST")
elif not deletelike and like is False: elif not deletelike and like is False:
url = "{server}/emby/Users/{UserId}/Items/%s/Rating?Likes=false&format=json" % itemid self.doUtils("{server}/emby/Users/{UserId}/Items/%s/Rating?Likes=false&format=json" % itemid, type="POST")
self.doUtils(url, type="POST")
elif deletelike: elif deletelike:
url = "{server}/emby/Users/{UserId}/Items/%s/Rating?format=json" % itemid self.doUtils("{server}/emby/Users/{UserId}/Items/%s/Rating?format=json" % itemid, type="DELETE")
self.doUtils(url, type="DELETE")
self.logMsg("Update user rating to emby for itemid: %s " self.logMsg("Update user rating to emby for itemid: %s "
"| like: %s | favourite: %s | deletelike: %s" "| like: %s | favourite: %s | deletelike: %s"