diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2014-01-18 20:52:00 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2014-01-18 20:52:00 +0100 |
| commit | 4207037e470c6bd0b3011954b8ccd34a5b32a49d (patch) | |
| tree | 96dba4e746f286f2cd02bda8a8f677a9bc214b93 | |
| parent | additional fix #4 (diff) | |
| download | pyload-4207037e470c6bd0b3011954b8ccd34a5b32a49d.tar.xz | |
additional fix #6
| -rw-r--r-- | pyload/DownloadManager.py | 2 | ||||
| -rw-r--r-- | pyload/threads/DecrypterThread.py | 6 | ||||
| -rw-r--r-- | pyload/threads/InfoThread.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pyload/DownloadManager.py b/pyload/DownloadManager.py index 452be93e1..e5354d84c 100644 --- a/pyload/DownloadManager.py +++ b/pyload/DownloadManager.py @@ -98,7 +98,7 @@ class DownloadManager: @lock def startDecrypterThread(self, info): """ Start decrypting of entered data, all links in one package are accumulated to one thread.""" - self.decrypter.append(DecrypterThread(self, [(info.download.plugin, info.download.url)], + self.decrypter.append(DecrypterThread(self, [(info.download.url, info.download.plugin)], info.fid, info.package, info.owner)) @read_lock diff --git a/pyload/threads/DecrypterThread.py b/pyload/threads/DecrypterThread.py index 1003b36dc..b90e67665 100644 --- a/pyload/threads/DecrypterThread.py +++ b/pyload/threads/DecrypterThread.py @@ -16,7 +16,7 @@ class DecrypterThread(BaseThread): def __init__(self, manager, data, fid, pid, owner): BaseThread.__init__(self, manager, owner) - # [... (plugin, url) ...] + # [... (url, plugin) ...] self.data = data self.fid = fid self.pid = pid @@ -44,7 +44,7 @@ class DecrypterThread(BaseThread): for p in packages: self.m.core.api.addPackage(p.name, p.getURLs(), pack.password) - self.m.core.files.setDownloadStatus(self.fid, "finished" if not self.error else "failed") + self.m.core.files.setDownloadStatus(self.fid, DS.Finished if not self.error else DS.Failed) self.m.done(self) def decrypt(self, plugin_map, password=None, err=False): @@ -68,7 +68,7 @@ class DecrypterThread(BaseThread): self.error = True if err: plugin_result.extend(LinkStatus(url, url, -1, DS.NotPossible, name) for url in urls) - self.log.debug("Plugin '%s' for decrypting was not loaded" % plugin) + self.log.debug("Plugin '%s' for decrypting was not loaded" % name) else: try: plugin = klass(self.m.core, password) diff --git a/pyload/threads/InfoThread.py b/pyload/threads/InfoThread.py index a91ca679e..272fe9816 100644 --- a/pyload/threads/InfoThread.py +++ b/pyload/threads/InfoThread.py @@ -15,7 +15,7 @@ class InfoThread(DecrypterThread): def __init__(self, manager, owner, data, pid=-1, oc=None): BaseThread.__init__(self, manager, owner) - # [... (plugin, url) ...] + # [... (url, plugin) ...] self.data = data self.pid = pid self.oc = oc # online check |