diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-30 21:16:41 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-30 21:16:41 +0200 |
| commit | 670d3bffb19c3e1cc4be06a81165e055edeb1692 (patch) | |
| tree | 6d858a37c20582a576a189adc57ded87211bf82e /module/plugins | |
| parent | Merge pull request #1438 from lazlev/patch-1 (diff) | |
| download | pyload-670d3bffb19c3e1cc4be06a81165e055edeb1692.tar.xz | |
[MegaCoNz] Update __pattern__
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/crypter/FurLy.py | 2 | ||||
| -rw-r--r-- | module/plugins/crypter/MegaCoNzFolder.py | 4 | ||||
| -rw-r--r-- | module/plugins/hoster/MegaCoNz.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/module/plugins/crypter/FurLy.py b/module/plugins/crypter/FurLy.py index dd907829b..b8e9332e2 100644 --- a/module/plugins/crypter/FurLy.py +++ b/module/plugins/crypter/FurLy.py @@ -12,7 +12,7 @@ class FurLy(SimpleCrypter): __description__ = """Fur.ly decrypter plugin""" __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com" )] + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] URL_REPLACEMENTS = [(r'fur\.ly/', r'fur\.ly/bar/')] diff --git a/module/plugins/crypter/MegaCoNzFolder.py b/module/plugins/crypter/MegaCoNzFolder.py index bd135ac5f..0c6f224a4 100644 --- a/module/plugins/crypter/MegaCoNzFolder.py +++ b/module/plugins/crypter/MegaCoNzFolder.py @@ -10,7 +10,7 @@ class MegaCoNzFolder(Crypter): __type__ = "crypter" __version__ = "0.04" - __pattern__ = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#F!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)' + __pattern__ = r'(?:https?://(?:www\.)?mega(\.co)?\.nz/|mega:|chrome:.+?)#F!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)' __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] @@ -26,7 +26,7 @@ class MegaCoNzFolder(Crypter): def decrypt(self, pyfile): url = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern__, pyfile.url).groups() self.html = self.load("http://rapidgen.org/linkfinder", post={'linklisturl': url}) - self.urls = re.findall(r'(https://mega.co.nz/#N!.+?)<', self.html) + self.urls = re.findall(r'(https://mega(\.co)?\.nz/#N!.+?)<', self.html) if not self.urls: #@TODO: Remove in 0.4.10 self.fail(_("No link grabbed")) diff --git a/module/plugins/hoster/MegaCoNz.py b/module/plugins/hoster/MegaCoNz.py index aa7755af4..811caed24 100644 --- a/module/plugins/hoster/MegaCoNz.py +++ b/module/plugins/hoster/MegaCoNz.py @@ -48,9 +48,9 @@ from module.utils import decode, fs_decode, fs_encode class MegaCoNz(Hoster): __name__ = "MegaCoNz" __type__ = "hoster" - __version__ = "0.26" + __version__ = "0.27" - __pattern__ = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#(?P<TYPE>N|)!(?P<ID>[\w^_]+)!(?P<KEY>[\w,-]+)' + __pattern__ = r'(?:https?://(?:www\.)?mega(\.co)?\.nz/|mega:|chrome:.+?)#(?P<TYPE>N|)!(?P<ID>[\w^_]+)!(?P<KEY>[\w,-]+)' __description__ = """Mega.co.nz hoster plugin""" __license__ = "GPLv3" |