Include with ... open

Names task threads
Makes poutil compat with 6.5
Further improves Shutdown

Author: KenV99

default.py

@@ -134,7 +134,7 @@ def start():
 
 
 def main():
-    msg = _(u'$$$ [kodi.callbacks] - Staring kodi.callbacks ver: %s (build %s)').encode('utf-8') % (str(_addonversion_), build)
+    msg = _(u'$$$ [kodi.callbacks] - Staring kodi.callbacks ver: %s (build %s) python: %s').encode('utf-8') % (str(_addonversion_), build, sys.version)
     xbmc.log(msg=msg, level=xbmc.LOGNOTICE)
     if branch != 'master':
         xbmcaddon.Addon().setSetting('installed branch', branch)

resources/language/English/strings.po

@@ -20,7 +20,7 @@ msgid "Callbacks for Kodi"
 msgstr ""
 
 msgctxt "Addon Description"
-msgid "Provides user definable actions for specific events within Kodi. Credit to Yesudeep Mangalapilly (gorakhargosh on github) and contributors for watchdog and pathtools modules.    "
+msgid "Provides user definable actions for specific events within Kodi. Credit to Yesudeep Mangalapilly (gorakhargosh on github) and contributors for watchdog and pathtools modules."
 msgstr ""
 
 msgctxt "Addon Disclaimer"

resources/lib/publishers/log.py

@@ -40,19 +40,19 @@ def __init__(self, interval=100):
         self.interval = interval
 
     def run(self):
-        f = codecs.open(self.logfn, 'r', encoding='utf-8', errors='ignore')
-        f.seek(0, 2)           # Seek @ EOF
-        fsize_old = f.tell()
-        while not self.__abort_evt.is_set():
+        with codecs.open(self.logfn, 'r', encoding='utf-8', errors='ignore') as f:
             f.seek(0, 2)           # Seek @ EOF
-            fsize = f.tell()        # Get Size
-            if fsize > fsize_old:
-                f.seek(fsize_old, 0)
-                lines = f.readlines()       # Read to end
-                for line in lines:
-                    self.ouputq.put(line, False)
-                fsize_old = f.tell()
-            xbmc.sleep(self.interval)
+            fsize_old = f.tell()
+            while not self.__abort_evt.is_set():
+                f.seek(0, 2)           # Seek @ EOF
+                fsize = f.tell()        # Get Size
+                if fsize > fsize_old:
+                    f.seek(fsize_old, 0)
+                    lines = f.readlines()       # Read to end
+                    for line in lines:
+                        self.ouputq.put(line, False)
+                    fsize_old = f.tell()
+                xbmc.sleep(self.interval)
 
     def abort(self, timeout=0):
         self.__abort_evt.set()

resources/lib/pubsub.py

@@ -163,6 +163,10 @@ def abort(self, timeout=0):
         if self.running:
             while not self._message_q.empty(): #Fixes bug where Shutdown event does not run bc abort called
                 time.sleep(0.1)
+            for subcriber in self.subscribers:
+                for tm in subcriber.taskmanagers:
+                    for task in tm.run_tasks:
+                        task.join(0.1)
             self._abort_evt.set()
             if timeout > 0:
                 self.join(timeout)

resources/lib/taskABC.py

@@ -17,7 +17,6 @@
 #    along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-import sys
 import threading
 import Queue
 import abc
@@ -43,8 +42,8 @@ class AbstractTask(threading.Thread):
     tasktype = 'abstract'
     lock = threading.RLock()
 
-    def __init__(self, logger=KodiLogger.log):
-        super(AbstractTask, self).__init__(name='Worker')
+    def __init__(self, logger=KodiLogger.log, name='AbstractTask'):
+        super(AbstractTask, self).__init__(name=name)
         self.cmd_str = ''
         self.userargs = ''
         self.log = logger

resources/lib/tasks/taskBuiltin.py

@@ -40,7 +40,7 @@ class TaskBuiltin(AbstractTask):
     ]
 
     def __init__(self):
-        super(TaskBuiltin, self).__init__()
+        super(TaskBuiltin, self).__init__(name='Builtin')
 
     @staticmethod
     def validate(taskKwargs, xlog=KodiLogger.log):

resources/lib/tasks/taskHttp.py

@@ -79,7 +79,7 @@ class TaskHttp(AbstractTask):
     ]
 
     def __init__(self):
-        super(TaskHttp, self).__init__()
+        super(TaskHttp, self).__init__(name='TaskHttp')
         self.runtimeargs = u''
 
     @staticmethod

resources/lib/tasks/taskJson.py

@@ -41,7 +41,7 @@ class TaskJsonNotify(AbstractTask):
     ]
 
     def __init__(self):
-        super(TaskJsonNotify, self).__init__()
+        super(TaskJsonNotify, self).__init__(name='TaskJson')
 
     @staticmethod
     def validate(taskKwargs, xlog=KodiLogger.log):

resources/lib/tasks/taskPython.py

@@ -53,7 +53,7 @@ class TaskPython(AbstractTask):
     ]
 
     def __init__(self):
-        super(TaskPython, self).__init__()
+        super(TaskPython, self).__init__(name='TaskPython')
 
     @staticmethod
     def validate(taskKwargs, xlog=KodiLogger.log):

resources/lib/tasks/taskScript.py

@@ -65,7 +65,7 @@ class TaskScript(AbstractTask):
 
 
     def __init__(self):
-        super(TaskScript, self).__init__()
+        super(TaskScript, self).__init__(name='TaskScript')
 
     @staticmethod
     def validate(taskKwargs, xlog=KodiLogger.log):
@@ -176,7 +176,10 @@ def run(self):
             msg = unicode(e)
         except subprocess.CalledProcessError, e:
             err = True
-            msg = unicode(e.output)
+            if hasattr(e, 'output'):
+                msg = unicode(e.output)
+            else:
+                msg = unicode(e)
         except Exception:
             e = sys.exc_info()[0]
             err = True