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 | |
| 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')
| -rw-r--r-- | pyload/plugin/hook/LinkdecrypterCom.py | 12 | ||||
| -rw-r--r-- | pyload/plugin/hook/UnrestrictLi.py | 28 |
2 files changed, 9 insertions, 31 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 diff --git a/pyload/plugin/hook/UnrestrictLi.py b/pyload/plugin/hook/UnrestrictLi.py deleted file mode 100644 index 124a5109a..000000000 --- a/pyload/plugin/hook/UnrestrictLi.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- - -from pyload.utils import json_loads -from pyload.plugin.internal.MultiHook import MultiHook - - -class UnrestrictLi(MultiHook): - __name = "UnrestrictLi" - __type = "hook" - __version = "0.05" - - __config = [("pluginmode" , "all;listed;unlisted", "Use for plugins" , "all"), - ("pluginlist" , "str" , "Plugin list (comma separated)" , "" ), - ("revertfailed" , "bool" , "Revert to standard download if fails", True ), - ("reload" , "bool" , "Reload plugin list" , True ), - ("reloadinterval", "int" , "Reload interval in hours" , 12 ), - ("history" , "bool" , "Delete History" , False)] - - __description = """Unrestrict.li hook plugin""" - __license = "GPLv3" - __authors = [("stickell", "l.stickell@yahoo.it")] - - - def getHosters(self): - json_data = self.getURL("http://unrestrict.li/api/jdownloader/hosts.php", get={'format': "json"}) - json_data = json_loads(json_data) - - return [element['host'] for element in json_data['result']] |