From 4e37aa9bbfd9d732f6da997c9e1f147d14175d66 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 25 Feb 2020 18:39:50 -0500 Subject: [PATCH] Finish getitem cleanup in library --- jellyfin_kodi/library.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/jellyfin_kodi/library.py b/jellyfin_kodi/library.py index 8d4a3f7b..5840d1cc 100644 --- a/jellyfin_kodi/library.py +++ b/jellyfin_kodi/library.py @@ -675,21 +675,20 @@ class UserDataWorker(threading.Thread): except Queue.Empty: break - if item['Type'] == 'Movie': - obj = Movies(self.args[0], jellyfindb, kodidb, self.args[1]).userdata(item) - elif item['Type'] in ['Series', 'Season', 'Episode']: - obj = TVShows(self.args[0], jellyfindb, kodidb, self.args[1]).userdata(item) - elif item['Type'] == 'MusicAlbum': - obj = Music(self.args[0], jellyfindb, kodidb, self.args[1]).album - elif item['Type'] == 'MusicArtist': - obj = Music(self.args[0], jellyfindb, kodidb, self.args[1]).artist - elif item['Type'] == 'AlbumArtist': - obj = Music(self.args[0], jellyfindb, kodidb, self.args[1]).albumartist - elif item['Type'] == 'Audio': - obj = Music(self.args[0], jellyfindb, kodidb, self.args[1]).song try: - obj(item) + if item['Type'] == 'Movie': + obj = Movies(self.args[0], jellyfindb, kodidb, self.args[1]).userdata(item) + elif item['Type'] in ['Series', 'Season', 'Episode']: + obj = TVShows(self.args[0], jellyfindb, kodidb, self.args[1]).userdata(item) + elif item['Type'] == 'MusicAlbum': + obj = Music(self.args[0], jellyfindb, kodidb, self.args[1]).album(item) + elif item['Type'] == 'MusicArtist': + obj = Music(self.args[0], jellyfindb, kodidb, self.args[1]).artist(item) + elif item['Type'] == 'AlbumArtist': + obj = Music(self.args[0], jellyfindb, kodidb, self.args[1]).albumartist(item) + elif item['Type'] == 'Audio': + obj = Music(self.args[0], jellyfindb, kodidb, self.args[1]).song(item) except LibraryException as error: if error.status == 'StopCalled': break