From 3c91c7feee8940dc77ae3e3e266a010b55ddde14 Mon Sep 17 00:00:00 2001 From: spoob Date: Thu, 12 Aug 2010 16:07:53 +0200 Subject: Youtube Playlist Download --- pyLoadCore.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'pyLoadCore.py') diff --git a/pyLoadCore.py b/pyLoadCore.py index 8dc725ca7..db46571d5 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -71,7 +71,6 @@ class Core(object): self.doDebug = False self.arg_links = [] - if len(argv) > 1: try: options, args = getopt(argv[1:], 'vca:hdus:', ["version", "clear", "add=", "help", "debug", "user", "setup", "configdir="]) @@ -156,7 +155,6 @@ class Core(object): s.start() exit() - self.config = ConfigParser() translation = gettext.translation("pyLoad", self.path("locale"), languages=["en", self.config['general']['language']]) -- cgit v1.2.3 From e655d860882fff63160098f063fc3e4c9b8c0ba5 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Thu, 12 Aug 2010 19:42:46 +0200 Subject: web if acc settings --- pyLoadCore.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'pyLoadCore.py') diff --git a/pyLoadCore.py b/pyLoadCore.py index db46571d5..0c28b4a1b 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -611,20 +611,18 @@ class ServerMethods(): return self.core.pullManager.getEvents(uuid) def get_accounts(self): - plugins = self.core.pluginManager.getAccountPlugins() - data = [] + plugins = self.core.accountManager.getAccountPlugins() + data = {} for p in plugins: - data.extend(p.getAllAccounts()) + data[p.__name__] = p.getAllAccounts() return data def update_account(self, plugin, account, password, options=[]): """ create and update account """ - plugins = self.core.pluginManager.getAccountPlugins() - self.core.pluginManager.updateAccount(plugin, account, password, options) + self.core.accountManager.updateAccount(plugin, account, password, options) def remove_account(self, plugin, account): - plugins = self.core.pluginManager.getAccountPlugins() - self.core.pluginManager.removeAccount(plugin, account) + self.core.accountManager.removeAccount(plugin, account) def set_priority(self, id, priority): p = self.core.files.getPackage(id) -- cgit v1.2.3 From 52ac62d408dba48ad36744098003e47208c082c2 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Thu, 12 Aug 2010 21:27:11 +0200 Subject: encoding fix try --- pyLoadCore.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pyLoadCore.py') diff --git a/pyLoadCore.py b/pyLoadCore.py index 0c28b4a1b..cc9480dee 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -64,6 +64,7 @@ import module.remote.SecureXMLRPCServer as Server from module.web.ServerThread import WebServer from module.FileDatabase import PyFile + class Core(object): """ pyLoad Core """ @@ -212,7 +213,7 @@ class Core(object): self.init_server() self.init_webserver() - linkFile = self.config['general']['link_file'] + #linkFile = self.config['general']['link_file'] freeSpace = self.freeSpace() if freeSpace > 5 * 1024: -- cgit v1.2.3