diff options
Diffstat (limited to 'pyload/plugin/hoster')
| -rw-r--r-- | pyload/plugin/hoster/FilerNet.py | 6 | ||||
| -rw-r--r-- | pyload/plugin/hoster/FreakshareCom.py | 2 | ||||
| -rw-r--r-- | pyload/plugin/hoster/GigapetaCom.py | 2 | ||||
| -rw-r--r-- | pyload/plugin/hoster/MegasharesCom.py | 2 | ||||
| -rw-r--r-- | pyload/plugin/hoster/QuickshareCz.py | 2 | ||||
| -rw-r--r-- | pyload/plugin/hoster/XdadevelopersCom.py | 3 |
6 files changed, 7 insertions, 10 deletions
diff --git a/pyload/plugin/hoster/FilerNet.py b/pyload/plugin/hoster/FilerNet.py index f9b38e8cb..86a5809da 100644 --- a/pyload/plugin/hoster/FilerNet.py +++ b/pyload/plugin/hoster/FilerNet.py @@ -48,13 +48,9 @@ class FilerNet(SimpleHoster): recaptcha = ReCaptcha(self) response, challenge = recaptcha.challenge() - #@NOTE: Work-around for v0.4.9 just_header issue - #@TODO: Check for v0.4.10 - self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 0) self.load(pyfile.url, post={'recaptcha_challenge_field': challenge, 'recaptcha_response_field': response, - 'hash': inputs['hash']}) - self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 1) + 'hash': inputs['hash']}, follow_location=False) if 'location' in self.req.http.header.lower(): self.link = re.search(r'location: (\S+)', self.req.http.header, re.I).group(1) diff --git a/pyload/plugin/hoster/FreakshareCom.py b/pyload/plugin/hoster/FreakshareCom.py index c5315cdc8..64d8f8308 100644 --- a/pyload/plugin/hoster/FreakshareCom.py +++ b/pyload/plugin/hoster/FreakshareCom.py @@ -130,7 +130,7 @@ class FreakshareCom(Hoster): if m: units = float(m.group(1).replace(",", "")) pow = {'KB': 1, 'MB': 2, 'GB': 3}[m.group(2)] - size = int(units * 1024 ** pow) + size = int(units * (2 ** 20) ** pow) return size diff --git a/pyload/plugin/hoster/GigapetaCom.py b/pyload/plugin/hoster/GigapetaCom.py index adbdc2396..c524a0a7c 100644 --- a/pyload/plugin/hoster/GigapetaCom.py +++ b/pyload/plugin/hoster/GigapetaCom.py @@ -43,7 +43,7 @@ class GigapetaCom(SimpleHoster): m = re.search(r'Location\s*:\s*(.+)', self.req.http.header, re.I) if m: - self.link = m.group(1).rstrip() #@TODO: Remove .rstrip() in 0.4.10 + self.link = m.group(1) break elif "Entered figures don`t coincide with the picture" in self.html: self.invalidCaptcha() diff --git a/pyload/plugin/hoster/MegasharesCom.py b/pyload/plugin/hoster/MegasharesCom.py index 184be2fd6..ac7a81313 100644 --- a/pyload/plugin/hoster/MegasharesCom.py +++ b/pyload/plugin/hoster/MegasharesCom.py @@ -89,7 +89,7 @@ class MegasharesCom(SimpleHoster): self.fail(_("Passport not found")) self.logInfo(_("Download passport: %s") % m.group(1)) - data_left = float(m.group(2)) * 1024 ** {'B': 0, 'KB': 1, 'MB': 2, 'GB': 3}[m.group(3)] + data_left = float(m.group(2)) * (2 ** 20) ** {'B': 0, 'KB': 1, 'MB': 2, 'GB': 3}[m.group(3)] self.logInfo(_("Data left: %s %s (%d MB needed)") % (m.group(2), m.group(3), self.pyfile.size / 1048576)) if not data_left: diff --git a/pyload/plugin/hoster/QuickshareCz.py b/pyload/plugin/hoster/QuickshareCz.py index 6d6f21c71..3dd11f04a 100644 --- a/pyload/plugin/hoster/QuickshareCz.py +++ b/pyload/plugin/hoster/QuickshareCz.py @@ -65,7 +65,7 @@ class QuickshareCz(SimpleHoster): if m is None: self.fail(_("File not found")) - self.link = m.group(1).rstrip() #@TODO: Remove .rstrip() in 0.4.10 + self.link = m.group(1) self.logDebug("FREE URL2:" + self.link) # check errors diff --git a/pyload/plugin/hoster/XdadevelopersCom.py b/pyload/plugin/hoster/XdadevelopersCom.py index 488d29c44..0fe9197aa 100644 --- a/pyload/plugin/hoster/XdadevelopersCom.py +++ b/pyload/plugin/hoster/XdadevelopersCom.py @@ -33,4 +33,5 @@ class XdadevelopersCom(SimpleHoster): def handleFree(self, pyfile): - self.link = pyfile.url + "&task=get" #@TODO: Revert to `get={'task': "get"}` in 0.4.10 + self.download(pyfile.url, + get={'task': "get"}) |