summaryrefslogtreecommitdiffstats
path: root/module/plugins/crypter
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/crypter')
-rw-r--r--module/plugins/crypter/DataHuFolder.py2
-rw-r--r--module/plugins/crypter/EmbeduploadCom.py2
-rw-r--r--module/plugins/crypter/FilecryptCc.py9
-rw-r--r--module/plugins/crypter/FreakhareComFolder.py2
-rw-r--r--module/plugins/crypter/LinkdecrypterCom.py8
-rw-r--r--module/plugins/crypter/LixIn.py6
-rw-r--r--module/plugins/crypter/MegaCoNzFolder.py3
-rw-r--r--module/plugins/crypter/MultiloadCz.py2
-rw-r--r--module/plugins/crypter/NCryptIn.py4
-rw-r--r--module/plugins/crypter/NitroflareComFolder.py3
-rw-r--r--module/plugins/crypter/RelinkUs.py8
-rw-r--r--module/plugins/crypter/SexuriaCom.py2
-rw-r--r--module/plugins/crypter/ShareLinksBiz.py6
-rw-r--r--module/plugins/crypter/TnyCz.py2
-rw-r--r--module/plugins/crypter/TurbobitNetFolder.py2
-rw-r--r--module/plugins/crypter/TusfilesNetFolder.py2
16 files changed, 28 insertions, 35 deletions
diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py
index c0fe26869..fcbc5b2af 100644
--- a/module/plugins/crypter/DataHuFolder.py
+++ b/module/plugins/crypter/DataHuFolder.py
@@ -35,7 +35,7 @@ class DataHuFolder(SimpleCrypter):
self.logDebug("The folder is password protected', 'Using password: " + password)
- self.html = self.load(self.pyfile.url, post={'mappa_pass': password}, decode=True)
+ self.html = self.load(self.pyfile.url, post={'mappa_pass': password})
if u'Hib\xe1s jelsz\xf3' in self.html: # Wrong password
self.fail(_("Wrong password"))
diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py
index 221e365fa..3a830331f 100644
--- a/module/plugins/crypter/EmbeduploadCom.py
+++ b/module/plugins/crypter/EmbeduploadCom.py
@@ -25,7 +25,7 @@ class EmbeduploadCom(Crypter):
def decrypt(self, pyfile):
- self.html = self.load(pyfile.url, decode=True)
+ self.html = self.load(pyfile.url)
tmp_links = []
m = re.findall(self.LINK_PATTERN, self.html)
diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py
index 2271a7b6d..7ca5659fb 100644
--- a/module/plugins/crypter/FilecryptCc.py
+++ b/module/plugins/crypter/FilecryptCc.py
@@ -96,8 +96,7 @@ class FilecryptCc(Crypter):
imgtype="gif")
self.siteWithLinks = self.load(self.pyfile.url,
- post={'recaptcha_response_field': captcha_code},
- decode=True)
+ post={'recaptcha_response_field': captcha_code})
elif m2: #: circle captcha
self.logDebug("Captcha-URL: %s" % m2.group(1))
@@ -105,8 +104,7 @@ class FilecryptCc(Crypter):
result_type='positional')
self.siteWithLinks = self.load(self.pyfile.url,
- post={'button.x': captcha_code[0], 'button.y': captcha_code[1]},
- decode=True)
+ post={'button.x': captcha_code[0], 'button.y': captcha_code[1]})
else:
recaptcha = ReCaptcha(self)
@@ -115,8 +113,7 @@ class FilecryptCc(Crypter):
if captcha_key:
response, challenge = recaptcha.challenge(captcha_key)
self.siteWithLinks = self.load(self.pyfile.url,
- post={'g-recaptcha-response': response},
- decode=True)
+ post={'g-recaptcha-response': response})
else:
self.logInfo(_("No captcha found"))
self.siteWithLinks = self.html
diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py
index 173660668..59fa9cf32 100644
--- a/module/plugins/crypter/FreakhareComFolder.py
+++ b/module/plugins/crypter/FreakhareComFolder.py
@@ -36,7 +36,7 @@ class FreakhareComFolder(SimpleCrypter):
'f_md5': self.f_md5,
'entrys': '20',
'page': page_n - 1,
- 'order': ''}, decode=True)
+ 'order': ''})
getInfo = create_getInfo(FreakhareComFolder)
diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py
index e12bf3359..c8de44157 100644
--- a/module/plugins/crypter/LinkdecrypterCom.py
+++ b/module/plugins/crypter/LinkdecrypterCom.py
@@ -35,7 +35,7 @@ class LinkdecrypterCom(Crypter):
retries = 5
post_dict = {"link_cache": "on", "pro_links": pyfile.url, "modo_links": "text"}
- self.html = self.load('http://linkdecrypter.com/', post=post_dict, decode=True)
+ self.html = self.load('http://linkdecrypter.com/', post=post_dict)
while retries:
m = re.search(self.TEXTAREA_PATTERN, self.html, re.S)
@@ -54,16 +54,16 @@ class LinkdecrypterCom(Crypter):
captcha = self.decryptCaptcha(captcha_url, result_type=result_type)
if result_type == "positional":
captcha = "%d|%d" % captcha
- self.html = self.load('http://linkdecrypter.com/', post={"captcha": captcha}, decode=True)
+ self.html = self.load('http://linkdecrypter.com/', post={"captcha": captcha})
retries -= 1
elif self.PASSWORD_PATTERN in self.html:
if self.password:
self.logInfo(_("Password protected link"))
- self.html = self.load('http://linkdecrypter.com/', post={'password': self.password}, decode=True)
+ self.html = self.load('http://linkdecrypter.com/', post={'password': self.password})
else:
self.fail(_("Missing password"))
else:
retries -= 1
- self.html = self.load('http://linkdecrypter.com/', decode=True)
+ self.html = self.load('http://linkdecrypter.com/')
diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py
index a4bd9df1e..2b4c2071c 100644
--- a/module/plugins/crypter/LixIn.py
+++ b/module/plugins/crypter/LixIn.py
@@ -35,7 +35,7 @@ class LixIn(Crypter):
id = m.group('ID')
self.logDebug("File id is %s" % id)
- self.html = self.load(url, decode=True)
+ self.html = self.load(url)
m = re.search(self.SUBMIT_PATTERN, self.html)
if m is None:
@@ -48,12 +48,12 @@ class LixIn(Crypter):
if m:
self.logDebug("Trying captcha")
captcharesult = self.decryptCaptcha(urlparse.urljoin("http://lix.in/", m.group(1)))
- self.html = self.load(url, decode=True,
+ self.html = self.load(url,
post={"capt": captcharesult, "submit": "submit", "tiny": id})
else:
self.logDebug("No captcha/captcha solved")
else:
- self.html = self.load(url, decode=True, post={"submit": "submit", "tiny": id})
+ self.html = self.load(url, post={"submit": "submit", "tiny": id})
m = re.search(self.LINK_PATTERN, self.html)
if m is None:
diff --git a/module/plugins/crypter/MegaCoNzFolder.py b/module/plugins/crypter/MegaCoNzFolder.py
index 517a6b239..a462b7bca 100644
--- a/module/plugins/crypter/MegaCoNzFolder.py
+++ b/module/plugins/crypter/MegaCoNzFolder.py
@@ -27,6 +27,3 @@ class MegaCoNzFolder(Crypter):
url = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern__, pyfile.url).groups()
self.html = self.load("http://rapidgen.org/linkfinder", post={'linklisturl': url})
self.urls = re.findall(r'(https://mega(\.co)?\.nz/#N!.+?)<', self.html)
-
- if not self.urls: #@TODO: Remove in 0.4.10
- self.fail(_("No link grabbed"))
diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py
index 10b5770fa..6b1171a54 100644
--- a/module/plugins/crypter/MultiloadCz.py
+++ b/module/plugins/crypter/MultiloadCz.py
@@ -25,7 +25,7 @@ class MultiloadCz(Crypter):
def decrypt(self, pyfile):
- self.html = self.load(pyfile.url, decode=True)
+ self.html = self.load(pyfile.url)
if re.match(self.__pattern__, pyfile.url).group(1) == "slozka":
m = re.search(self.FOLDER_PATTERN, self.html)
diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py
index e85120f92..f92f47e99 100644
--- a/module/plugins/crypter/NCryptIn.py
+++ b/module/plugins/crypter/NCryptIn.py
@@ -84,7 +84,7 @@ class NCryptIn(Crypter):
def requestFolderHome(self):
- return self.load(self.pyfile.url, decode=True)
+ return self.load(self.pyfile.url)
def removeHtmlCrap(self, content):
@@ -170,7 +170,7 @@ class NCryptIn(Crypter):
# Unlock protection
postData['submit_protected'] = 'Continue to folder'
- return self.load(self.pyfile.url, post=postData, decode=True)
+ return self.load(self.pyfile.url, post=postData)
def handleErrors(self):
diff --git a/module/plugins/crypter/NitroflareComFolder.py b/module/plugins/crypter/NitroflareComFolder.py
index 43572e7f8..1db2378e3 100644
--- a/module/plugins/crypter/NitroflareComFolder.py
+++ b/module/plugins/crypter/NitroflareComFolder.py
@@ -23,8 +23,7 @@ class NitroflareComFolder(SimpleCrypter):
post={'userId' : self.info['pattern']['USER'],
'folder' : self.info['pattern']['ID'],
'page' : 1,
- 'perPage': 10000},
- decode=True))
+ 'perPage': 10000}))
if res['name']:
self.pyfile.name = res['name']
else:
diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py
index 316d44b4c..6e7c80561 100644
--- a/module/plugins/crypter/RelinkUs.py
+++ b/module/plugins/crypter/RelinkUs.py
@@ -104,7 +104,7 @@ class RelinkUs(Crypter):
def requestPackage(self):
- self.html = self.load(self.pyfile.url, decode=True)
+ self.html = self.load(self.pyfile.url)
def isOnline(self):
@@ -135,7 +135,7 @@ class RelinkUs(Crypter):
if password:
passwd_url = self.PASSWORD_SUBMIT_URL + "?id=%s" % self.fileid
passwd_data = {'id': self.fileid, 'password': password, 'pw': 'submit'}
- self.html = self.load(passwd_url, post=passwd_data, decode=True)
+ self.html = self.load(passwd_url, post=passwd_data)
def unlockCaptchaProtection(self):
@@ -145,7 +145,7 @@ class RelinkUs(Crypter):
self.logDebug("Captcha resolved, coords [%s]" % str(coords))
captcha_post_url = self.CAPTCHA_SUBMIT_URL + "?id=%s" % self.fileid
captcha_post_data = {'button.x': coords[0], 'button.y': coords[1], 'captcha': 'submit'}
- self.html = self.load(captcha_post_url, post=captcha_post_data, decode=True)
+ self.html = self.load(captcha_post_url, post=captcha_post_data)
def getPackageInfo(self):
@@ -244,7 +244,7 @@ class RelinkUs(Crypter):
self.logDebug("Decrypting Web link %d, %s" % (index + 1, url))
- res = self.load(url, decode=True)
+ res = self.load(url)
link = re.search(self.WEB_LINK_REGEX, res).group(1)
package_links.append(link)
diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py
index b2101e92a..4ee4eb0b3 100644
--- a/module/plugins/crypter/SexuriaCom.py
+++ b/module/plugins/crypter/SexuriaCom.py
@@ -60,7 +60,7 @@ class SexuriaCom(Crypter):
elif re.match(self.PATTERN_SUPPORTED_CRYPT, url, re.I):
# Extract info from main file
id = re.search(self.PATTERN_SUPPORTED_CRYPT, url, re.I).group('ID')
- html = self.load("http://sexuria.com/v1/Pornos_Kostenlos_info_%s.html" % id, decode=True)
+ html = self.load("http://sexuria.com/v1/Pornos_Kostenlos_info_%s.html" % id)
title = re.search(self.PATTERN_TITLE, html, re.I).group('TITLE').strip()
if title:
diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index aab898813..2d72b513e 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -34,7 +34,7 @@ class ShareLinksBiz(Crypter):
# Request package
url = self.baseUrl + '/' + self.fileId
- self.html = self.load(url, decode=True)
+ self.html = self.load(url)
# Unblock server (load all images)
self.unblockServer()
@@ -104,7 +104,7 @@ class ShareLinksBiz(Crypter):
self.logDebug("Submitting password [%s] for protected links" % password)
post = {"password": password, 'login': 'Submit form'}
url = self.baseUrl + '/' + self.fileId
- self.html = self.load(url, post=post, decode=True)
+ self.html = self.load(url, post=post)
def unlockCaptchaProtection(self):
@@ -125,7 +125,7 @@ class ShareLinksBiz(Crypter):
self.invalidCaptcha()
self.retry(wait_time=5)
url = self.baseUrl + href
- self.html = self.load(url, decode=True)
+ self.html = self.load(url)
def _getCaptchaMap(self):
diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py
index b04c1b647..56c737969 100644
--- a/module/plugins/crypter/TnyCz.py
+++ b/module/plugins/crypter/TnyCz.py
@@ -25,7 +25,7 @@ class TnyCz(SimpleCrypter):
def getLinks(self):
m = re.search(r'<a id=\'save_paste\' href="(.+save\.php\?hash=.+)">', self.html)
- return re.findall(".+", self.load(m.group(1), decode=True)) if m else None
+ return re.findall(".+", self.load(m.group(1))) if m else None
getInfo = create_getInfo(TnyCz)
diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py
index dcbd6a5d7..2ffcfae13 100644
--- a/module/plugins/crypter/TurbobitNetFolder.py
+++ b/module/plugins/crypter/TurbobitNetFolder.py
@@ -27,7 +27,7 @@ class TurbobitNetFolder(SimpleCrypter):
def _getLinks(self, id, page=1):
gridFile = self.load("http://turbobit.net/downloadfolder/gridFile",
- get={"rootId": id, "rows": 200, "page": page}, decode=True)
+ get={"rootId": id, "rows": 200, "page": page})
grid = json_loads(gridFile)
if grid['rows']:
diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py
index 1cc505b81..b8840132f 100644
--- a/module/plugins/crypter/TusfilesNetFolder.py
+++ b/module/plugins/crypter/TusfilesNetFolder.py
@@ -28,7 +28,7 @@ class TusfilesNetFolder(XFSCrypter):
def loadPage(self, page_n):
- return self.load(urlparse.urljoin(self.pyfile.url, str(page_n)), decode=True)
+ return self.load(urlparse.urljoin(self.pyfile.url, str(page_n)))
def handlePages(self, pyfile):
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 22:35:05 +0100