Fix unicode on Linux

Author: KenV99

resources/lib/taskABC.py

@@ -84,14 +84,14 @@ def processUserargs(self, kwargs):
         ret = ret.replace(u'%_', u",")
         ret = ret.replace(u'{@literal%@}', ur'%')
         if self.tasktype == 'script' or self.tasktype == 'python':
-            ret2 = ret.split(u'{@originaldelim@}') # need to split first to avoid unicode error
-            if self.tasktype == 'script':
-                fse = sys.getfilesystemencoding()
-                ret = []
-                for r in ret2:
-                    ret.append(r.encode(fse))
-            else:
-                ret = ret2
+            ret = ret.split(u'{@originaldelim@}') # need to split first to avoid unicode error
+            # if self.tasktype == 'script':
+            #     fse = sys.getfilesystemencoding()
+            #     ret = []
+            #     for r in ret2:
+            #         ret.append(r.encode(fse))
+            # else:
+            #     ret = ret2
         return ret
 
     @staticmethod

resources/lib/tasks/taskPython.py

@@ -88,11 +88,16 @@ def run(self):
         if sys.platform.lower().startswith('win'):
             if fn.encode('utf-8') != fn.encode(fse):
                 fn = fsencode(fn)
+        else:
+            fn = fn.encode(fse)
         try:
             if len(self.runtimeargs) > 0:
                 if useImport is False:
-                    args = ' %s' % ' '.join(args)
-                    args = args.encode('ascii', errors='replace')
+                    args = u' %s' % ' '.join(args)
+                    try:
+                        args = args.encode(fse)
+                    except UnicodeEncodeError:
+                        msg += 'Unicode Encode Error for "%s" Encoder: %s' % (args, fse)
                     result = xbmc.executebuiltin('XBMC.RunScript(%s, %s)' % (fn, args))
                 else:
                     directory, module_name = os.path.split(self.taskKwargs['pythonfile'])
@@ -106,7 +111,7 @@ def run(self):
                         sys.path[:] = path
             else:
                 if useImport is False:
-                    result = xbmc.executebuiltin('XBMC.RunScript(%s)' % fn)
+                    result = xbmc.executebuiltin(u'XBMC.RunScript(%s)' % fn)
                 else:
 
                     directory, module_name = os.path.split(fn)

resources/lib/tasks/taskScript.py

@@ -132,7 +132,10 @@ def run(self):
 
         args = []
         for arg in argsu:
-            args.append(arg.encode(fse))
+            try:
+                args.append(arg.encode(fse))
+            except UnicodeEncodeError:
+                msg += u'Unicode Encode Error for: "%s" Encoder: %s' % (arg, fse)
         if needs_shell:
             args = ' '.join(args)
         err = False

resources/lib/utils/debugger.py

@@ -18,6 +18,7 @@
 #
 import os
 import sys
+import xbmc
 
 class pydevd_dummy(object):
     @staticmethod
@@ -31,11 +32,15 @@ def startdebugger():
     elif sys.platform.lower().startswith('darwin'):
         debugegg = '/Applications/PyCharm.app/Contents/debug-eggs/pycharm-debug.egg'
     elif sys.platform.lower().startswith('linux'):
-        debugegg = os.path.expandvars(os.path.expanduser('~/PyCharm 2016.1/debug-eggs/pycharm-debug.egg'))
+        debugegg = os.path.expandvars(os.path.expanduser('~/Applications/pycharm-2016.1.4/debug-eggs/pycharm-debug.egg'))
     if os.path.exists(debugegg):
         sys.path.append(debugegg)
         try:
             import pydevd
         except ImportError:
+            xbmc.log(msg = 'Debugger import error @: "%s"' % debugegg)
             pydevd = pydevd_dummy
-        pydevd.settrace('localhost', port=51234, stdoutToServer=True, stderrToServer=True, suspend=False)
+        pydevd.settrace('localhost', port=51234, stdoutToServer=True, stderrToServer=True, suspend=False)
+    else:
+        xbmc.log(msg='Debugger not found @: "%s"' % debugegg)
+

resources/lib/utils/kodipathtools.py

@@ -97,8 +97,8 @@ def translatepath(path):
     if path.startswith('/'):
         ret = u'/%s' % ret
 
-    if not os.path.supports_unicode_filenames:
-        ret = ret.decode('utf-8')
+    # if not os.path.supports_unicode_filenames:
+    #     ret = ret.decode('utf-8')
 
     ret = secure_filename(ret)
     return ret