summaryrefslogtreecommitdiffstats
path: root/pyload/plugin/crypter
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/plugin/crypter')
-rw-r--r--pyload/plugin/crypter/CrockoCom.py3
-rw-r--r--pyload/plugin/crypter/CzshareCom.py2
-rw-r--r--pyload/plugin/crypter/DepositfilesCom.py3
-rw-r--r--pyload/plugin/crypter/EmbeduploadCom.py2
-rw-r--r--pyload/plugin/crypter/FileserveCom.py2
-rw-r--r--pyload/plugin/crypter/FourChanOrg.py2
-rw-r--r--pyload/plugin/crypter/FreakhareCom.py2
-rw-r--r--pyload/plugin/crypter/FshareVn.py3
-rw-r--r--pyload/plugin/crypter/LetitbitNet.py2
-rw-r--r--pyload/plugin/crypter/LinkCryptWs.py6
-rw-r--r--pyload/plugin/crypter/LinkdecrypterCom.py1
-rw-r--r--pyload/plugin/crypter/MegaRapidCz.py3
-rw-r--r--pyload/plugin/crypter/MultiloadCz.py4
-rw-r--r--pyload/plugin/crypter/NCryptIn.py6
-rw-r--r--pyload/plugin/crypter/PastebinCom.py3
-rw-r--r--pyload/plugin/crypter/QuickshareCz.py2
-rw-r--r--pyload/plugin/crypter/RelinkUs.py6
-rw-r--r--pyload/plugin/crypter/ShareLinksBiz.py2
-rw-r--r--pyload/plugin/crypter/UlozTo.py4
19 files changed, 32 insertions, 26 deletions
diff --git a/pyload/plugin/crypter/CrockoCom.py b/pyload/plugin/crypter/CrockoCom.py
index f1472a004..bb93edca9 100644
--- a/pyload/plugin/crypter/CrockoCom.py
+++ b/pyload/plugin/crypter/CrockoCom.py
@@ -18,4 +18,5 @@ class CrockoCom(SimpleCrypter):
__authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
- LINK_PATTERN = r'<td class="last"><a href="([^"]+)">download</a>'
+ LINK_PATTERN = r'<td class="last"><a href="(.+?)">download</a>'
+
diff --git a/pyload/plugin/crypter/CzshareCom.py b/pyload/plugin/crypter/CzshareCom.py
index 230a038c5..60e53ec39 100644
--- a/pyload/plugin/crypter/CzshareCom.py
+++ b/pyload/plugin/crypter/CzshareCom.py
@@ -19,7 +19,7 @@ class CzshareCom(Crypter):
FOLDER_PATTERN = r'<tr class="subdirectory">\s*<td>\s*<table>(.*?)</table>'
- LINK_PATTERN = r'<td class="col2"><a href="([^"]+)">info</a></td>'
+ LINK_PATTERN = r'<td class="col2"><a href="(.+?)">info</a></td>'
def decrypt(self, pyfile):
diff --git a/pyload/plugin/crypter/DepositfilesCom.py b/pyload/plugin/crypter/DepositfilesCom.py
index a66136ab3..e47f9dd18 100644
--- a/pyload/plugin/crypter/DepositfilesCom.py
+++ b/pyload/plugin/crypter/DepositfilesCom.py
@@ -18,4 +18,5 @@ class DepositfilesCom(SimpleCrypter):
__authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
- LINK_PATTERN = r'<div class="progressName"[^>]*>\s*<a href="([^"]+)" title="[^"]*" target="_blank">'
+ LINK_PATTERN = r'<div class="progressName".*?>\s*<a href="(.+?)" title=".+?" target="_blank">'
+
diff --git a/pyload/plugin/crypter/EmbeduploadCom.py b/pyload/plugin/crypter/EmbeduploadCom.py
index 06d71e21b..357126508 100644
--- a/pyload/plugin/crypter/EmbeduploadCom.py
+++ b/pyload/plugin/crypter/EmbeduploadCom.py
@@ -21,7 +21,7 @@ class EmbeduploadCom(Crypter):
__authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
- LINK_PATTERN = r'<div id="([^"]+)"[^>]*>\s*<a href="([^"]+)" target="_blank" (?:class="DownloadNow"|style="color:red")>'
+ LINK_PATTERN = r'<div id="(.+?)".*?>\s*<a href="(.+?)" target="_blank" (?:class="DownloadNow"|style="color:red")>'
def decrypt(self, pyfile):
diff --git a/pyload/plugin/crypter/FileserveCom.py b/pyload/plugin/crypter/FileserveCom.py
index f68f8e98c..4b742d5f3 100644
--- a/pyload/plugin/crypter/FileserveCom.py
+++ b/pyload/plugin/crypter/FileserveCom.py
@@ -20,7 +20,7 @@ class FileserveCom(Crypter):
FOLDER_PATTERN = r'<table class="file_list">(.*?)</table>'
- LINK_PATTERN = r'<a href="([^"]+)" class="sheet_icon wbold">'
+ LINK_PATTERN = r'<a href="(.+?)" class="sheet_icon wbold">'
def decrypt(self, pyfile):
diff --git a/pyload/plugin/crypter/FourChanOrg.py b/pyload/plugin/crypter/FourChanOrg.py
index 68d1e4a31..bf80e3ca1 100644
--- a/pyload/plugin/crypter/FourChanOrg.py
+++ b/pyload/plugin/crypter/FourChanOrg.py
@@ -23,5 +23,5 @@ class FourChanOrg(Crypter):
def decrypt(self, pyfile):
pagehtml = self.load(pyfile.url)
- images = set(re.findall(r'(images\.4chan\.org/[^/]*/src/[^"<]*)', pagehtml))
+ images = set(re.findall(r'(images\.4chan\.org/[^/]*/src/[^"<]+)', pagehtml))
self.urls = ["http://" + image for image in images]
diff --git a/pyload/plugin/crypter/FreakhareCom.py b/pyload/plugin/crypter/FreakhareCom.py
index 700c85f07..c061a44d4 100644
--- a/pyload/plugin/crypter/FreakhareCom.py
+++ b/pyload/plugin/crypter/FreakhareCom.py
@@ -20,7 +20,7 @@ class FreakhareCom(SimpleCrypter):
__authors__ = [("stickell", "l.stickell@yahoo.it")]
- LINK_PATTERN = r'<a href="(http://freakshare\.com/files/[^"]+)" target="_blank">'
+ LINK_PATTERN = r'<a href="(http://freakshare\.com/files/.+?)" target="_blank">'
NAME_PATTERN = r'Folder:</b> (?P<N>.+)'
PAGES_PATTERN = r'Pages: +(\d+)'
diff --git a/pyload/plugin/crypter/FshareVn.py b/pyload/plugin/crypter/FshareVn.py
index 31523d78f..45a174f25 100644
--- a/pyload/plugin/crypter/FshareVn.py
+++ b/pyload/plugin/crypter/FshareVn.py
@@ -18,4 +18,5 @@ class FshareVn(SimpleCrypter):
__authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
- LINK_PATTERN = r'<li class="w_80pc"><a href="([^"]+)" target="_blank">'
+ LINK_PATTERN = r'<li class="w_80pc"><a href="(.+?)" target="_blank">'
+
diff --git a/pyload/plugin/crypter/LetitbitNet.py b/pyload/plugin/crypter/LetitbitNet.py
index 5d19cca8e..587c75c80 100644
--- a/pyload/plugin/crypter/LetitbitNet.py
+++ b/pyload/plugin/crypter/LetitbitNet.py
@@ -20,7 +20,7 @@ class LetitbitNet(Crypter):
FOLDER_PATTERN = r'<table>(.*)</table>'
- LINK_PATTERN = r'<a href="([^"]+)" target="_blank">'
+ LINK_PATTERN = r'<a href="(.+?)" target="_blank">'
def decrypt(self, pyfile):
diff --git a/pyload/plugin/crypter/LinkCryptWs.py b/pyload/plugin/crypter/LinkCryptWs.py
index a3eb4f179..a900248ef 100644
--- a/pyload/plugin/crypter/LinkCryptWs.py
+++ b/pyload/plugin/crypter/LinkCryptWs.py
@@ -131,7 +131,7 @@ class LinkCryptWs(Crypter):
def unlockCaptchaProtection(self):
- captcha_url = re.search(r'<form.*?id\s*?=\s*?"captcha"[^>]*?>.*?<\s*?input.*?src="([^"]*?)"', self.html, re.I | re.S).group(1)
+ captcha_url = re.search(r'<form.*?id\s*?=\s*?"captcha"[^>]*?>.*?<\s*?input.*?src="(.+?)"', self.html, re.I | re.S).group(1)
captcha_code = self.decryptCaptcha(captcha_url, forceUser=True, imgtype="gif", result_type='positional')
self.html = self.load(self.pyfile.url, post={"x": captcha_code[0], "y": captcha_code[1]})
@@ -190,7 +190,7 @@ class LinkCryptWs(Crypter):
self.logDebug("Search for Web links ")
package_links = []
- pattern = r'<form action="http://linkcrypt.ws/out.html"[^>]*?>.*?<input[^>]*?value="([^"]*?)"[^>]*?name="file"'
+ pattern = r'<form action="http://linkcrypt.ws/out.html"[^>]*?>.*?<input[^>]*?value="(.+?)"[^>]*?name="file"'
ids = re.findall(pattern, self.html, re.I | re.S)
self.logDebug("Decrypting %d Web links" % len(ids))
@@ -244,7 +244,7 @@ class LinkCryptWs(Crypter):
for line in self.container_html:
if type in line:
jseval = self.handle_javascript(line)
- clink = re.search(r'href=["\']([^"\']*?)["\']',jseval,re.I)
+ clink = re.search(r'href=["\'](["\']+)', jseval, re.I)
if not clink:
continue
diff --git a/pyload/plugin/crypter/LinkdecrypterCom.py b/pyload/plugin/crypter/LinkdecrypterCom.py
index 09863989f..1ba2dc377 100644
--- a/pyload/plugin/crypter/LinkdecrypterCom.py
+++ b/pyload/plugin/crypter/LinkdecrypterCom.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import re
+
from pyload.plugin.Crypter import Crypter
diff --git a/pyload/plugin/crypter/MegaRapidCz.py b/pyload/plugin/crypter/MegaRapidCz.py
index 5a14b6f85..1ff859ce5 100644
--- a/pyload/plugin/crypter/MegaRapidCz.py
+++ b/pyload/plugin/crypter/MegaRapidCz.py
@@ -18,4 +18,5 @@ class MegaRapidCz(SimpleCrypter):
__authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
- LINK_PATTERN = r'<td class="soubor"[^>]*><a href="([^"]+)">'
+ LINK_PATTERN = r'<td class="soubor".*?><a href="(.+?)">'
+
diff --git a/pyload/plugin/crypter/MultiloadCz.py b/pyload/plugin/crypter/MultiloadCz.py
index 0bcf94016..de29aea0f 100644
--- a/pyload/plugin/crypter/MultiloadCz.py
+++ b/pyload/plugin/crypter/MultiloadCz.py
@@ -20,8 +20,8 @@ class MultiloadCz(Crypter):
__authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
- FOLDER_PATTERN = r'<form action="" method="get"><textarea[^>]*>([^>]*)</textarea></form>'
- LINK_PATTERN = r'<p class="manager-server"><strong>([^<]+)</strong></p><p class="manager-linky"><a href="([^"]+)">'
+ FOLDER_PATTERN = r'<form action="" method="get"><textarea.*?>([^>]*)</textarea></form>'
+ LINK_PATTERN = r'<p class="manager-server"><strong>([^<]+)</strong></p><p class="manager-linky"><a href="(.+?)">'
def decrypt(self, pyfile):
diff --git a/pyload/plugin/crypter/NCryptIn.py b/pyload/plugin/crypter/NCryptIn.py
index 557a782e8..64ea8727f 100644
--- a/pyload/plugin/crypter/NCryptIn.py
+++ b/pyload/plugin/crypter/NCryptIn.py
@@ -27,7 +27,7 @@ class NCryptIn(Crypter):
JK_KEY = "jk"
CRYPTED_KEY = "crypted"
- NAME_PATTERN = r'<meta name="description" content="(?P<N>[^"]+)"'
+ NAME_PATTERN = r'<meta name="description" content="(?P<N>.+?)"'
def setup(self):
@@ -108,7 +108,7 @@ class NCryptIn(Crypter):
def isProtected(self):
form = re.search(r'<form.*?name.*?protected.*?>(.*?)</form>', self.cleanedHtml, re.S)
- if form is not None:
+ if form:
content = form.group(1)
for keyword in ("password", "captcha"):
if keyword in content:
@@ -144,7 +144,7 @@ class NCryptIn(Crypter):
# Resolve anicaptcha
if "anicaptcha" in form:
self.logDebug("Captcha protected")
- captchaUri = re.search(r'src="(/temp/anicaptcha/[^"]+)', form).group(1)
+ captchaUri = re.search(r'src="(/temp/anicaptcha/.+?)"', form).group(1)
captcha = self.decryptCaptcha("http://ncrypt.in" + captchaUri)
self.logDebug("Captcha resolved [%s]" % captcha)
postData['captcha'] = captcha
diff --git a/pyload/plugin/crypter/PastebinCom.py b/pyload/plugin/crypter/PastebinCom.py
index d0e34abaf..d0c779aaa 100644
--- a/pyload/plugin/crypter/PastebinCom.py
+++ b/pyload/plugin/crypter/PastebinCom.py
@@ -19,4 +19,5 @@ class PastebinCom(SimpleCrypter):
LINK_PATTERN = r'<div class="de\d+">(https?://[^ <]+)(?:[^<]*)</div>'
- NAME_PATTERN = r'<div class="paste_box_line1" title="(?P<N>[^"]+)">'
+ NAME_PATTERN = r'<div class="paste_box_line1" title="(?P<N>.+?)">'
+
diff --git a/pyload/plugin/crypter/QuickshareCz.py b/pyload/plugin/crypter/QuickshareCz.py
index 8635c797d..18350cba3 100644
--- a/pyload/plugin/crypter/QuickshareCz.py
+++ b/pyload/plugin/crypter/QuickshareCz.py
@@ -18,7 +18,7 @@ class QuickshareCz(Crypter):
__authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
- FOLDER_PATTERN = r'<textarea[^>]*>(.*?)</textarea>'
+ FOLDER_PATTERN = r'<textarea.*?>(.*?)</textarea>'
LINK_PATTERN = r'(http://www\.quickshare\.cz/\S+)'
diff --git a/pyload/plugin/crypter/RelinkUs.py b/pyload/plugin/crypter/RelinkUs.py
index 448854325..d27750d1e 100644
--- a/pyload/plugin/crypter/RelinkUs.py
+++ b/pyload/plugin/crypter/RelinkUs.py
@@ -153,7 +153,7 @@ class RelinkUs(Crypter):
# Try to get info from web
m = re.search(self.FILE_TITLE_REGEX, self.html)
- if m is not None:
+ if m:
title = m.group(1).strip()
if not self.FILE_NOTITLE in title:
name = folder = title
@@ -198,7 +198,7 @@ class RelinkUs(Crypter):
self.logDebug("Search for CNL2 links")
package_links = []
m = re.search(self.CNL2_FORM_REGEX, self.html, re.S)
- if m is not None:
+ if m:
cnl2_form = m.group(1)
try:
(vcrypted, vjk) = self._getCipherParams(cnl2_form)
@@ -213,7 +213,7 @@ class RelinkUs(Crypter):
self.logDebug("Search for DLC links")
package_links = []
m = re.search(self.DLC_LINK_REGEX, self.html)
- if m is not None:
+ if m:
container_url = self.DLC_DOWNLOAD_URL + "?id=%s&dlc=1" % self.fileid
self.logDebug("Downloading DLC container link [%s]" % container_url)
try:
diff --git a/pyload/plugin/crypter/ShareLinksBiz.py b/pyload/plugin/crypter/ShareLinksBiz.py
index 5cc796475..9cae0017a 100644
--- a/pyload/plugin/crypter/ShareLinksBiz.py
+++ b/pyload/plugin/crypter/ShareLinksBiz.py
@@ -164,7 +164,7 @@ class ShareLinksBiz(Crypter):
# Extract from web package header
title_re = r'<h2><img.*?/>(.*)</h2>'
m = re.search(title_re, self.html, re.S)
- if m is not None:
+ if m:
title = m.group(1).strip()
if 'unnamed' not in title:
name = folder = title
diff --git a/pyload/plugin/crypter/UlozTo.py b/pyload/plugin/crypter/UlozTo.py
index 5909958bd..a33742c54 100644
--- a/pyload/plugin/crypter/UlozTo.py
+++ b/pyload/plugin/crypter/UlozTo.py
@@ -19,8 +19,8 @@ class UlozTo(Crypter):
FOLDER_PATTERN = r'<ul class="profile_files">(.*?)</ul>'
- LINK_PATTERN = r'<br /><a href="/([^"]+)">[^<]+</a>'
- NEXT_PAGE_PATTERN = r'<a class="next " href="/([^"]+)">&nbsp;</a>'
+ LINK_PATTERN = r'<br /><a href="/(.+?)">.+?</a>'
+ NEXT_PAGE_PATTERN = r'<a class="next " href="/(.+?)">&nbsp;</a>'
def decrypt(self, pyfile):
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-29 06:47:42 +0100