From 589121e80835c63aea0880a53c6678de5c31c16e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 28 Mar 2015 01:59:01 +0100
Subject: Spare code cosmetics

---
 module/plugins/crypter/CrockoComFolder.py       | 2 +-
 module/plugins/crypter/CzshareComFolder.py      | 2 +-
 module/plugins/crypter/DepositfilesComFolder.py | 2 +-
 module/plugins/crypter/EmbeduploadCom.py        | 2 +-
 module/plugins/crypter/FileserveComFolder.py    | 2 +-
 module/plugins/crypter/FourChanOrg.py           | 2 +-
 module/plugins/crypter/FreakhareComFolder.py    | 2 +-
 module/plugins/crypter/FshareVnFolder.py        | 2 +-
 module/plugins/crypter/LetitbitNetFolder.py     | 2 +-
 module/plugins/crypter/LinkCryptWs.py           | 6 +++---
 module/plugins/crypter/MegaRapidCzFolder.py     | 2 +-
 module/plugins/crypter/MultiloadCz.py           | 4 ++--
 module/plugins/crypter/NCryptIn.py              | 4 ++--
 module/plugins/crypter/PastebinCom.py           | 2 +-
 module/plugins/crypter/QuickshareCzFolder.py    | 2 +-
 module/plugins/crypter/UlozToFolder.py          | 4 ++--
 16 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'module/plugins/crypter')

diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoComFolder.py
index a01f3e814..f56cc449a 100644
--- a/module/plugins/crypter/CrockoComFolder.py
+++ b/module/plugins/crypter/CrockoComFolder.py
@@ -18,7 +18,7 @@ class CrockoComFolder(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>'
 
 
 getInfo = create_getInfo(CrockoComFolder)
diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py
index b1f242416..c317b1b49 100644
--- a/module/plugins/crypter/CzshareComFolder.py
+++ b/module/plugins/crypter/CzshareComFolder.py
@@ -19,7 +19,7 @@ class CzshareComFolder(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/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesComFolder.py
index b23d4a41e..46ec265c3 100644
--- a/module/plugins/crypter/DepositfilesComFolder.py
+++ b/module/plugins/crypter/DepositfilesComFolder.py
@@ -18,7 +18,7 @@ class DepositfilesComFolder(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">'
 
 
 getInfo = create_getInfo(DepositfilesComFolder)
diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py
index d61fc7fda..28633f634 100644
--- a/module/plugins/crypter/EmbeduploadCom.py
+++ b/module/plugins/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/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py
index 95ef49498..1363e2d45 100644
--- a/module/plugins/crypter/FileserveComFolder.py
+++ b/module/plugins/crypter/FileserveComFolder.py
@@ -20,7 +20,7 @@ class FileserveComFolder(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/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py
index 40a18179c..c90c84b6f 100644
--- a/module/plugins/crypter/FourChanOrg.py
+++ b/module/plugins/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/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py
index cf89d6a6d..173660668 100644
--- a/module/plugins/crypter/FreakhareComFolder.py
+++ b/module/plugins/crypter/FreakhareComFolder.py
@@ -20,7 +20,7 @@ class FreakhareComFolder(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/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVnFolder.py
index 04508198a..bbee53337 100644
--- a/module/plugins/crypter/FshareVnFolder.py
+++ b/module/plugins/crypter/FshareVnFolder.py
@@ -18,7 +18,7 @@ class FshareVnFolder(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">'
 
 
 getInfo = create_getInfo(FshareVnFolder)
diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNetFolder.py
index f5cc5fa78..b60d754a7 100644
--- a/module/plugins/crypter/LetitbitNetFolder.py
+++ b/module/plugins/crypter/LetitbitNetFolder.py
@@ -20,7 +20,7 @@ class LetitbitNetFolder(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/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py
index 018ed90ba..d3e75aad4 100644
--- a/module/plugins/crypter/LinkCryptWs.py
+++ b/module/plugins/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/module/plugins/crypter/MegaRapidCzFolder.py b/module/plugins/crypter/MegaRapidCzFolder.py
index 63d41982d..fadd6dbed 100644
--- a/module/plugins/crypter/MegaRapidCzFolder.py
+++ b/module/plugins/crypter/MegaRapidCzFolder.py
@@ -18,7 +18,7 @@ class MegaRapidCzFolder(SimpleCrypter):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    LINK_PATTERN = r'<td class="soubor"[^>]*><a href="([^"]+)">'
+    LINK_PATTERN = r'<td class="soubor".*?><a href="(.+?)">'
 
 
 getInfo = create_getInfo(MegaRapidCzFolder)
diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py
index 2abb627c3..eea689a09 100644
--- a/module/plugins/crypter/MultiloadCz.py
+++ b/module/plugins/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/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py
index 8e69a9323..7de2c0df7 100644
--- a/module/plugins/crypter/NCryptIn.py
+++ b/module/plugins/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):
@@ -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/module/plugins/crypter/PastebinCom.py b/module/plugins/crypter/PastebinCom.py
index e8ffec4e7..751b47cc9 100644
--- a/module/plugins/crypter/PastebinCom.py
+++ b/module/plugins/crypter/PastebinCom.py
@@ -19,7 +19,7 @@ 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>.+?)">'
 
 
 getInfo = create_getInfo(PastebinCom)
diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py
index 0ccba2a5e..3e38d36b4 100644
--- a/module/plugins/crypter/QuickshareCzFolder.py
+++ b/module/plugins/crypter/QuickshareCzFolder.py
@@ -18,7 +18,7 @@ class QuickshareCzFolder(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/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py
index a9a6117c0..3f2a60cf7 100644
--- a/module/plugins/crypter/UlozToFolder.py
+++ b/module/plugins/crypter/UlozToFolder.py
@@ -19,8 +19,8 @@ class UlozToFolder(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):
-- 
cgit v1.2.3