summaryrefslogtreecommitdiffstats
path: root/pyload/plugins
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-11-26 21:50:02 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-11-26 21:50:02 +0100
commitd43b66838414e219b7ffecfe917b7d4a8354418e (patch)
treebea2492aa4840be34a53bd26064f4c333d25790e /pyload/plugins
parentinvoke addons via context menu (diff)
downloadpyload-d43b66838414e219b7ffecfe917b7d4a8354418e.tar.xz
extraction via context menu + progress information working
Diffstat (limited to 'pyload/plugins')
-rw-r--r--pyload/plugins/addons/ExtractArchive.py2
-rw-r--r--pyload/plugins/hoster/BasePlugin.py10
2 files changed, 6 insertions, 6 deletions
diff --git a/pyload/plugins/addons/ExtractArchive.py b/pyload/plugins/addons/ExtractArchive.py
index c3c5dbeb7..62c947f88 100644
--- a/pyload/plugins/addons/ExtractArchive.py
+++ b/pyload/plugins/addons/ExtractArchive.py
@@ -210,7 +210,7 @@ class ExtractArchive(Addon):
thread.addActive(pyfile) # keep this file until everything is done
try:
- progress = lambda x: pyfile.setProgress(x)
+ progress = lambda x: thread.setProgress(x)
success = False
if not plugin.checkArchive():
diff --git a/pyload/plugins/hoster/BasePlugin.py b/pyload/plugins/hoster/BasePlugin.py
index 2bdfda7c4..50d1f229b 100644
--- a/pyload/plugins/hoster/BasePlugin.py
+++ b/pyload/plugins/hoster/BasePlugin.py
@@ -4,9 +4,9 @@ from urlparse import urlparse
from re import search
from urllib import unquote
-from module.network.HTTPRequest import BadHeader
-from module.plugins.Hoster import Hoster
-from module.utils import html_unescape, remove_chars
+from pyload.plugins.Request import ResponseException
+from pyload.plugins.Hoster import Hoster
+from pyload.utils import html_unescape, remove_chars
class BasePlugin(Hoster):
@@ -45,7 +45,7 @@ class BasePlugin(Hoster):
try:
self.downloadFile(pyfile)
- except BadHeader, e:
+ except ResponseException, e:
if e.code in (401, 403):
self.logDebug("Auth required")
@@ -79,7 +79,7 @@ class BasePlugin(Hoster):
# self.load does not raise a BadHeader on 404 responses, do it here
if 'code' in header and header['code'] == 404:
- raise BadHeader(404)
+ raise ResponseException(404)
if 'location' in header:
self.logDebug("Location: " + header['location'])