diff options
author | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-05-09 23:35:25 +0200 |
---|---|---|
committer | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-05-09 23:35:25 +0200 |
commit | b673872a9360a8f4a58dc1afd19fe0129d82f848 (patch) | |
tree | 9e6fe563f36666c4f15b09f45813730333e2242b /pyload/plugin/internal/XFSCrypter.py | |
parent | Fix https://github.com/pyload/pyload/issues/1406 (diff) | |
parent | [ClickAndLoad] Version up (diff) | |
download | pyload-b673872a9360a8f4a58dc1afd19fe0129d82f848.tar.xz |
Merge branch 'stable' into 0.4.10
Conflicts:
module/plugins/hoster/BillionuploadsCom.py
pyload/plugin/account/ShareonlineBiz.py
pyload/plugin/account/UnrestrictLi.py
pyload/plugin/addon/ClickNLoad.py
pyload/plugin/hook/LinkdecrypterCom.py
pyload/plugin/hook/UnrestrictLi.py
pyload/plugin/hoster/FilefactoryCom.py
pyload/plugin/hoster/UnrestrictLi.py
pyload/plugin/internal/MultiHook.py
pyload/plugin/internal/XFSCrypter.py
Diffstat (limited to 'pyload/plugin/internal/XFSCrypter.py')
-rw-r--r-- | pyload/plugin/internal/XFSCrypter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pyload/plugin/internal/XFSCrypter.py b/pyload/plugin/internal/XFSCrypter.py index 85b99712a..e8dfa7e39 100644 --- a/pyload/plugin/internal/XFSCrypter.py +++ b/pyload/plugin/internal/XFSCrypter.py @@ -6,7 +6,7 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class XFSCrypter(SimpleCrypter): __name = "XFSCrypter" __type = "crypter" - __version = "0.08" + __version = "0.09" __pattern = r'^unmatchable$' @@ -19,7 +19,7 @@ class XFSCrypter(SimpleCrypter): URL_REPLACEMENTS = [(r'&?per_page=\d+', ""), (r'[?/&]+$', ""), (r'(.+/[^?]+)$', r'\1?'), (r'$', r'&per_page=10000')] - LINK_PATTERN = r'<a href="(.+?)".*?>.+?(?:</a>)?\s*(<.+>\s*)?</(?:td|TD)>' + LINK_PATTERN = r'<(?:td|TD).*?>\s*(?:<.+>\s*)?<a href="(.+?)".*?>.+?(?:</a>)?\s*(?:<.+>\s*)?</(?:td|TD)>' NAME_PATTERN = r'<[Tt]itle>.*?\: (?P<N>.+) folder</[Tt]itle>' OFFLINE_PATTERN = r'>\s*\w+ (Not Found|file (was|has been) removed)' |