summaryrefslogtreecommitdiffstats
path: root/module/plugins/crypter
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/crypter')
-rw-r--r--module/plugins/crypter/DailymotionComFolder.py2
-rw-r--r--module/plugins/crypter/DataHuFolder.py4
-rw-r--r--module/plugins/crypter/Dereferer.py4
-rw-r--r--module/plugins/crypter/DlProtectCom.py2
-rwxr-xr-xmodule/plugins/crypter/Go4UpCom.py4
-rw-r--r--module/plugins/crypter/LinkdecrypterCom.py2
-rw-r--r--module/plugins/crypter/MultiloadCz.py2
-rw-r--r--module/plugins/crypter/RelinkUs.py2
-rw-r--r--module/plugins/crypter/ShSt.py2
-rw-r--r--module/plugins/crypter/ShareLinksBiz.py2
-rw-r--r--module/plugins/crypter/YoutubeComFolder.py2
11 files changed, 12 insertions, 16 deletions
diff --git a/module/plugins/crypter/DailymotionComFolder.py b/module/plugins/crypter/DailymotionComFolder.py
index 04eb4d939..d64c225fe 100644
--- a/module/plugins/crypter/DailymotionComFolder.py
+++ b/module/plugins/crypter/DailymotionComFolder.py
@@ -100,6 +100,6 @@ class DailymotionComFolder(Crypter):
for p_id, p_name, p_owner in playlists:
p_videos = self.get_videos(p_id)
- p_folder = fsjoin(self.pyload.config.get("general", "download_folder"), p_owner, p_name)
+ p_folder = fsjoin(self.pyload.config.get('general', 'download_folder'), p_owner, p_name)
self.log_debug("%s video\s found on playlist \"%s\"" % (len(p_videos), p_name))
self.packages.append((p_name, p_videos, p_folder)) #@NOTE: Folder is NOT recognized by pyload 0.4.9!
diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py
index 270a41b3c..09c49e516 100644
--- a/module/plugins/crypter/DataHuFolder.py
+++ b/module/plugins/crypter/DataHuFolder.py
@@ -27,8 +27,8 @@ class DataHuFolder(SimpleCrypter):
NAME_PATTERN = ur'<title>(?P<N>.+?) Let\xf6lt\xe9se</title>'
- def prepare(self):
- super(DataHuFolder, self).prepare()
+ def _prepare(self):
+ super(DataHuFolder, self)._prepare()
if u'K\xe9rlek add meg a jelsz\xf3t' in self.data: #: Password protected
password = self.get_password()
diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py
index 52898eb62..d539ad08b 100644
--- a/module/plugins/crypter/Dereferer.py
+++ b/module/plugins/crypter/Dereferer.py
@@ -40,9 +40,5 @@ class Dereferer(SimpleCrypter):
self.PLUGIN_NAME = "".join(part.capitalize() for part in re.split(r'\.|\d+|-', self.PLUGIN_DOMAIN) if part != '.')
- def preload(self):
- pass
-
-
def get_links(self):
return [self.info['pattern']['LINK']]
diff --git a/module/plugins/crypter/DlProtectCom.py b/module/plugins/crypter/DlProtectCom.py
index e09dc9e2e..7c44566eb 100644
--- a/module/plugins/crypter/DlProtectCom.py
+++ b/module/plugins/crypter/DlProtectCom.py
@@ -82,7 +82,7 @@ class DlProtectCom(SimpleCrypter):
def get_links(self):
#: Direct link with redirect
- if not re.match(r"https?://(?:www\.)?dl-protect\.com/.+", self.req.http.lastEffectiveURL):
+ if not re.match(r'https?://(?:www\.)?dl-protect\.com/.+', self.req.http.lastEffectiveURL):
return [self.req.http.lastEffectiveURL]
post_req = {'key' : re.search(r'name="key" value="(.+?)"', self.data).group(1),
diff --git a/module/plugins/crypter/Go4UpCom.py b/module/plugins/crypter/Go4UpCom.py
index 143d189af..42dbc58bf 100755
--- a/module/plugins/crypter/Go4UpCom.py
+++ b/module/plugins/crypter/Go4UpCom.py
@@ -34,13 +34,13 @@ class Go4UpCom(SimpleCrypter):
def get_links(self):
links = []
- preference = self.config.get("preferred_hoster")
+ preference = self.config.get('preferred_hoster')
hosterslink_re = re.search(r'(/download/gethosts/.+?)"', self.data)
if hosterslink_re:
hosters = self.load(urlparse.urljoin("http://go4up.com/", hosterslink_re.group(1)))
for hoster in json.loads(hosters):
- if preference != 0 and preference != int(hoster["hostId"]):
+ if preference not in (0, int(hoster["hostId"])):
continue
pagelink_re = re.search(self.LINK_PATTERN, hoster["link"])
if pagelink_re:
diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py
index b3b0048e1..ce9c7e003 100644
--- a/module/plugins/crypter/LinkdecrypterCom.py
+++ b/module/plugins/crypter/LinkdecrypterCom.py
@@ -48,7 +48,7 @@ class LinkdecrypterCom(MultiCrypter):
captcha_url = 'http://linkdecrypter.com/' + m.group(1)
result_type = "positional" if "getPos" in m.group(2) else "textual"
- m = re.search(r"<p><i><b>([^<]+)</b></i></p>", self.data)
+ m = re.search(r'<p><i><b>(.+?)</b></i></p>', self.data)
msg = m.group(1) if m else ""
self.log_info(_("Captcha protected link"), result_type, msg)
diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py
index 657f101d6..594c375f3 100644
--- a/module/plugins/crypter/MultiloadCz.py
+++ b/module/plugins/crypter/MultiloadCz.py
@@ -25,7 +25,7 @@ class MultiloadCz(Crypter):
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="(.+?)">'
+ LINK_PATTERN = r'<p class="manager-server"><strong>(.+?)</strong></p><p class="manager-linky"><a href="(.+?)">'
def decrypt(self, pyfile):
diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py
index 621c80216..9462bdfce 100644
--- a/module/plugins/crypter/RelinkUs.py
+++ b/module/plugins/crypter/RelinkUs.py
@@ -221,7 +221,7 @@ class RelinkUs(Crypter):
try:
dlc = self.load(container_url)
dlc_filename = self.fileid + ".dlc"
- dlc_filepath = fsjoin(self.pyload.config.get("general", "download_folder"), dlc_filename)
+ dlc_filepath = fsjoin(self.pyload.config.get('general', 'download_folder'), dlc_filename)
with open(dlc_filepath, "wb") as f:
f.write(dlc)
pack_links.append(dlc_filepath)
diff --git a/module/plugins/crypter/ShSt.py b/module/plugins/crypter/ShSt.py
index fdb40bd76..ceea0a827 100644
--- a/module/plugins/crypter/ShSt.py
+++ b/module/plugins/crypter/ShSt.py
@@ -28,6 +28,6 @@ class ShSt(Crypter):
#: If we use curl as a user agent, we will get a straight redirect (no waiting!)
self.req.http.c.setopt(pycurl.USERAGENT, "curl/7.42.1")
#: Fetch the target URL
- header = self.load(self.pyfile.url, just_header = True, decode = False)
+ header = self.load(self.pyfile.url, just_header=True, decode=False)
target_url = header.get('location')
self.links.append(target_url)
diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index 2aa670a7e..cdbb00184 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -110,7 +110,7 @@ class ShareLinksBiz(Crypter):
def unblock_server(self):
- imgs = re.findall(r"(/template/images/.*?\.gif)", self.data)
+ imgs = re.findall(r'(/template/images/.*?\.gif)', self.data)
for img in imgs:
self.load(self.base_url + img)
diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py
index dc605ffce..c76c3b5b4 100644
--- a/module/plugins/crypter/YoutubeComFolder.py
+++ b/module/plugins/crypter/YoutubeComFolder.py
@@ -133,7 +133,7 @@ class YoutubeComFolder(Crypter):
for p in playlists:
p_name = p['title']
p_videos = self.get_videos_id(p['id'])
- p_folder = fsjoin(self.pyload.config.get("general", "download_folder"), p['channelTitle'], p_name)
+ p_folder = fsjoin(self.pyload.config.get('general', 'download_folder'), p['channelTitle'], p_name)
self.log_debug("%s video\s found on playlist \"%s\"" % (len(p_videos), p_name))
if not p_videos:
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-03 10:12:09 +0100