Merge branch 'master' of https://github.com/BigNoid/script.skinshortcuts

BigNoid · Aug 22, 2015 · 9b5cbf4 · 9b5cbf4
2 parents 7d389d2 + 2c2b977
commit 9b5cbf4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/resources/lib/gui.py b/resources/lib/gui.py
@@ -337,7 +337,7 @@ def _parse_shortcut( self, item ):
         if additionalProperties is not None:
             listitem.setProperty( "additionalListItemProperties", additionalProperties.text )
             for property in eval( additionalProperties.text ):
-                if property[1].startswith("$"):
+                if property[1].startswith("$") and not property[ 1 ].startswith( "$SKIN" ):
                     #Translate some listItem properties if needed so they're displayed correctly in the gui
                     listitem.setProperty(property[0],xbmc.getInfoLabel(property[1]))
                 else:
@@ -1606,10 +1606,11 @@ def _add_additionalproperty( self, listitem, propertyName, propertyValue ):
             properties.append( [propertyName, DATA.local( propertyValue )[0] ] )
 
         #translate any INFO labels (if needed) so they will be displayed correctly in the gui
-        if propertyValue.startswith("$"):
-            listitem.setProperty( propertyName, xbmc.getInfoLabel(propertyValue) )
-        else:
-            listitem.setProperty( propertyName, DATA.local( propertyValue )[2] )
+        if propertyValue:
+            if propertyValue.startswith("$") and not propertyValue.startswith( "$SKIN" ):
+                listitem.setProperty( propertyName, xbmc.getInfoLabel(propertyValue) )
+            else:
+                listitem.setProperty( propertyName, DATA.local( propertyValue )[2] )
 
         listitem.setProperty( "additionalListItemProperties", repr( properties ) )
 

diff --git a/resources/lib/library.py b/resources/lib/library.py
@@ -7,6 +7,7 @@
 from xml.sax.saxutils import escape as escapeXML
 from traceback import print_exc
 from unidecode import unidecode
+from unicodeutils import try_decode
 import datafunctions, nodefunctions
 DATA = datafunctions.DataFunctions()
 NODE = nodefunctions.NodeFunctions()
@@ -1500,9 +1501,9 @@ def explorer( self, history, location, label, thumbnail, itemType, isWidget = Fa
         widgetType = None
         addonType = None
 
-        dialogLabel = label[0].replace( "  >", "" )
+        dialogLabel = try_decode( label[0] ).replace( "  >", "" )
         if len( label ) != 1:
-            dialogLabel = label[0].replace( "  >", "" ) + " - " + label[ len( label ) - 1 ].replace( "  >", "" )
+            dialogLabel = try_decode( label[0] ).replace( "  >", "" ) + " - " + try_decode( label[ -1 ] ).replace( "  >", "" )
 
         listings = []
 
@@ -1574,7 +1575,7 @@ def explorer( self, history, location, label, thumbnail, itemType, isWidget = Fa
                             listitem = self._create( [ item[ "file" ], "%s  >" %( item[ "label" ] ), "", {"icon": "DefaultFolder.png", "thumb": thumb} ] )
 
                         # Add widget properties
-                        widgetName = label[0].replace( "  >", "" ) + " - " + item[ "label" ]
+                        widgetName = try_decode(label[0]).replace( "  >", "" ) + " - " + item[ "label" ]
                         listitem.setProperty( "widget", "Library" )
                         listitem.setProperty( "widgetName", widgetName )
                         listitem.setProperty( "widgetType", widgetType )