summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2014-06-01 16:57:53 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2014-06-01 16:57:53 +0200
commita6097f1fad3a8d8193dab5f4d531246e5103d64c (patch)
tree01082eb04e32dddb8bd7d9f3e0130719d0caacb1
parentfixed click captcha size (diff)
downloadpyload-a6097f1fad3a8d8193dab5f4d531246e5103d64c.tar.xz
small fix for info fetching
-rw-r--r--pyload/threads/InfoThread.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/pyload/threads/InfoThread.py b/pyload/threads/InfoThread.py
index 1ff68fb45..1c95d9aca 100644
--- a/pyload/threads/InfoThread.py
+++ b/pyload/threads/InfoThread.py
@@ -31,6 +31,9 @@ class InfoThread(DecrypterThread):
plugins = accumulate(self.data)
crypter = {}
+ # db or info result
+ cb = self.updateDB if self.pid > 1 else self.updateResult
+
# filter out crypter plugins
for name in self.m.core.pluginManager.getPlugins("crypter"):
if name in plugins:
@@ -41,22 +44,19 @@ class InfoThread(DecrypterThread):
# decrypt them
links, packages = self.decrypt(crypter, err=True)
# push these as initial result and save package names
- self.updateResult(links)
+ cb(links)
for pack in packages:
for url in pack.getURLs():
self.names[url] = pack.name
links.extend(pack.links)
- self.updateResult(pack.links)
+ cb(pack.links)
# TODO: no plugin information pushed to GUI
# parse links and merge
hoster, crypter = self.m.core.pluginManager.parseUrls([l.url for l in links])
accumulate(hoster + crypter, plugins)
- # db or info result
- cb = self.updateDB if self.pid > 1 else self.updateResult
-
self.progress = ProgressInfo("BasePlugin", "", _("online check"), 0, 0, sum(len(urls) for urls in plugins.itervalues()),
self.owner, ProgressType.LinkCheck)
@@ -102,6 +102,7 @@ class InfoThread(DecrypterThread):
# merge in packages that already have a name
data = accumulate(tmp.iteritems(), data)
+ # TODO: self.oc is None ?!
self.m.setInfoResults(self.oc, data)
def fetchForPlugin(self, plugin, urls, cb):