Code cosmetics

7 files changed, 41 insertions, 29 deletions

diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py
index 16931984b..192c5962c 100644
--- a/module/plugins/crypter/DevhostStFolder.py
+++ b/module/plugins/crypter/DevhostStFolder.py
@@ -48,7 +48,7 @@ class DevhostStFolder(SimpleCrypter):
             name = folder = m.group(1)
 
         except Exception, e:
-            self.logDebug(str(e))
+            self.logDebug(e)
             name = folder = re.match(self.__pattern__, self.pyfile.url).group('USER')
 
         return {'name': name, 'folder': folder}
diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py
index 5bd20711e..07cc5cdc4 100644
--- a/module/plugins/crypter/DuckCryptInfo.py
+++ b/module/plugins/crypter/DuckCryptInfo.py
@@ -37,11 +37,11 @@ class DuckCryptInfo(Crypter):
 
 
     def handleFolder(self, m):
-        src = self.load("http://duckcrypt.info/ajax/auth.php?hash=" + str(m.group(2)))
-        m = re.match(self.__pattern__, src)
+        html = self.load("http://duckcrypt.info/ajax/auth.php?hash=" + str(m.group(2)))
+        m = re.match(self.__pattern__, html)
         self.logDebug("Redirectet to " + str(m.group(0)))
-        src = self.load(str(m.group(0)))
-        soup = BeautifulSoup(src)
+        html = self.load(str(m.group(0)))
+        soup = BeautifulSoup(html)
         cryptlinks = soup.findAll("div", attrs={"class": "folderbox"})
         self.logDebug("Redirectet to " + str(cryptlinks))
         if not cryptlinks:
@@ -52,8 +52,8 @@ class DuckCryptInfo(Crypter):
 
 
     def handleLink(self, url):
-        src = self.load(url)
-        soup = BeautifulSoup(src)
+        html = self.load(url)
+        soup = BeautifulSoup(html)
         self.urls = [soup.find("iframe")['src']]
         if not self.urls:
             self.logInfo(_("No link found"))
diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py
index ab4e76092..92e9620f6 100644
--- a/module/plugins/crypter/FilefactoryComFolder.py
+++ b/module/plugins/crypter/FilefactoryComFolder.py
@@ -21,7 +21,7 @@ class FilefactoryComFolder(SimpleCrypter):
     NAME_PATTERN = r'<h1>Files in <span>(?P<N>.+)</span></h1>'
     PAGES_PATTERN = r'data-paginator-totalPages="(\d+)"'
 
-    COOKIES = [('.filefactory.com', 'locale', 'en_US.utf8')]
+    COOKIES = [(".filefactory.com", "locale", "en_US.utf8")]
 
 
     def loadPage(self, page_n):
diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py
index ed4adef58..4d4b8fbef 100644
--- a/module/plugins/crypter/HoerbuchIn.py
+++ b/module/plugins/crypter/HoerbuchIn.py
@@ -30,8 +30,8 @@ class HoerbuchIn(Crypter):
         self.pyfile = pyfile
 
         if self.article.match(pyfile.url):
-            src = self.load(pyfile.url)
-            soup = BeautifulSoup(src, convertEntities=BeautifulStoneSoup.HTML_ENTITIES)
+            html = self.load(pyfile.url)
+            soup = BeautifulSoup(html, convertEntities=BeautifulStoneSoup.HTML_ENTITIES)
 
             abookname = soup.find("a", attrs={"rel": "bookmark"}).text
             for a in soup.findAll("a", attrs={"href": self.protection}):
@@ -50,11 +50,11 @@ class HoerbuchIn(Crypter):
         url = m.group(0)
 
         self.pyfile.url = url
-        src = self.load(url, post={"viewed": "adpg"})
+        html = self.load(url, post={"viewed": "adpg"})
 
         links = []
         pattern = re.compile("http://www\.hoerbuch\.in/protection/(\w+)/(.*?)\"")
-        for hoster, lid in pattern.findall(src):
+        for hoster, lid in pattern.findall(html):
             self.req.lastURL = url
             self.load("http://www.hoerbuch.in/protection/%s/%s" % (hoster, lid))
             links.append(self.req.lastEffectiveURL)
diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py
index 23a8a6512..67b1a3f02 100644
--- a/module/plugins/crypter/LinkCryptWs.py
+++ b/module/plugins/crypter/LinkCryptWs.py
@@ -216,12 +216,12 @@ class LinkCryptWs(Crypter):
             try:
                 self.logDebug("Decrypting Web link %d, %s" % (idx + 1, weblink_id))
 
