diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-12-07 15:34:19 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-12-07 15:34:19 +0100 |
| commit | d8771b13f1c658ac726ac93195a48ad87169eccd (patch) | |
| tree | a81899c2905d59ff20341ffcad35c949d880a0b4 /pyload/plugins/crypter | |
| parent | Tiny code cosmetics (diff) | |
| parent | [SkipRev] Tiny fixup (diff) | |
| download | pyload-d8771b13f1c658ac726ac93195a48ad87169eccd.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
module/plugins/hoster/NowDownloadEu.py
module/plugins/hoster/NowDownloadSx.py
module/plugins/hoster/NowVideoAt.py
module/plugins/hoster/NowVideoSx.py
pyload/plugins/account/RapidshareCom.py
pyload/plugins/addon/ExtractArchive.py
pyload/plugins/addon/HotFolder.py
pyload/plugins/addon/UpdateManager.py
pyload/plugins/hook/Captcha9kw.py
pyload/plugins/hook/DebridItaliaCom.py
pyload/plugins/hoster/DebridItaliaCom.py
pyload/plugins/hoster/Keep2shareCc.py
pyload/plugins/hoster/NetloadIn.py
pyload/plugins/hoster/NowDownloadEu.py
pyload/plugins/hoster/NowVideoAt.py
pyload/plugins/hoster/RapidshareCom.py
pyload/plugins/hoster/ShareonlineBiz.py
pyload/plugins/internal/MultiHoster.py
pyload/plugins/internal/SimpleHoster.py
Diffstat (limited to 'pyload/plugins/crypter')
| -rw-r--r-- | pyload/plugins/crypter/FilecryptCc.py | 2 | ||||
| -rw-r--r-- | pyload/plugins/crypter/LinkCryptWs.py | 7 | ||||
| -rw-r--r-- | pyload/plugins/crypter/MediafireCom.py | 6 | ||||
| -rw-r--r-- | pyload/plugins/crypter/RelinkUs.py | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/pyload/plugins/crypter/FilecryptCc.py b/pyload/plugins/crypter/FilecryptCc.py index cb00da5e9..160253c06 100644 --- a/pyload/plugins/crypter/FilecryptCc.py +++ b/pyload/plugins/crypter/FilecryptCc.py @@ -121,7 +121,7 @@ class FilecryptCc(Crypter): vjk = re.findall('<input type="hidden" name="jk" value="function f\(\){ return \'(.*)\';}">', self.siteWithLinks) vcrypted = re.findall('<input type="hidden" name="crypted" value="(.*)">', self.siteWithLinks) - for i in range(0, len(vcrypted)): + for i in xrange(len(vcrypted)): self.links.extend(self._getLinks(vcrypted[i], vjk[i])) except Exception, e: diff --git a/pyload/plugins/crypter/LinkCryptWs.py b/pyload/plugins/crypter/LinkCryptWs.py index 144bd7bb2..219d836dd 100644 --- a/pyload/plugins/crypter/LinkCryptWs.py +++ b/pyload/plugins/crypter/LinkCryptWs.py @@ -15,14 +15,15 @@ from pyload.utils import html_unescape class LinkCryptWs(Crypter): __name__ = "LinkCryptWs" __type__ = "crypter" - __version__ = "0.06" + __version__ = "0.07" __pattern__ = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P<ID>\w+)' __description__ = """LinkCrypt.ws decrypter plugin""" __license__ = "GPLv3" __authors__ = [("kagenoshin", "kagenoshin[AT]gmx[DOT]ch"), - ("glukgluk", None)] + ("glukgluk", None), + ("Gummibaer", None)] CRYPTED_KEY = "crypted" @@ -37,7 +38,7 @@ class LinkCryptWs(Crypter): def prepare(self): # Init - self.fileid = re.match(self.__pattern__, pyfile.url).group('ID') + self.fileid = re.match(self.__pattern__, self.pyfile.url).group('ID') self.req.cj.setCookie("linkcrypt.ws", "language", "en") diff --git a/pyload/plugins/crypter/MediafireCom.py b/pyload/plugins/crypter/MediafireCom.py index 392f59c52..28c4fa984 100644 --- a/pyload/plugins/crypter/MediafireCom.py +++ b/pyload/plugins/crypter/MediafireCom.py @@ -42,8 +42,10 @@ class MediafireCom(Crypter): folder_key = m.group(1) self.logDebug("FOLDER KEY: %s" % folder_key) - json_resp = json_loads(self.load( - "http://www.mediafire.com/api/folder/get_info.php?folder_key=%s&response_format=json&version=1" % folder_key)) + json_resp = json_loads(self.load("http://www.mediafire.com/api/folder/get_info.php", + get={'folder_key' : folder_key, + 'response_format': "json", + 'version' : 1})) #self.logInfo(json_resp) if json_resp['response']['result'] == "Success": for link in json_resp['response']['folder_info']['files']: diff --git a/pyload/plugins/crypter/RelinkUs.py b/pyload/plugins/crypter/RelinkUs.py index 419ce4506..c5e312f93 100644 --- a/pyload/plugins/crypter/RelinkUs.py +++ b/pyload/plugins/crypter/RelinkUs.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- +from __future__ import with_statement + import base64 import binascii import re @@ -12,7 +14,7 @@ from pyload.plugins.internal.Crypter import Crypter class RelinkUs(Crypter): __name__ = "RelinkUs" __type__ = "crypter" - __version__ = "3.1" + __version__ = "3.11" __pattern__ = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<id>.+)' __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), |