diff options
Diffstat (limited to 'module/plugins/crypter')
| -rw-r--r-- | module/plugins/crypter/CloudzillaToFolder.py | 4 | ||||
| -rw-r--r-- | module/plugins/crypter/EasybytezComFolder.py | 4 | ||||
| -rw-r--r-- | module/plugins/crypter/LetitbitNetFolder.py | 6 | ||||
| -rw-r--r-- | module/plugins/crypter/MediafireComFolder.py | 39 | ||||
| -rw-r--r-- | module/plugins/crypter/TusfilesNetFolder.py | 3 |
5 files changed, 44 insertions, 12 deletions
diff --git a/module/plugins/crypter/CloudzillaToFolder.py b/module/plugins/crypter/CloudzillaToFolder.py index c497dbe01..75ad74791 100644 --- a/module/plugins/crypter/CloudzillaToFolder.py +++ b/module/plugins/crypter/CloudzillaToFolder.py @@ -5,10 +5,10 @@ import re from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo -class CloudzillaToFolder(SimpleHoster): +class CloudzillaToFolder(SimpleCrypter): __name__ = "CloudzillaToFolder" __type__ = "crypter" - __version__ = "0.06" + __version__ = "0.07" __status__ = "testing" __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/folder/(?P<ID>[\w^_]+)' diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 47f7797b2..de9d50f31 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class EasybytezComFolder(XFSCrypter): __name__ = "EasybytezComFolder" __type__ = "crypter" - __version__ = "0.13" + __version__ = "0.14" __status__ = "testing" __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+' @@ -19,6 +19,8 @@ class EasybytezComFolder(XFSCrypter): __authors__ = [("stickell", "l.stickell@yahoo.it")] + PLUGIN_DOMAIN = "easybytez.com" + LOGIN_ACCOUNT = True diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNetFolder.py index 7bd7fac6b..aa0d68ffe 100644 --- a/module/plugins/crypter/LetitbitNetFolder.py +++ b/module/plugins/crypter/LetitbitNetFolder.py @@ -5,10 +5,10 @@ import re from module.plugins.internal.Crypter import Crypter, create_getInfo -class LinkCryptWs(Crypter): +class LetitbitNetFolder(Crypter): __name__ = "LetitbitNet" __type__ = "crypter" - __version__ = "0.13" + __version__ = "0.14" __status__ = "testing" __pattern__ = r'http://(?:www\.)?letitbit\.net/folder/\w+' @@ -36,4 +36,4 @@ class LinkCryptWs(Crypter): self.urls.extend(re.findall(self.LINK_PATTERN, folder.group(0))) -getInfo = create_getInfo(LinkCryptWs) +getInfo = create_getInfo(LetitbitNetFolder) diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py index 2bbaee37d..0a38d38a9 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -3,14 +3,13 @@ import re from module.plugins.internal.Crypter import Crypter, create_getInfo -from module.plugins.hoster.MediafireCom import checkHTMLHeader from module.plugins.internal.utils import json class MediafireComFolder(Crypter): __name__ = "MediafireComFolder" __type__ = "crypter" - __version__ = "0.18" + __version__ = "0.19" __status__ = "testing" __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))' @@ -27,11 +26,39 @@ class MediafireComFolder(Crypter): LINK_PATTERN = r'<meta property="og:url" content="http://www\.mediafire\.com/\?(\w+)"/>' + def _get_url(url): + try: + for _i in xrange(3): + header = self.load(url, just_header=True) + + for line in header.splitlines(): + line = line.lower() + + if 'location' in line: + url = line.split(':', 1)[1].strip() + if 'error.php?errno=320' in url: + return url, 1 + + elif not url.startswith('http://'): + url = 'http://www.mediafire.com' + url + + break + + elif 'content-disposition' in line: + return url, 2 + + except Exception: + return url, 3 + + else: + return url, 0 + + def decrypt(self, pyfile): - url, result = checkHTMLHeader(pyfile.url) + url, result = self._get_url(pyfile.url) self.log_debug("Location (%d): %s" % (result, url)) - if result == 0: + if result is 0: #: Load and parse html html = self.load(pyfile.url) m = re.search(self.LINK_PATTERN, html) @@ -55,8 +82,10 @@ class MediafireComFolder(Crypter): self.urls.append("http://www.mediafire.com/file/%s" % link['quickkey']) else: self.fail(json_resp['response']['message']) - elif result == 1: + + elif result is 1: self.offline() + else: self.urls.append(url) diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py index 703061c76..5bb68b2c4 100644 --- a/module/plugins/crypter/TusfilesNetFolder.py +++ b/module/plugins/crypter/TusfilesNetFolder.py @@ -10,7 +10,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class TusfilesNetFolder(XFSCrypter): __name__ = "TusfilesNetFolder" __type__ = "crypter" - __version__ = "0.11" + __version__ = "0.12" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)' @@ -24,6 +24,7 @@ class TusfilesNetFolder(XFSCrypter): ("stickell", "l.stickell@yahoo.it")] + PLUGIN_DOMAIN = "tusfiles.net" PAGES_PATTERN = r'>\((\d+) \w+\)<' URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.tusfiles.net/go/\g<ID>/')] |