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/hook/LinkdecrypterCom.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/hook/LinkdecrypterCom.py')
-rw-r--r-- | pyload/plugin/hook/LinkdecrypterCom.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pyload/plugin/hook/LinkdecrypterCom.py b/pyload/plugin/hook/LinkdecrypterCom.py index d3f5c0afc..a4a125236 100644 --- a/pyload/plugin/hook/LinkdecrypterCom.py +++ b/pyload/plugin/hook/LinkdecrypterCom.py @@ -8,7 +8,7 @@ from pyload.plugin.internal.MultiHook import MultiHook class LinkdecrypterCom(MultiHook): __name = "LinkdecrypterCom" __type = "hook" - __version = "1.04" + __version = "1.06" __config = [("activated" , "bool" , "Activated" , True ), ("pluginmode" , "all;listed;unlisted", "Use for plugins" , "all"), @@ -21,6 +21,12 @@ class LinkdecrypterCom(MultiHook): __authors = [("Walter Purcaro", "vuolter@gmail.com")] - def getCrypters(self): - return re.search(r'>Supported\(\d+\)</b>: <i>(.[\w.\-, ]+)', + def getHosters(self): + list = re.search(r'>Supported\(\d+\)</b>: <i>(.[\w.\-, ]+)', self.getURL("http://linkdecrypter.com/", decode=True).replace("(g)", "")).group(1).split(', ') + try: + list.remove("download.serienjunkies.org") + except ValueError: + pass + + return list |