summaryrefslogtreecommitdiffstats
path: root/module/threads
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-01-08 14:44:59 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-01-08 14:44:59 +0100
commitbac28b7740aae772636d8b90e291d9c17dfd59a7 (patch)
tree08b6bd4f00cf27819f06d24f363d633b852f50a3 /module/threads
parentsome cleanups (diff)
downloadpyload-bac28b7740aae772636d8b90e291d9c17dfd59a7.tar.xz
new MultiHoster hook
Diffstat (limited to 'module/threads')
-rw-r--r--module/threads/DownloadThread.py4
-rw-r--r--module/threads/InfoThread.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/module/threads/DownloadThread.py b/module/threads/DownloadThread.py
index e140703d5..c151831a3 100644
--- a/module/threads/DownloadThread.py
+++ b/module/threads/DownloadThread.py
@@ -156,7 +156,7 @@ class DownloadThread(BaseThread):
self.log.error("pycurl error %s: %s" % (code, msg))
if self.core.debug:
print_exc()
- self.writeDebugReport(pyfile.pluginname, pyfile)
+ self.writeDebugReport(pyfile.plugin.__name__, pyfile)
self.core.hookManager.downloadFailed(pyfile)
@@ -186,7 +186,7 @@ class DownloadThread(BaseThread):
if self.core.debug:
print_exc()
- self.writeDebugReport(pyfile.pluginname, pyfile)
+ self.writeDebugReport(pyfile.plugin.__name__, pyfile)
self.core.hookManager.downloadFailed(pyfile)
self.clean(pyfile)
diff --git a/module/threads/InfoThread.py b/module/threads/InfoThread.py
index 5f21d487c..7db85803a 100644
--- a/module/threads/InfoThread.py
+++ b/module/threads/InfoThread.py
@@ -40,8 +40,8 @@ class InfoThread(BaseThread):
#directly write to database
if self.pid > -1:
for pluginname, urls in plugins.iteritems():
- plugin = self.m.core.pluginManager.getPlugin(pluginname, True)
- klass = getattr(plugin, pluginname)
+ plugin = self.m.core.pluginManager.getPluginModule(pluginname)
+ klass = self.m.core.pluginManager.getPluginClass(pluginname)
if has_method(klass, "getInfo"):
self.fetchForPlugin(pluginname, klass, urls, self.updateDB)
self.m.core.files.save()