new dirs

core/pyLoadCli.py → interfaces/pyLoadCli.py

@@ -24,6 +24,8 @@
 import os
 import os.path
 from os.path import join
+from os.path import abspath
+from os.path import dirname
 import sys
 from sys import exit
 import threading
@@ -32,6 +34,8 @@
 import xmlrpclib
 from traceback import print_exc
 
+sys.path.append(join(dirname(abspath(__file__)), ".."))
+
 from module import InitHomeDir
 from module.ConfigParser import ConfigParser
 

interfaces/gui/pyLoadGui.py → interfaces/pyLoadGui.py

@@ -30,7 +30,13 @@
 import re
 import gettext
 from xmlrpclib import Binary
+from os.path import join
+from os.path import abspath
+from os.path import dirname
+
+sys.path.append(join(dirname(abspath(__file__)),".."))
 
+from module import InitHomeDir
 from module.gui.ConnectionManager import *
 from module.gui.connector import Connector
 from module.gui.MainWindow import *
@@ -59,21 +65,10 @@ def __init__(self):
         """
         QObject.__init__(self)
         self.app = QApplication(sys.argv)
-        self.path = join(dirname(__file__))
-        self.homedir = self.getHomeDir()
+        self.path = pypath
+	self.homedir = self.getHomeDir()
 
-        if platform in ("posix","linux2"):
-            configdir = join(self.homedir, ".pyload")
-        else:
-            configdir = join(self.homedir, "pyload")
-
-        #chdir(configdir)
-        self.configdir = configdir
-
-        try:
-            makedirs(self.configdir)
-        except:
-            pass
+        self.configdir = ""
 
         self.init(True)
 
@@ -108,7 +103,7 @@ def init(self, first=False):
             parser = XMLParser(join(self.path, "module", "config", "gui_default.xml"))
             lang = parser.xml.elementsByTagName("language").item(0).toElement().text()
 
-        translation = gettext.translation("pyLoadGui", join(self.path, "locale"), languages=[str(lang)])
+        translation = gettext.translation("pyLoadGui", join(pypath, "locale"), languages=[str(lang)])
         try:
             translation.install(unicode=(True if sys.stdout.encoding.lower().startswith("utf") else False))
         except:

core/module/FileDatabase.py → module/FileDatabase.py

@@ -854,7 +854,7 @@ def __init__(self, manager, id, url, name, size, status, error, pluginname, pack
 
     def __repr__(self):
         return "PyFile %s: %s@%s" % (self.id, self.name, self.pluginname)
-        
+
     def initPlugin(self):
         """ inits plugin instance """
         self.pluginmodule = self.m.core.pluginManager.getPlugin(self.pluginname)