From 654d0e5d93391bff1d55ab33b060cd93b01a7dc6 Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Tue, 22 Jan 2019 07:34:16 -0600 Subject: [PATCH] Update Krypton objects --- resources/lib/objects/__init__.py | 2 +- resources/lib/objects/actions.py | 8 ++++---- resources/lib/objects/obj.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/lib/objects/__init__.py b/resources/lib/objects/__init__.py index 11cc3658..910a966a 100644 --- a/resources/lib/objects/__init__.py +++ b/resources/lib/objects/__init__.py @@ -1,4 +1,4 @@ -version = "171076027" +version = "171076028" from movies import Movies from musicvideos import MusicVideos diff --git a/resources/lib/objects/actions.py b/resources/lib/objects/actions.py index 0e430640..e2f550cf 100644 --- a/resources/lib/objects/actions.py +++ b/resources/lib/objects/actions.py @@ -253,7 +253,7 @@ class Actions(object): if intro: obj['Artwork']['Primary'] = "&KodiCinemaMode=true" - self.listitem_video(obj, listitem, item, seektime) + self.listitem_video(obj, listitem, item, seektime, intro) if 'PlaybackInfo' in item: @@ -278,7 +278,7 @@ class Actions(object): listitem.setContentLookup(False) - def listitem_video(self, obj, listitem, item, seektime=None): + def listitem_video(self, obj, listitem, item, seektime=None, intro=False): ''' Set listitem for video content. That also include streams. ''' @@ -311,7 +311,7 @@ class Actions(object): obj['Artwork']['Backdrop'] = obj['Artwork']['Backdrop'] or [] obj['Artwork']['Thumb'] = obj['Artwork']['Thumb'] or "" - if obj['Type'] == 'Video' and not obj['Type'] == 'Trailer': + if not intro and not obj['Type'] == 'Trailer': obj['Artwork']['Primary'] = obj['Artwork']['Primary'] or "special://home/addons/plugin.video.emby/icon.png" else: obj['Artwork']['Primary'] = obj['Artwork']['Primary'] or obj['Artwork']['Thumb'] or (obj['Artwork']['Backdrop'][0] if len(obj['Artwork']['Backdrop']) else "special://home/addons/plugin.video.emby/fanart.jpg") @@ -320,7 +320,7 @@ class Actions(object): self.set_artwork(obj['Artwork'], listitem, obj['Type']) - if obj['Type'] == 'Video' or obj['Type'] == 'Trailer': + if intro or obj['Type'] == 'Trailer': listitem.setArt({'poster': ""}) # Clear the poster value for intros / trailers to prevent issues in skins listitem.setIconImage('DefaultVideo.png') diff --git a/resources/lib/objects/obj.py b/resources/lib/objects/obj.py index 6ff845ac..e5f76964 100644 --- a/resources/lib/objects/obj.py +++ b/resources/lib/objects/obj.py @@ -100,7 +100,7 @@ class Objects(object): if not self.__filters__(obj, obj_filters): obj = None - if not obj and len(params) != params.index(param): + if obj is None and len(params) != params.index(param): continue if obj_key: