Merge branch 'master' into cleanup-shortcuts-client.py

addon.xml

@@ -39,8 +39,8 @@
       #44 Remove code caching, fixing Kodi 18 Music syncing for existing installs.
     </news>
     <assets>
-      <icon>icon.png</icon>
-      <fanart>fanart.png</fanart>
+      <icon>resources/icon.png</icon>
+      <fanart>resources/fanart.png</fanart>
     </assets>
   </extension>
 </addon>

resources/lib/downloader.py

@@ -40,10 +40,8 @@ def browse_info():
 
 def _http(action, url, request={}, server_id=None):
     request.update({'url': url, 'type': action})
-
     return Jellyfin(server_id).http.request(request)
 
-
 def _get(handler, params=None, server_id=None):
     return _http("GET", get_jellyfinserver_url(handler), {'params': params}, server_id)
 

resources/lib/entrypoint/default.py

@@ -209,10 +209,12 @@ def directory(label, path, folder=True, artwork=None, fanart=None, context=None)
 
 def dir_listitem(label, path, artwork=None, fanart=None):
 
+    ''' Gets the icon paths for default node listings
+    '''
     li = xbmcgui.ListItem(label, path=path)
-    li.setThumbnailImage(artwork or "special://home/addons/plugin.video.jellyfin/icon.png")
-    li.setArt({"fanart": fanart or "special://home/addons/plugin.video.jellyfin/fanart.png"})
-    li.setArt({"landscape": artwork or fanart or "special://home/addons/plugin.video.jellyfin/fanart.png"})
+    li.setThumbnailImage(artwork or "special://home/addons/plugin.video.jellyfin/resources/icon.png")
+    li.setArt({"fanart": fanart or "special://home/addons/plugin.video.jellyfin/resources/fanart.png"})
+    li.setArt({"landscape": artwork or fanart or "special://home/addons/plugin.video.jellyfin/resources/fanart.png"})
 
     return li
 

resources/lib/helper/utils.py

@@ -140,7 +140,7 @@ def dialog(dialog_type, *args, **kwargs):
 
     if "icon" in kwargs:
         kwargs['icon'] = kwargs['icon'].replace("{jellyfin}",
-                                                "special://home/addons/plugin.video.jellyfin/icon.png")
+                "special://home/addons/plugin.video.jellyfin/resources/icon.png")
     if "heading" in kwargs:
         kwargs['heading'] = kwargs['heading'].replace("{jellyfin}", _('addon_name'))
 

resources/lib/jellyfin/core/http.py

@@ -26,14 +26,6 @@ class HTTP(object):
         self.client = client
         self.config = client.config
 
-    def __shortcuts__(self, key):
-        LOG.debug("__shortcuts__(%r)", key)
-
-        if key == "request":
-            return self.request
-
-        return
-
     def start_session(self):
 
         self.session = requests.Session()

resources/lib/monitor.py

@@ -263,7 +263,6 @@ class Monitor(xbmc.Monitor):
             self.server_instance(data['ServerId'])
 
         elif method == 'AddUser':
-
             server.jellyfin.session_add_user(server.config.data['app.session'], data['Id'], data['Add'])
             self.additional_users(server)
 
@@ -315,10 +314,7 @@ class Monitor(xbmc.Monitor):
                 "Mute,Unmute,SetVolume,"
                 "Play,Playstate,PlayNext,PlayMediaSource"
             ),
-            'IconUrl': "https://raw.githubusercontent.com/jellyfin/jellyfin-kodi/master/kodi_icon.png",
         })
-
-
         session = server.jellyfin.get_device(self.device_id)
         server.config.data['app.session'] = session[0]['Id']
 

resources/lib/objects/actions.py

@@ -311,10 +311,16 @@ class Actions(object):
         obj['Artwork']['Thumb'] = obj['Artwork']['Thumb'] or ""
 
         if not intro and not obj['Type'] == 'Trailer':
-            obj['Artwork']['Primary'] = obj['Artwork']['Primary'] or "special://home/addons/plugin.video.jellyfin/icon.png"
+            obj['Artwork']['Primary'] = obj['Artwork']['Primary'] \
+                    or "special://home/addons/plugin.video.jellyfin/resources/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.jellyfin/fanart.png")
-            obj['Artwork']['Primary'] += "&KodiTrailer=true" if obj['Type'] == 'Trailer' else "&KodiCinemaMode=true"
+            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.jellyfin/resources/fanart.png")
+            obj['Artwork']['Primary'] += "&KodiTrailer=true" \
+                    if obj['Type'] == 'Trailer' else "&KodiCinemaMode=true"
             obj['Artwork']['Backdrop'] = [obj['Artwork']['Primary']]
 
         self.set_artwork(obj['Artwork'], listitem, obj['Type'])
@@ -471,10 +477,12 @@ class Actions(object):
         obj['Runtime'] = round(float((obj['Runtime'] or 0) / 10000000.0), 6)
         obj['PlayCount'] = API.get_playcount(obj['Played'], obj['PlayCount']) or 0
         obj['Overlay'] = 7 if obj['Played'] else 6
-        obj['Artwork']['Primary'] = obj['Artwork']['Primary'] or "special://home/addons/plugin.video.jellyfin/icon.png"
-        obj['Artwork']['Thumb'] = obj['Artwork']['Thumb'] or "special://home/addons/plugin.video.jellyfin/fanart.png"
-        obj['Artwork']['Backdrop'] = obj['Artwork']['Backdrop'] or ["special://home/addons/plugin.video.jellyfin/fanart.png"]
-
+        obj['Artwork']['Primary'] = obj['Artwork']['Primary'] \
+                or "special://home/addons/plugin.video.jellyfin/resources/icon.png"
+        obj['Artwork']['Thumb'] = obj['Artwork']['Thumb'] \
+                or "special://home/addons/plugin.video.jellyfin/resources/fanart.png"
+        obj['Artwork']['Backdrop'] = obj['Artwork']['Backdrop'] \
+                or ["special://home/addons/plugin.video.jellyfin/resources/fanart.png"]
 
         metadata = {
             'title': obj['Title'],

resources/lib/views.py

@@ -363,7 +363,7 @@ class Views(object):
         else:
             element = etree.Element('node', {'order': str(index), 'type': "folder"})
 
-        etree.SubElement(element, 'icon').text = "special://home/addons/plugin.video.jellyfin/icon.png"
+        etree.SubElement(element, 'icon').text = "special://home/addons/plugin.video.jellyfin/resources/icon.png"
 
         return element