summaryrefslogtreecommitdiffstats
path: root/module/plugins/crypter/SafelinkingNet.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/crypter/SafelinkingNet.py')
-rw-r--r--module/plugins/crypter/SafelinkingNet.py18
1 files changed, 7 insertions, 11 deletions
diff --git a/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py
index 98af1522f..d1c23d14f 100644
--- a/module/plugins/crypter/SafelinkingNet.py
+++ b/module/plugins/crypter/SafelinkingNet.py
@@ -4,22 +4,21 @@ import re
import BeautifulSoup
-from module.plugins.internal.utils import json
-from module.plugins.internal.Crypter import Crypter, create_getInfo
+from module.plugins.internal.misc import json
+from module.plugins.internal.Crypter import Crypter
from module.plugins.captcha.SolveMedia import SolveMedia
class SafelinkingNet(Crypter):
__name__ = "SafelinkingNet"
__type__ = "crypter"
- __version__ = "0.19"
+ __version__ = "0.20"
__status__ = "testing"
__pattern__ = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+'
- __config__ = [("activated" , "bool", "Activated" , True),
- ("use_premium" , "bool", "Use premium account if available" , True),
- ("use_subfolder" , "bool", "Save package to subfolder" , True),
- ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
+ __config__ = [("activated" , "bool" , "Activated" , True ),
+ ("use_premium" , "bool" , "Use premium account if available", True ),
+ ("folder_per_package", "Default;Yes;No", "Create folder for each package" , "Default")]
__description__ = """Safelinking.net decrypter plugin"""
__license__ = "GPLv3"
@@ -52,7 +51,7 @@ class SafelinkingNet(Crypter):
m = re.search(self.SOLVEMEDIA_PATTERN, self.data)
if m is not None:
captchaKey = m.group(1)
- captcha = SolveMedia(self)
+ captcha = SolveMedia(pyfile)
captchaProvider = "Solvemedia"
else:
self.fail(_("Error parsing captcha"))
@@ -83,6 +82,3 @@ class SafelinkingNet(Crypter):
self.links.append("https://safelinking.net/d/" + link['full'])
else:
self.links.append(link['full'])
-
-
-getInfo = create_getInfo(SafelinkingNet)