simpleplugin 2.1.0

lib/simpleplugin/__init__.py

@@ -1,4 +1,4 @@
-#v2.0.1
+#v2.1.0
 #https://github.com/romanvm/script.module.simpleplugin/releases
 
 from simpleplugin import *

lib/simpleplugin/simpleplugin.py

@@ -267,6 +267,16 @@ class Addon(object):
         """
         return self._configdir
 
+    @property
+    def version(self):
+        """
+        Addon version
+
+        :return: addon version
+        :rtype: str
+        """
+        return self._addon.getAddonInfo('version')
+
     def get_localized_string(self, id_):
         """
         Get localized UI string
@@ -274,7 +284,7 @@ class Addon(object):
         :param id_: UI string ID
         :type id_: int
         :return: UI string in the current language
-        :rtype: unicode
+        :rtype: str
         """
         return self._addon.getLocalizedString(id_).encode('utf-8')
 
@@ -327,7 +337,7 @@ class Addon(object):
             value = str(value)
         self._addon.setSetting(id_, value)
 
-    def log(self, message, level=0):
+    def log(self, message, level=xbmc.LOGDEBUG):
         """
         Add message to Kodi log starting with Addon ID
 
@@ -339,7 +349,7 @@ class Addon(object):
         """
         if isinstance(message, unicode):
             message = message.encode('utf-8')
-        xbmc.log('{0}: {1}'.format(self.id, message), level)
+        xbmc.log('{0} [v.{1}]: {2}'.format(self.id, self.version, message), level)
 
     def log_notice(self, message):
         """
@@ -879,7 +889,6 @@ class Plugin(Addon):
         self.log_debug('Creating listing from {0}'.format(str(context)))
         if context.content is not None:
             xbmcplugin.setContent(self._handle, context.content)  # This must be at the beginning
-        listing = []
         for item in context.listing:
             is_folder = item.get('is_folder', True)
             if item.get('list_item') is not None:
@@ -889,8 +898,7 @@ class Plugin(Addon):
                 if item.get('is_playable'):
                     list_item.setProperty('IsPlayable', 'true')
                     is_folder = False
-            listing.append((item['url'], list_item, is_folder))
-        xbmcplugin.addDirectoryItems(self._handle, listing, len(listing))
+            xbmcplugin.addDirectoryItem(self._handle, item['url'], list_item, is_folder)
         if context.sort_methods is not None:
             [xbmcplugin.addSortMethod(self._handle, method) for method in context.sort_methods]
         xbmcplugin.endOfDirectory(self._handle,
@@ -912,4 +920,4 @@ class Plugin(Addon):
             list_item = xbmcgui.ListItem(path=context.path)
         else:
             list_item = self.create_list_item(context.play_item)
-        xbmcplugin.setResolvedUrl(self._handle, context.succeeded, list_item)
+        xbmcplugin.setResolvedUrl(self._handle, context.succeeded, list_item)