Merge pull request #15 from heitbaum/master

[python] update xbmc.translatePath() to xbmcvfs

Author: enen92

resources/lib/addon.py

@@ -44,11 +44,11 @@ def __init__(self, params, ltype, rule, attrib, pathrule, orderby):
         self.PATHRULE = pathrule
         self.ORDERBY = orderby
         # If there are no custom library nodes in the profile directory, copy them from the Kodi install
-        targetDir = os.path.join( xbmc.translatePath( "special://profile" ), "library", ltype )
+        targetDir = os.path.join( xbmcvfs.translatePath( "special://profile" ), "library", ltype )
         if True:
             if not os.path.exists( targetDir ):
                 xbmcvfs.mkdirs( targetDir )
-                originDir = os.path.join( xbmc.translatePath( "special://xbmc" ), "system", "library", ltype )
+                originDir = os.path.join( xbmcvfs.translatePath( "special://xbmc" ), "system", "library", ltype )
                 dirs, files = xbmcvfs.listdir( originDir )
                 self.copyNode( dirs, files, targetDir, originDir )
         else:
@@ -189,7 +189,7 @@ def __init__(self, params, ltype, rule, attrib, pathrule, orderby):
                     if selected != -1 and selected != 0:
                         try:
                             # Copy those defaults across
-                            originDir = os.path.join( xbmc.translatePath( "special://xbmc" ), "system", "library", self.ltype, defaultValues[ selected ] )
+                            originDir = os.path.join( xbmcvfs.translatePath( "special://xbmc" ), "system", "library", self.ltype, defaultValues[ selected ] )
                             dirs, files = xbmcvfs.listdir( originDir )
                             for file in files:
                                 if file != "index.xml":

resources/lib/common.py

@@ -1,17 +1,17 @@
 
 import sys
 import os
-import xbmc, xbmcaddon
+import xbmc, xmbcvfs, xbmcaddon
 
 ADDON        = xbmcaddon.Addon()
 ADDONID      = ADDON.getAddonInfo('id')
 ADDONVERSION = ADDON.getAddonInfo('version')
 LANGUAGE     = ADDON.getLocalizedString
 CWD          = ADDON.getAddonInfo('path')
 ADDONNAME    = ADDON.getAddonInfo('name')
-DATAPATH     = xbmc.translatePath(xbmcaddon.Addon().getAddonInfo('profile'))
+DATAPATH     = xbmcvfs.translatePath(xbmcaddon.Addon().getAddonInfo('profile'))
 DEFAULTPATH  = os.path.join( CWD, 'resources' )
 
 def log(txt):
     message = u'%s: %s' % (ADDONID, txt)
-    xbmc.log(msg=message, level=xbmc.LOGDEBUG)
+    xbmc.log(msg=message, level=xbmc.LOGDEBUG)

resources/lib/rules.py

@@ -945,7 +945,7 @@ def browse( self, actionPath, ruleNum, match, content = None ):
             returnVal = self.browser( self.niceMatchName( match ) )
         try:
             # Delete any fake node
-            xbmcvfs.delete( os.path.join( xbmc.translatePath( "special://profile" ), "library", self.ltype, "plugin.library.node.editor", "temp.xml" ) )
+            xbmcvfs.delete( os.path.join( xbmcvfs.translatePath( "special://profile" ), "library", self.ltype, "plugin.library.node.editor", "temp.xml" ) )
         except:
             print_exc()
         self.writeUpdatedRule( actionPath, ruleNum, value = returnVal )
@@ -961,7 +961,7 @@ def niceMatchName( self, match ):
 
     def createBrowseNode( self, content, grouping = None ):
         # This function creates a fake node which we'll use for browsing
-        targetDir = os.path.join( xbmc.translatePath( "special://profile" ), "library", self.ltype, "plugin.library.node.editor" )
+        targetDir = os.path.join( xbmcvfs.translatePath( "special://profile" ), "library", self.ltype, "plugin.library.node.editor" )
         if not os.path.exists( targetDir ):
             xbmcvfs.mkdirs( targetDir )
         # Create a new etree