-                response = self.load("http://linkcrypt.ws/out.html", post = {'file':weblink_id})
+                res = self.load("http://linkcrypt.ws/out.html", post = {'file':weblink_id})
 
-                indexs = response.find("window.location =") + 19
-                indexe = response.find('"', indexs)
+                indexs = res.find("window.location =") + 19
+                indexe = res.find('"', indexs)
 
-                link2= response[indexs:indexe]
+                link2 = res[indexs:indexe]
 
                 self.logDebug(link2)
 
diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py
index 72ce32810..7015f2ed3 100644
--- a/module/plugins/crypter/LinkSaveIn.py
+++ b/module/plugins/crypter/LinkSaveIn.py
@@ -155,18 +155,25 @@ class LinkSaveIn(SimpleCrypter):
             for i, weblink_id in enumerate(ids):
                 try:
                     webLink = "http://linksave.in/%s" % weblink_id
+
                     self.logDebug("Decrypting Web link %d, %s" % (i + 1, webLink))
+
                     fwLink = "http://linksave.in/fw-%s" % weblink_id
-                    response = self.load(fwLink)
-                    jscode = re.findall(r'<script type="text/javascript">(.*)</script>', response)[-1]
+                    res = self.load(fwLink)
+
+                    jscode = re.findall(r'<script type="text/javascript">(.*)</script>', res)[-1]
                     jseval = self.js.eval("document = { write: function(e) { return e; } }; %s" % jscode)
                     dlLink = re.search(r'http://linksave\.in/dl-\w+', jseval).group(0)
                     self.logDebug("JsEngine returns value [%s] for redirection link" % dlLink)
-                    response = self.load(dlLink)
-                    link = unescape(re.search(r'<iframe src="(.+?)"', response).group(1))
+
+                    res = self.load(dlLink)
+                    link = unescape(re.search(r'<iframe src="(.+?)"', res).group(1))
+
                     package_links.append(link)
+
                 except Exception, detail:
                     self.logDebug("Error decrypting Web link %s, %s" % (webLink, detail))
+
         return package_links
 
 
diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index 26d05fee1..d2e8138f6 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -192,17 +192,22 @@ class ShareLinksBiz(Crypter):
         for i, ID in enumerate(ids):
             try:
                 self.logDebug("Decrypting Web link %d, [%s]" % (i + 1, ID))
+
                 dwLink = self.baseUrl + "/get/lnk/" + ID
-                response = self.load(dwLink)
-                code = re.search(r'frm/(\d+)', response).group(1)
+                res = self.load(dwLink)
+
+                code = re.search(r'frm/(\d+)', res).group(1)
                 fwLink = self.baseUrl + "/get/frm/" + code
-                response = self.load(fwLink)
-                jscode = re.search(r'<script language="javascript">\s*eval\((.*)\)\s*</script>', response,
-                                   re.S).group(1)
+                res = self.load(fwLink)
+
+                jscode = re.search(r'<script language="javascript">\s*eval\((.*)\)\s*</script>', res, re.S).group(1)
                 jscode = self.js.eval("f = %s" % jscode)
                 jslauncher = "window=''; parent={frames:{Main:{location:{href:''}}},location:''}; %s; parent.frames.Main.location.href"
+
                 dlLink = self.js.eval(jslauncher % jscode)
+
                 self.logDebug("JsEngine returns value [%s] for redirection link" % dlLink)
+
                 package_links.append(dlLink)
             except Exception, detail:
                 self.logDebug("Error decrypting Web link [%s], %s" % (ID, detail))
@@ -237,10 +242,10 @@ class ShareLinksBiz(Crypter):
 
     def _getCipherParams(self):
         # Request CNL2
-        code = re.search(r'ClicknLoad.swf\?code=(.*?)"', self.html).group(1)
-        url = "%s/get/cnl2/%s" % (self.baseUrl, code)
-        response = self.load(url)
-        params = response.split(";;")
+        code   = re.search(r'ClicknLoad.swf\?code=(.*?)"', self.html).group(1)
+        url    = "%s/get/cnl2/%s" % (self.baseUrl, code)
+        res    = self.load(url)
+        params = res.split(";;")
 
         # Get jk
         strlist = list(base64.standard_b64decode(params[1]))