diff options
| -rw-r--r-- | module/PluginThread.py | 11 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/module/PluginThread.py b/module/PluginThread.py index 59d2cabc9..051236c3e 100644 --- a/module/PluginThread.py +++ b/module/PluginThread.py @@ -209,7 +209,7 @@ class DownloadThread(PluginThread): if self.m.core.debug: print_exc() - + self.clean(pyfile) continue @@ -244,7 +244,7 @@ class DownloadThread(PluginThread): if self.m.core.debug: print_exc() - + self.m.core.hookManager.downloadFailed(pyfile) self.clean(pyfile) continue @@ -393,7 +393,7 @@ class DecrypterThread(PluginThread): except Abort: self.m.log.info(_("Download aborted: %s") % pyfile.name) pyfile.setStatus("aborted") - + if self.m.core.debug: print_exc() return @@ -630,9 +630,10 @@ class InfoThread(PluginThread): self.m.log.debug("Run Info Fetching for %s" % pluginname) for result in plugin.getInfo(process): #result = [ .. (name, size, status, url) .. ] - if not type(result) == list: result = [result] + if not type(result) == list: + result = [result] - for res in result: + for res in result: #: why don't assign res dict directly? self.m.infoCache[res[3]] = res cb(pluginname, result) diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 1de872261..c5875a8da 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -101,7 +101,7 @@ def parseFileInfo(plugin, url="", html=""): #@TODO: Remove in 0.4.10 def create_getInfo(plugin): - return lambda urls: list(plugin.parseInfo(urls)) + return lambda urls: [info['name'], info['size'], info['status'], info['url'] for info in plugin.parseInfo(urls)] def timestamp(): |