summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/crypter
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/plugins/crypter')
-rw-r--r--pyload/plugins/crypter/ChipDe.py2
-rw-r--r--pyload/plugins/crypter/CzshareCom.py2
-rw-r--r--pyload/plugins/crypter/DDLMusicOrg.py2
-rw-r--r--pyload/plugins/crypter/Dereferer.py2
-rw-r--r--pyload/plugins/crypter/DontKnowMe.py2
-rw-r--r--pyload/plugins/crypter/FilecryptCc.py8
-rw-r--r--pyload/plugins/crypter/FourChanOrg.py2
-rw-r--r--pyload/plugins/crypter/HoerbuchIn.py2
-rw-r--r--pyload/plugins/crypter/HotfileCom.py2
-rw-r--r--pyload/plugins/crypter/LetitbitNet.py2
-rw-r--r--pyload/plugins/crypter/MultiloadCz.py2
-rw-r--r--pyload/plugins/crypter/NCryptIn.py4
-rw-r--r--pyload/plugins/crypter/OneKhDe.py2
-rw-r--r--pyload/plugins/crypter/QuickshareCz.py2
-rw-r--r--pyload/plugins/crypter/RelinkUs.py25
-rw-r--r--pyload/plugins/crypter/SafelinkingNet.py2
-rw-r--r--pyload/plugins/crypter/SpeedLoadOrg.py2
-rw-r--r--pyload/plugins/crypter/StealthTo.py2
-rw-r--r--pyload/plugins/crypter/UlozTo.py2
-rw-r--r--pyload/plugins/crypter/XupPl.py2
20 files changed, 40 insertions, 31 deletions
diff --git a/pyload/plugins/crypter/ChipDe.py b/pyload/plugins/crypter/ChipDe.py
index d107f34ae..842fff292 100644
--- a/pyload/plugins/crypter/ChipDe.py
+++ b/pyload/plugins/crypter/ChipDe.py
@@ -7,7 +7,7 @@ from pyload.plugins.internal.Crypter import Crypter
class ChipDe(Crypter):
__name__ = "ChipDe"
__type__ = "crypter"
- __version__ = "0.1"
+ __version__ = "0.10"
__pattern__ = r'http://(?:www\.)?chip\.de/video/.*\.html'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
diff --git a/pyload/plugins/crypter/CzshareCom.py b/pyload/plugins/crypter/CzshareCom.py
index b79f540ff..61d943222 100644
--- a/pyload/plugins/crypter/CzshareCom.py
+++ b/pyload/plugins/crypter/CzshareCom.py
@@ -7,7 +7,7 @@ from pyload.plugins.internal.Crypter import Crypter
class CzshareCom(Crypter):
__name__ = "CzshareCom"
__type__ = "crypter"
- __version__ = "0.2"
+ __version__ = "0.20"
__pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.*'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
diff --git a/pyload/plugins/crypter/DDLMusicOrg.py b/pyload/plugins/crypter/DDLMusicOrg.py
index 348c2db51..ec50a3265 100644
--- a/pyload/plugins/crypter/DDLMusicOrg.py
+++ b/pyload/plugins/crypter/DDLMusicOrg.py
@@ -10,7 +10,7 @@ from pyload.plugins.internal.Crypter import Crypter
class DDLMusicOrg(Crypter):
__name__ = "DDLMusicOrg"
__type__ = "crypter"
- __version__ = "0.3"
+ __version__ = "0.30"
__pattern__ = r'http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
diff --git a/pyload/plugins/crypter/Dereferer.py b/pyload/plugins/crypter/Dereferer.py
index 4a647a952..94a3aa1e4 100644
--- a/pyload/plugins/crypter/Dereferer.py
+++ b/pyload/plugins/crypter/Dereferer.py
@@ -10,7 +10,7 @@ from pyload.plugins.internal.Crypter import Crypter
class Dereferer(Crypter):
__name__ = "Dereferer"
__type__ = "crypter"
- __version__ = "0.1"
+ __version__ = "0.10"
__pattern__ = r'https?://([^/]+)/.*?(?P<url>(ht|f)tps?(://|%3A%2F%2F).*)'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
diff --git a/pyload/plugins/crypter/DontKnowMe.py b/pyload/plugins/crypter/DontKnowMe.py
index 0e63233e8..e48f56561 100644
--- a/pyload/plugins/crypter/DontKnowMe.py
+++ b/pyload/plugins/crypter/DontKnowMe.py
@@ -10,7 +10,7 @@ from pyload.plugins.internal.Crypter import Crypter
class DontKnowMe(Crypter):
__name__ = "DontKnowMe"
__type__ = "crypter"
- __version__ = "0.1"
+ __version__ = "0.10"
__pattern__ = r'http://(?:www\.)?dontknow\.me/at/\?.+$'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
diff --git a/pyload/plugins/crypter/FilecryptCc.py b/pyload/plugins/crypter/FilecryptCc.py
index ee8076b17..ee8b3a99f 100644
--- a/pyload/plugins/crypter/FilecryptCc.py
+++ b/pyload/plugins/crypter/FilecryptCc.py
@@ -107,10 +107,10 @@ class FilecryptCc(Crypter):
weblinks = re.findall(self.WEBLINK_PATTERN, self.siteWithLinks)
for link in weblinks:
- response = self.load("http://filecrypt.cc/Link/%s.html" % link, cookies=True)
- link2 = re.search('<iframe noresize src="(.*)"></iframe>', response)
- response2 = self.load(link2.group(1), just_header=True, cookies=True)
- self.links.append(response2['location'])
+ res = self.load("http://filecrypt.cc/Link/%s.html" % link, cookies=True)
+ link2 = re.search('<iframe noresize src="(.*)"></iframe>', res)
+ res2 = self.load(link2.group(1), just_header=True, cookies=True)
+ self.links.append(res2['location'])
except Exception, e:
self.logDebug("Error decrypting weblinks: %s" % e)
diff --git a/pyload/plugins/crypter/FourChanOrg.py b/pyload/plugins/crypter/FourChanOrg.py
index 37d205f73..6ce037f22 100644
--- a/pyload/plugins/crypter/FourChanOrg.py
+++ b/pyload/plugins/crypter/FourChanOrg.py
@@ -10,7 +10,7 @@ from pyload.plugins.internal.Crypter import Crypter
class FourChanOrg(Crypter):
__name__ = "FourChanOrg"
__type__ = "crypter"
- __version__ = "0.3"
+ __version__ = "0.30"
__pattern__ = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
diff --git a/pyload/plugins/crypter/HoerbuchIn.py b/pyload/plugins/crypter/HoerbuchIn.py
index fa409a94c..0bc374e7a 100644
--- a/pyload/plugins/crypter/HoerbuchIn.py
+++ b/pyload/plugins/crypter/HoerbuchIn.py
@@ -10,7 +10,7 @@ from pyload.plugins.internal.Crypter import Crypter
class HoerbuchIn(Crypter):
__name__ = "HoerbuchIn"
__type__ = "crypter"
- __version__ = "0.6"
+ __version__ = "0.60"
__pattern__ = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
diff --git a/pyload/plugins/crypter/HotfileCom.py b/pyload/plugins/crypter/HotfileCom.py
index eee4b745f..f64968e15 100644
--- a/pyload/plugins/crypter/HotfileCom.py
+++ b/pyload/plugins/crypter/HotfileCom.py
@@ -6,7 +6,7 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
class HotfileCom(DeadCrypter):
__name__ = "HotfileCom"
__type__ = "crypter"
- __version__ = "0.3"
+ __version__ = "0.30"
__pattern__ = r'https?://(?:www\.)?hotfile\.com/list/\w+/\w+'
__config__ = []
diff --git a/pyload/plugins/crypter/LetitbitNet.py b/pyload/plugins/crypter/LetitbitNet.py
index 6942aa3ca..5706465bf 100644
--- a/pyload/plugins/crypter/LetitbitNet.py
+++ b/pyload/plugins/crypter/LetitbitNet.py
@@ -7,7 +7,7 @@ from pyload.plugins.internal.Crypter import Crypter
class LetitbitNet(Crypter):
__name__ = "LetitbitNet"
__type__ = "crypter"
- __version__ = "0.1"
+ __version__ = "0.10"
__pattern__ = r'http://(?:www\.)?letitbit\.net/folder/\w+'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
diff --git a/pyload/plugins/crypter/MultiloadCz.py b/pyload/plugins/crypter/MultiloadCz.py
index 02b60876e..75f232929 100644
--- a/pyload/plugins/crypter/MultiloadCz.py
+++ b/pyload/plugins/crypter/MultiloadCz.py
@@ -7,7 +7,7 @@ from pyload.plugins.internal.Crypter import Crypter
class MultiloadCz(Crypter):
__name__ = "MultiloadCz"
__type__ = "crypter"
- __version__ = "0.4"
+ __version__ = "0.40"
__pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.*'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
diff --git a/pyload/plugins/crypter/NCryptIn.py b/pyload/plugins/crypter/NCryptIn.py
index 15cfdaa03..852c75b54 100644
--- a/pyload/plugins/crypter/NCryptIn.py
+++ b/pyload/plugins/crypter/NCryptIn.py
@@ -156,9 +156,9 @@ class NCryptIn(Crypter):
captcha_key = re.search(r'\?k=(.*?)"', form).group(1)
self.logDebug("Resolving ReCaptcha with key [%s]" % captcha_key)
recaptcha = ReCaptcha(self)
- challenge, code = recaptcha.challenge(captcha_key)
+ challenge, response = recaptcha.challenge(captcha_key)
postData['recaptcha_challenge_field'] = challenge
- postData['recaptcha_response_field'] = code
+ postData['recaptcha_response_field'] = response
# Resolve circlecaptcha
if "circlecaptcha" in form:
diff --git a/pyload/plugins/crypter/OneKhDe.py b/pyload/plugins/crypter/OneKhDe.py
index ff15b0baa..14b48549e 100644
--- a/pyload/plugins/crypter/OneKhDe.py
+++ b/pyload/plugins/crypter/OneKhDe.py
@@ -9,7 +9,7 @@ from pyload.plugins.internal.Crypter import Crypter
class OneKhDe(Crypter):
__name__ = "OneKhDe"
__type__ = "crypter"
- __version__ = "0.1"
+ __version__ = "0.10"
__pattern__ = r'http://(?:www\.)?1kh\.de/f/'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
diff --git a/pyload/plugins/crypter/QuickshareCz.py b/pyload/plugins/crypter/QuickshareCz.py
index 156c5feeb..c1064bd20 100644
--- a/pyload/plugins/crypter/QuickshareCz.py
+++ b/pyload/plugins/crypter/QuickshareCz.py
@@ -7,7 +7,7 @@ from pyload.plugins.internal.Crypter import Crypter
class QuickshareCz(Crypter):
__name__ = "QuickshareCz"
__type__ = "crypter"
- __version__ = "0.1"
+ __version__ = "0.10"
__pattern__ = r'http://(?:www\.)?quickshare\.cz/slozka-\d+.*'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
diff --git a/pyload/plugins/crypter/RelinkUs.py b/pyload/plugins/crypter/RelinkUs.py
index c5e312f93..2eb72dd17 100644
--- a/pyload/plugins/crypter/RelinkUs.py
+++ b/pyload/plugins/crypter/RelinkUs.py
@@ -228,20 +228,29 @@ class RelinkUs(Crypter):
def handleWEBLinks(self):
self.logDebug("Search for WEB links")
+
package_links = []
- fw_params = re.findall(self.WEB_FORWARD_REGEX, self.html)
- self.logDebug("Decrypting %d Web links" % len(fw_params))
- for index, fw_param in enumerate(fw_params):
+ params = re.findall(self.WEB_FORWARD_REGEX, self.html)
+
+ self.logDebug("Decrypting %d Web links" % len(params))
+
+ for index, param in enumerate(params):
try:
- fw_url = self.WEB_FORWARD_URL + "?%s" % fw_param
- self.logDebug("Decrypting Web link %d, %s" % (index + 1, fw_url))
- fw_response = self.load(fw_url, decode=True)
- dl_link = re.search(self.WEB_LINK_REGEX, fw_response).group('link')
- package_links.append(dl_link)
+ url = self.WEB_FORWARD_URL + "?%s" % param
+
+ self.logDebug("Decrypting Web link %d, %s" % (index + 1, url))
+
+ res = self.load(url, decode=True)
+ link = re.search(self.WEB_LINK_REGEX, res).group('link')
+
+ package_links.append(link)
+
except Exception, detail:
self.logDebug("Error decrypting Web link %s, %s" % (index, detail))
+
self.setWait(4)
self.wait()
+
return package_links
diff --git a/pyload/plugins/crypter/SafelinkingNet.py b/pyload/plugins/crypter/SafelinkingNet.py
index 681e07cd1..06243d069 100644
--- a/pyload/plugins/crypter/SafelinkingNet.py
+++ b/pyload/plugins/crypter/SafelinkingNet.py
@@ -57,7 +57,7 @@ class SafelinkingNet(Crypter):
challenge, response = captcha.challenge(captchaKey)
postData['adcopy_challenge'] = challenge
- postData['adcopy_response'] = response
+ postData['adcopy_response'] = response
self.html = self.load(url, post=postData)
if "The password you entered was incorrect" in self.html:
diff --git a/pyload/plugins/crypter/SpeedLoadOrg.py b/pyload/plugins/crypter/SpeedLoadOrg.py
index 0228a49d6..5819c78c9 100644
--- a/pyload/plugins/crypter/SpeedLoadOrg.py
+++ b/pyload/plugins/crypter/SpeedLoadOrg.py
@@ -6,7 +6,7 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
class SpeedLoadOrg(DeadCrypter):
__name__ = "SpeedLoadOrg"
__type__ = "crypter"
- __version__ = "0.3"
+ __version__ = "0.30"
__pattern__ = r'http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)'
__config__ = []
diff --git a/pyload/plugins/crypter/StealthTo.py b/pyload/plugins/crypter/StealthTo.py
index 2e64a8cbd..c5236c3e9 100644
--- a/pyload/plugins/crypter/StealthTo.py
+++ b/pyload/plugins/crypter/StealthTo.py
@@ -6,7 +6,7 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
class StealthTo(DeadCrypter):
__name__ = "StealthTo"
__type__ = "crypter"
- __version__ = "0.2"
+ __version__ = "0.20"
__pattern__ = r'http://(?:www\.)?stealth\.to/folder/.+'
__config__ = []
diff --git a/pyload/plugins/crypter/UlozTo.py b/pyload/plugins/crypter/UlozTo.py
index 8538736ca..53380b5da 100644
--- a/pyload/plugins/crypter/UlozTo.py
+++ b/pyload/plugins/crypter/UlozTo.py
@@ -7,7 +7,7 @@ from pyload.plugins.internal.Crypter import Crypter
class UlozTo(Crypter):
__name__ = "UlozTo"
__type__ = "crypter"
- __version__ = "0.2"
+ __version__ = "0.20"
__pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.*'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
diff --git a/pyload/plugins/crypter/XupPl.py b/pyload/plugins/crypter/XupPl.py
index 7be72cf9e..bf285f96c 100644
--- a/pyload/plugins/crypter/XupPl.py
+++ b/pyload/plugins/crypter/XupPl.py
@@ -6,7 +6,7 @@ from pyload.plugins.internal.Crypter import Crypter
class XupPl(Crypter):
__name__ = "XupPl"
__type__ = "crypter"
- __version__ = "0.1"
+ __version__ = "0.10"
__pattern__ = r'https?://(?:[^/]*\.)?xup\.pl/.*'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-01 08:39:35 +0100