summaryrefslogtreecommitdiffstats
path: root/module/plugins/crypter/DuckCryptInfo.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-10-11 01:04:09 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-10-11 01:04:09 +0200
commitc3b3f3ea5c813edbe3e6941c535c78ad494244ee (patch)
tree6a76a01cdf3d5fe678e02618bdbe7d0c5ce8ca8c /module/plugins/crypter/DuckCryptInfo.py
parentFix https://github.com/pyload/pyload/issues/2002 (diff)
downloadpyload-c3b3f3ea5c813edbe3e6941c535c78ad494244ee.tar.xz
Fix https://github.com/pyload/pyload/issues/1998
Fix https://github.com/pyload/pyload/issues/1999 Fix https://github.com/pyload/pyload/issues/2001
Diffstat (limited to 'module/plugins/crypter/DuckCryptInfo.py')
-rw-r--r--module/plugins/crypter/DuckCryptInfo.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py
index 5bb7208af..eae58d60c 100644
--- a/module/plugins/crypter/DuckCryptInfo.py
+++ b/module/plugins/crypter/DuckCryptInfo.py
@@ -8,13 +8,14 @@ from module.plugins.internal.Crypter import Crypter
class DuckCryptInfo(Crypter):
- __name = "DuckCryptInfo"
+ __name__ = "DuckCryptInfo"
__type__ = "crypter"
__version__ = "0.04"
__status__ = "testing"
__pattern__ = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)'
- __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True),
+ __config__ = [("activated", "bool", "Activated", True),
+ ("use_subfolder" , "bool", "Save package to subfolder" , True),
("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
__description__ = """DuckCrypt.info decrypter plugin"""
@@ -28,7 +29,7 @@ class DuckCryptInfo(Crypter):
def decrypt(self, pyfile):
url = pyfile.url
- m = re.match(self.__pattern, url)
+ m = re.match(self.__pattern__, url)
if m is None:
self.fail(_("Weird error in link"))
if str(m.group(1)) == "link":
@@ -39,7 +40,7 @@ class DuckCryptInfo(Crypter):
def handle_folder(self, m):
html = self.load("http://duckcrypt.info/ajax/auth.php?hash=" + str(m.group(2)))
- m = re.match(self.__pattern, html)
+ m = re.match(self.__pattern__, html)
self.log_debug("Redirectet to " + str(m.group(0)))
html = self.load(str(m.group(0)))
soup = BeautifulSoup.BeautifulSoup(html)