Fixed PEP 8 violations in Crypters

43 files changed, 811 insertions, 648 deletions

diff --git a/module/plugins/crypter/C1neonCom.py b/module/plugins/crypter/C1neonCom.py
index 36b84764e..7d20d8a73 100644
--- a/module/plugins/crypter/C1neonCom.py
+++ b/module/plugins/crypter/C1neonCom.py
@@ -20,6 +20,8 @@ import re
 import random
 from module.plugins.Crypter import Crypter
 from module.common.json_layer import json_loads
+
+
 class C1neonCom(Crypter):
     __name__ = "C1neonCom"
     __type__ = "container"
@@ -31,9 +33,10 @@ class C1neonCom(Crypter):
         ("useStreams", "bool", "Use Streams too", False),
         ("hosterListMode", "all;onlypreferred", "Use for hosters (if supported)", "all"),
         ("randomPreferred", "bool", "Randomize Preferred-List", False),
-        ("hosterList", "str", "Preferred Hoster list (comma separated, no ending)", "2shared,Bayfiles,Netload,Rapidshare,Share-online"),
+        ("hosterList", "str", "Preferred Hoster list (comma separated, no ending)",
+         "2shared,Bayfiles,Netload,Rapidshare,Share-online"),
         ("ignoreList", "str", "Ignored Hoster list (comma separated, no ending)", "Megaupload")
-        ]
+    ]
     __description__ = """C1neon.Com Container Plugin"""
     __author_name__ = ("godofdream")
     __author_mail__ = ("soilfiction@gmail.com")
@@ -41,13 +44,13 @@ class C1neonCom(Crypter):
     VALUES_PATTERN = r"var subcats = (.*?)(;</script>|;var)"
     SHOW_PATTERN = r"title='(.*?)'"
     SERIE_PATTERN = r"<title>.*Serie.*</title>"
-    
+
     def decrypt(self, pyfile):
         src = self.req.load(str(pyfile.url))
 
         pattern = re.compile(self.VALUES_PATTERN, re.DOTALL)
         data = json_loads(re.search(pattern, src).group(1))
-        
+
         # Get package info 
         links = []
         Showname = re.search(self.SHOW_PATTERN, src)
@@ -55,7 +58,7 @@ class C1neonCom(Crypter):
             Showname = Showname.group(1).decode("utf-8")
         else:
             Showname = self.pyfile.package().name
-            
+
         if re.search(self.SERIE_PATTERN, src):
             for Season in data:
                 self.logDebug("Season " + Season)
@@ -63,21 +66,22 @@ class C1neonCom(Crypter):
                     self.logDebug("Episode " + Episode)
                     links.extend(self.getpreferred(data[Season][Episode]))
                     if self.getConfig("changeNameS") == "Episode":
-                        self.packages.append((data[Season][Episode]['info']['name'].split("»")[0], links, data[Season][Episode]['info']['name'].split("»")[0]))
+                        self.packages.append((data[Season][Episode]['info']['name'].split("»")[0], links,
+                                              data[Season][Episode]['info']['name'].split("»")[0]))
                         links = []
-                    
-                if self.getConfig("changeNameS") == "Season":  
+
+                if self.getConfig("changeNameS") == "Season":
                     self.packages.append((Showname + " Season " + Season, links, Showname + " Season " + Season))
                     links = []
 
             if self.getConfig("changeNameS") == "Show":
-                if  links == []:
+                if links == []:
                     self.fail('Could not extract any links (Out of Date?)')
                 else:
                     self.packages.append((Showname, links, Showname))
-        
+
             elif self.getConfig("changeNameS") == "Packagename":
-                if  links == []:
+                if links == []:
                     self.fail('Could not extract any links (Out of Date?)')
                 else:
                     self.core.files.addLinks(links, self.pyfile.package().id)
@@ -85,13 +89,13 @@ class C1neonCom(Crypter):
             for Movie in data:
                 links.extend(self.getpreferred(data[Movie]))
                 if self.getConfig("changeName") == "Movie":
-                    if  links == []:
+                    if links == []:
                         self.fail('Could not extract any links (Out of Date?)')
                     else:
                         self.packages.append((Showname, links, Showname))
-            
+
                 elif self.getConfig("changeName") == "Packagename":
-                    if  links == []:
+                    if links == []:
                         self.fail('Could not extract any links (Out of Date?)')
                     else:
                         self.core.files.addLinks(links, self.pyfile.package().id)
@@ -106,28 +110,27 @@ class C1neonCom(Crypter):
             hosterlist.update(hosterslist['d'])
         if self.getConfig("useStreams") and 's' in hosterslist:
             hosterlist.update(hosterslist['s'])
-        
+
         result = []
-        preferredList = self.getConfig("hosterList").strip().lower().replace('|',',').replace('.','').replace(';',',').split(',')
+        preferredList = self.getConfig("hosterList").strip().lower().replace(
+            '|',',').replace('.', '').replace(';', ',').split(',')
         if self.getConfig("randomPreferred") == True:
             random.shuffle(preferredList)
         for preferred in preferredList:
             for Hoster in hosterlist:
-                if preferred == Hoster.split('<')[0].strip().lower().replace('.',''):
+                if preferred == Hoster.split('<')[0].strip().lower().replace('.', ''):
                     for Part in hosterlist[Hoster]:
                         self.logDebug("selected " + Part[3])
                         result.append(str(Part[3]))
                     return result
 
-        ignorelist = self.getConfig("ignoreList").strip().lower().replace('|',',').replace('.','').replace(';',',').split(',')
+        ignorelist = self.getConfig("ignoreList").strip().lower().replace(
+            '|', ',').replace('.', '').replace(';', ',').split( ',')
         if self.getConfig('hosterListMode') == "all":
             for Hoster in hosterlist:
-                if Hoster.split('<')[0].strip().lower().replace('.','') not in ignorelist:
+                if Hoster.split('<')[0].strip().lower().replace('.', '') not in ignorelist:
                     for Part in hosterlist[Hoster]:
                         self.logDebug("selected " + Part[3])
                         result.append(str(Part[3]))
                     return result
         return result
-        
-        
-      
diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoComFolder.py
index d727ec7ab..ffa8039a1 100644
--- a/module/plugins/crypter/CrockoComFolder.py
+++ b/module/plugins/crypter/CrockoComFolder.py
@@ -2,6 +2,7 @@
 
 from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
+
 class CrockoComFolder(SimpleCrypter):
     __name__ = "CrockoComFolder"
     __type__ = "crypter"
diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py
index 4935758c7..08ae1cac5 100644
--- a/module/plugins/crypter/CryptItCom.py
+++ b/module/plugins/crypter/CryptItCom.py
@@ -16,7 +16,7 @@ class CryptItCom(Crypter):
     __description__ = """Crypt.It.com Container Plugin"""
     __author_name__ = ("jeix")
     __author_mail__ = ("jeix@hasnomail.de")
-        
+
     def file_exists(self):
         html = self.load(self.pyfile.url)
         if r'<div class="folder">Was ist Crypt-It</div>' in html:
@@ -31,7 +31,7 @@ class CryptItCom(Crypter):
         repl_pattern = r"/(s|e|d|c)/"
         url = re.sub(repl_pattern, r"/d/", self.pyfile.url)
 
-        pyfile.name = "tmp_cryptit_%s.ccf" % randint(0,1000)
+        pyfile.name = "tmp_cryptit_%s.ccf" % randint(0, 1000)
         location = self.download(url)
 
         self.packages.append(["Crypt-it Package", [location], "Crypt-it Package"])
diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py
index c240c6a70..9ccda3ed2 100644
--- a/module/plugins/crypter/CzshareComFolder.py
+++ b/module/plugins/crypter/CzshareComFolder.py
@@ -3,6 +3,7 @@
 import re
 from module.plugins.Crypter import Crypter
 
+
 class CzshareComFolder(Crypter):
     __name__ = "CzshareComFolder"
     __type__ = "crypter"
diff --git a/module/plugins/crypter/DDLMusicOrg.py b/module/plugins/crypter/DDLMusicOrg.py
index f7cc996d0..822addca1 100644
--- a/module/plugins/crypter/DDLMusicOrg.py
+++ b/module/plugins/crypter/DDLMusicOrg.py
@@ -6,6 +6,7 @@ from time import sleep
 
 from module.plugins.Crypter import Crypter
 
+
 class DDLMusicOrg(Crypter):
     __name__ = "DDLMusicOrg"
     __type__ = "container"
@@ -17,24 +18,26 @@ class DDLMusicOrg(Crypter):
 
     def setup(self):
         self.multiDL = False
-    
+
     def decrypt(self, pyfile):
         html = self.req.load(self.pyfile.url, cookies=True)
-        
+
         if re.search(r"Wer dies nicht rechnen kann", html) is not None:
             self.offline()
-        
+
         math = re.search(r"(\d+) ([\+-]) (\d+) =\s+<inp", self.html)
         id = re.search(r"name=\"id\" value=\"(\d+)\"", self.html).group(1)
         linknr = re.search(r"name=\"linknr\" value=\"(\d+)\"", self.html).group(1)
-        
+
         solve = ""
         if math.group(2) == "+":
             solve = int(math.group(1)) + int(math.group(3))
         else:
             solve = int(math.group(1)) - int(math.group(3))
         sleep(3)
-        htmlwithlink = self.req.load(self.pyfile.url, cookies=True, post={"calc%s" % linknr:solve, "send%s" % linknr:"Send", "id":id, "linknr":linknr})
+        htmlwithlink = self.req.load(self.pyfile.url, cookies=True,
+                                     post={"calc%s" % linknr: solve, "send%s" % linknr: "Send", "id": id,
+                                           "linknr": linknr})
         m = re.search(r"<form id=\"ff\" action=\"(.*?)\" method=\"post\">", htmlwithlink)
         if m:
             self.packages.append((self.pyfile.package().name, [m.group(1)], self.pyfile.package().folder))
diff --git a/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesComFolder.py
index 9023b238f..15c317acf 100644
--- a/module/plugins/crypter/DepositfilesComFolder.py
+++ b/module/plugins/crypter/DepositfilesComFolder.py
@@ -2,6 +2,7 @@
 
 from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
+
 class DepositfilesComFolder(SimpleCrypter):
     __name__ = "DepositfilesComFolder"
     __type__ = "crypter"
@@ -11,4 +12,4 @@ class DepositfilesComFolder(SimpleCrypter):
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
-    LINK_PATTERN = r'<div class="progressName"[^>]*>\s*<a href="([^"]+)" title="[^"]*" target="_blank">'
\ No newline at end of file
+    LINK_PATTERN = r'<div class="progressName"[^>]*>\s*<a href="([^"]+)" title="[^"]*" target="_blank">'
diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py
index 584835e18..7b7c34fee 100644
--- a/module/plugins/crypter/Dereferer.py
+++ b/module/plugins/crypter/Dereferer.py
@@ -20,6 +20,7 @@ import urllib
 
 from module.plugins.Crypter import Crypter
 
+
 class Dereferer(Crypter):
     __name__ = "Dereferer"
     __type__ = "crypter"
@@ -31,4 +32,4 @@ class Dereferer(Crypter):
 
     def decrypt(self, pyfile):
         link = re.match(self.__pattern__, self.pyfile.url).group('url')
-        self.core.files.addLinks([ urllib.unquote(link).rstrip('+') ], self.pyfile.package().id)
+        self.core.files.addLinks([urllib.unquote(link).rstrip('+')], self.pyfile.package().id)
diff --git a/module/plugins/crypter/DontKnowMe.py b/module/plugins/crypter/DontKnowMe.py
index dfa72df47..0791e3c22 100644
--- a/module/plugins/crypter/DontKnowMe.py
+++ b/module/plugins/crypter/DontKnowMe.py
@@ -5,6 +5,7 @@ import urllib
 
 from module.plugins.Crypter import Crypter
 
+
 class DontKnowMe(Crypter):
     __name__ = "DontKnowMe"
     __type__ = "crypter"
@@ -18,4 +19,4 @@ class DontKnowMe(Crypter):
 
     def decrypt(self, pyfile):
         link = re.findall(self.LINK_PATTERN, self.pyfile.url)[0]
-        self.core.files.addLinks([ urllib.unquote(link) ], self.pyfile.package().id)
+        self.core.files.addLinks([urllib.unquote(link)], self.pyfile.package().id)
diff --git a/module/plugins/crypter/DownloadVimeoCom.py b/module/plugins/crypter/DownloadVimeoCom.py
index 88310915b..562672599 100644
--- a/module/plugins/crypter/DownloadVimeoCom.py
+++ b/module/plugins/crypter/DownloadVimeoCom.py
@@ -5,26 +5,27 @@ import re
 import HTMLParser
 from module.plugins.Crypter import Crypter
 
+
 class DownloadVimeoCom(Crypter):
-	__name__ = 'DownloadVimeoCom'
-	__type__ = 'crypter'
-	__pattern__ = r'(?:http://vimeo\.com/\d*|http://smotri\.com/video/view/\?id=.*)'
-	## The download from dailymotion failed with a 403
-	__version__ = '0.1'
-	__description__ = """Video Download Plugin based on downloadvimeo.com"""
-	__author_name__ = ('4Christopher')
-	__author_mail__ = ('4Christopher@gmx.de')
-	BASE_URL = 'http://downloadvimeo.com'
+    __name__ = 'DownloadVimeoCom'
+    __type__ = 'crypter'
+    __pattern__ = r'(?:http://vimeo\.com/\d*|http://smotri\.com/video/view/\?id=.*)'
+    ## The download from dailymotion failed with a 403
+    __version__ = '0.1'
+    __description__ = """Video Download Plugin based on downloadvimeo.com"""
+    __author_name__ = ('4Christopher')
+    __author_mail__ = ('4Christopher@gmx.de')
+    BASE_URL = 'http://downloadvimeo.com'
 
-	def decrypt(self, pyfile):
-		self.package = pyfile.package()
-		html = self.load('%s/generate?url=%s' % (self.BASE_URL, pyfile.url))
-		h = HTMLParser.HTMLParser()
-		try:
-			f = re.search(r'cmd quality="(?P<quality>[^"]+?)">\s*?(?P<URL>[^<]*?)</cmd>', html)
-		except:
-			self.logDebug('Failed to find the URL')
-		else:
-			url = h.unescape(f.group('URL'))
-			self.logDebug('Quality: %s, URL: %s' % (f.group('quality'), url))
-			self.packages.append((self.package.name, [url], self.package.folder))
+    def decrypt(self, pyfile):
+        self.package = pyfile.package()
+        html = self.load('%s/generate?url=%s' % (self.BASE_URL, pyfile.url))
+        h = HTMLParser.HTMLParser()
+        try:
+            f = re.search(r'cmd quality="(?P<quality>[^"]+?)">\s*?(?P<URL>[^<]*?)</cmd>', html)
+        except:
+            self.logDebug('Failed to find the URL')
+        else:
+            url = h.unescape(f.group('URL'))
+            self.logDebug('Quality: %s, URL: %s' % (f.group('quality'), url))
+            self.packages.append((self.package.name, [url], self.package.folder))
diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py
index 4886d24db..64302c800 100644
--- a/module/plugins/crypter/DuckCryptInfo.py
+++ b/module/plugins/crypter/DuckCryptInfo.py
@@ -4,6 +4,7 @@ import re
 from module.lib.BeautifulSoup import BeautifulSoup
 from module.plugins.Crypter import Crypter
 
+
 class DuckCryptInfo(Crypter):
     __name__ = "DuckCryptInfo"
     __type__ = "container"
@@ -14,7 +15,7 @@ class DuckCryptInfo(Crypter):
     __author_mail__ = ("soilfiction@gmail.com")
 
     TIMER_PATTERN = r'<span id="timer">(.*)</span>'
-    
+
     def decrypt(self, pyfile):
         url = pyfile.url
         # seems we don't need to wait
@@ -31,10 +32,9 @@ class DuckCryptInfo(Crypter):
         else:
             self.handleFolder(found)
 
-        
-		
+
     def handleFolder(self, found):
-        src = self.load("http://duckcrypt.info/ajax/auth.php?hash="  + str(found.group(2)))
+        src = self.load("http://duckcrypt.info/ajax/auth.php?hash=" + str(found.group(2)))
         found = re.search(self.__pattern__, src)
         self.logDebug("Redirectet to " + str(found.group(0)))
         src = self.load(str(found.group(0)))
@@ -55,4 +55,3 @@ class DuckCryptInfo(Crypter):
             self.logDebug('no links found - (Plugin out of date?)')
         else:
             self.core.files.addLinks([link], self.pyfile.package().id)
-        
diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py
index 8fd70882f..122c0f671 100644
--- a/module/plugins/crypter/EmbeduploadCom.py
+++ b/module/plugins/crypter/EmbeduploadCom.py
@@ -4,6 +4,7 @@ import re
 from module.plugins.Crypter import Crypter
 from module.network.HTTPRequest import BadHeader
 
+
 class EmbeduploadCom(Crypter):
     __name__ = "EmbeduploadCom"
     __type__ = "crypter"
@@ -11,7 +12,7 @@ class EmbeduploadCom(Crypter):
     __version__ = "0.02"
     __description__ = """EmbedUpload.com crypter"""
     __config__ = [("preferedHoster", "str", "Prefered hoster list (bar-separated) ", "embedupload"),
-        ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")]
+                  ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")]
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
@@ -19,9 +20,9 @@ class EmbeduploadCom(Crypter):
 
     def decrypt(self, pyfile):
         self.html = self.load(self.pyfile.url, decode=True)
-        tmp_links = [] 
+        tmp_links = []
         new_links = []
-               
+
         found = re.findall(self.LINK_PATTERN, self.html)
         if found:
             prefered_set = set(self.getConfig("preferedHoster").split('|'))
@@ -33,22 +34,20 @@ class EmbeduploadCom(Crypter):
             if not new_links:
                 ignored_set = set(self.getConfig("ignoredHoster").split('|'))
                 ignored_set = map(lambda s: s.lower().split('.')[0], ignored_set)
-                print "IG", ignored_set 
-                tmp_links.extend([x[1] for x in found if x[0] not in ignored_set])                
+                print "IG", ignored_set
+                tmp_links.extend([x[1] for x in found if x[0] not in ignored_set])
                 self.getLocation(tmp_links, new_links)
 
         if new_links:
             self.core.files.addLinks(new_links, self.pyfile.package().id)
         else:
             self.fail('Could not extract any links')
-            
+
     def getLocation(self, tmp_links, new_links):
         for link in tmp_links:
             try:
-                header = self.load(link, just_header = True)
-                if "location" in header: 
+                header = self.load(link, just_header=True)
+                if "location" in header:
                     new_links.append(header['location'])
             except BadHeader:
                 pass
-            
-        
\ No newline at end of file
diff --git a/module/plugins/crypter/FilebeerInfoFolder.py b/module/plugins/crypter/FilebeerInfoFolder.py
index f45144f14..86ce5b697 100644
--- a/module/plugins/crypter/FilebeerInfoFolder.py
+++ b/module/plugins/crypter/FilebeerInfoFolder.py
@@ -3,6 +3,7 @@
 import re
 from module.plugins.Crypter import Crypter
 
+
 class FilebeerInfoFolder(Crypter):
     __name__ = "FilebeerInfoFolder"
     __type__ = "crypter"
@@ -14,22 +15,22 @@ class FilebeerInfoFolder(Crypter):
 
     LINK_PATTERN = r'<td title="[^"]*"><a href="([^"]+)" target="_blank">'
     PAGE_COUNT_PATTERN = r'<p class="introText">\s*Total Pages (\d+)'
-    
-    def decrypt(self, pyfile):        
-        pyfile.url = re.sub(self.__pattern__, r'http://filebeer.info/\1?page=1', pyfile.url)        
+
+    def decrypt(self, pyfile):
+        pyfile.url = re.sub(self.__pattern__, r'http://filebeer.info/\1?page=1', pyfile.url)
         html = self.load(pyfile.url)
-        
+
         page_count = int(re.search(self.PAGE_COUNT_PATTERN, html).group(1))
         new_links = []
-                
-        for i in range(1, page_count + 1):            
-            self.logInfo("Fetching links from page %i" % i)                
+
+        for i in range(1, page_count + 1):
+            self.logInfo("Fetching links from page %i" % i)
             new_links.extend(re.findall(self.LINK_PATTERN, html))
-                        
+
             if i < page_count:
-                html = self.load("%s?page=%d" % (pyfile.url, i+1))
+                html = self.load("%s?page=%d" % (pyfile.url, i + 1))
 
         if new_links:
             self.core.files.addLinks(new_links, self.pyfile.package().id)
         else:
-            self.fail('Could not extract any links')
\ No newline at end of file
+            self.fail('Could not extract any links')
diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py
index 32793b491..64b8ac37e 100644
--- a/module/plugins/crypter/FilefactoryComFolder.py
+++ b/module/plugins/crypter/FilefactoryComFolder.py
@@ -3,6 +3,7 @@
 import re
 from module.plugins.Crypter import Crypter
 
+
 class FilefactoryComFolder(Crypter):
     __name__ = "FilefactoryComFolder"
     __type__ = "crypter"
@@ -22,7 +23,7 @@ class FilefactoryComFolder(Crypter):
         html = self.load(url_base)
 
         new_links = []
-        for i in range(1,100):
+        for i in range(1, 100):
             self.logInfo("Fetching links from page %i" % i)
             found = re.search(self.FOLDER_PATTERN, html, re.DOTALL)
             if found is None: self.fail("Parse error (FOLDER)")
@@ -41,4 +42,4 @@ class FilefactoryComFolder(Crypter):
         if new_links:
             self.core.files.addLinks(new_links, self.pyfile.package().id)
         else:
-            self.fail('Could not extract any links')
\ No newline at end of file
+            self.fail('Could not extract any links')
diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py
index 9fe806971..42481c15e 100644
--- a/module/plugins/crypter/FileserveComFolder.py
+++ b/module/plugins/crypter/FileserveComFolder.py
@@ -4,6 +4,7 @@ import re
 
 from module.plugins.Crypter import Crypter
 
+
 class FileserveComFolder(Crypter):
     __name__ = "FileserveComFolder"
     __type__ = "crypter"
@@ -27,6 +28,6 @@ class FileserveComFolder(Crypter):
         new_links.extend(re.findall(self.LINK_PATTERN, folder.group(1)))
 
         if new_links:
-            self.core.files.addLinks(map(lambda s:"http://fileserve.com%s" % s, new_links), self.pyfile.package().id)
+            self.core.files.addLinks(map(lambda s: "http://fileserve.com%s" % s, new_links), self.pyfile.package().id)
         else:
-            self.fail('Could not extract any links')
\ No newline at end of file
+            self.fail('Could not extract any links')
diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py
index 5c96e723d..700a09b97 100644
--- a/module/plugins/crypter/FourChanOrg.py
+++ b/module/plugins/crypter/FourChanOrg.py
@@ -5,6 +5,7 @@ import re
 
 from module.plugins.Crypter import Crypter
 
+
 class FourChanOrg(Crypter):
     # Based on 4chandl by Roland Beermann
     # https://gist.github.com/enkore/3492599
diff --git a/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVnFolder.py
index 2515e7edd..2d7a3c490 100644
--- a/module/plugins/crypter/FshareVnFolder.py
+++ b/module/plugins/crypter/FshareVnFolder.py
@@ -2,6 +2,7 @@
 
 from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
+
 class FshareVnFolder(SimpleCrypter):
     __name__ = "FshareVnFolder"
     __type__ = "crypter"
@@ -11,4 +12,4 @@ class FshareVnFolder(SimpleCrypter):
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
-    LINK_PATTERN = r'<li class="w_80pc"><a href="([^"]+)" target="_blank">'
\ No newline at end of file
+    LINK_PATTERN = r'<li class="w_80pc"><a href="([^"]+)" target="_blank">'
diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py
index 4c26ba7f7..f8cb18b19 100644
--- a/module/plugins/crypter/HoerbuchIn.py
+++ b/module/plugins/crypter/HoerbuchIn.py
@@ -6,6 +6,7 @@ import re
 from module.plugins.Crypter import Crypter
 from module.lib.BeautifulSoup import BeautifulSoup, BeautifulStoneSoup
 
+
 class HoerbuchIn(Crypter):
     __name__ = "HoerbuchIn"
     __type__ = "container"
@@ -14,42 +15,42 @@ class HoerbuchIn(Crypter):
     __description__ = """Hoerbuch.in Container Plugin"""
     __author_name__ = ("spoob", "mkaay")
     __author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de")
-        
+
     article = re.compile("http://(www\.)?hoerbuch\.in/wp/horbucher/\d+/.+/")
     protection = re.compile("http://(www\.)?hoerbuch\.in/protection/folder_\d+.html")
 
     def decrypt(self, pyfile):
         self.pyfile = pyfile
-        
+
         if self.article.match(self.pyfile.url):
             src = self.load(self.pyfile.url)
             soup = BeautifulSoup(src, convertEntities=BeautifulStoneSoup.HTML_ENTITIES)
-            
+
             abookname = soup.find("a", attrs={"rel": "bookmark"}).text
             for a in soup.findAll("a", attrs={"href": self.protection}):
                 package = "%s (%s)" % (abookname, a.previousSibling.previousSibling.text[:-1])
                 links = self.decryptFolder(a["href"])
-                
+
                 self.packages.append((package, links, self.pyfile.package().folder))
         else:
             links = self.decryptFolder(self.pyfile.url)
-            
+
             self.packages.append((self.pyfile.package().name, links, self.pyfile.package().folder))
-        
+
     def decryptFolder(self, url):
         m = self.protection.search(url)
         if not m:
             self.fail("Bad URL")
         url = m.group(0)
-        
+
         self.pyfile.url = url
         src = self.req.load(url, post={"viewed": "adpg"})
-        
+
         links = []
         pattern = re.compile("http://www\.hoerbuch\.in/protection/(\w+)/(.*?)\"")
         for hoster, lid in pattern.findall(src):
             self.req.lastURL = url
             self.load("http://www.hoerbuch.in/protection/%s/%s" % (hoster, lid))
             links.append(self.req.lastEffectiveURL)
-        
+
         return links
diff --git a/module/plugins/crypter/HotfileFolderCom.py b/module/plugins/crypter/HotfileFolderCom.py
index 00771e2a3..79691ad01 100644
--- a/module/plugins/crypter/HotfileFolderCom.py
+++ b/module/plugins/crypter/HotfileFolderCom.py
@@ -5,6 +5,7 @@ import re
 
 from module.plugins.Crypter import Crypter
 
+
 class HotfileFolderCom(Crypter):
     __name__ = "HotfileFolderCom"
     __type__ = "crypter"
@@ -17,9 +18,11 @@ class HotfileFolderCom(Crypter):
     def decrypt(self, pyfile):
         html = self.load(pyfile.url)
 
-        name = re.findall(r'<img src="/i/folder.gif" width="23" height="14" style="margin-bottom: -2px;" />([^<]+)', html, re.MULTILINE)[0].replace("/", "")
+        name = re.findall(
+            r'<img src="/i/folder.gif" width="23" height="14" style="margin-bottom: -2px;" />([^<]+)', html,
+            re.MULTILINE)[0].replace("/", "")
         new_links = re.findall(r'href="(http://(www.)?hotfile\.com/dl/\d+/[0-9a-zA-Z]+[^"]+)', html)
 
         new_links = [x[0] for x in new_links]
 
-        self.packages.append((name, new_links, name))
\ No newline at end of file
+        self.packages.append((name, new_links, name))
diff --git a/module/plugins/crypter/ILoadTo.py b/module/plugins/crypter/ILoadTo.py
index 100ba2bc6..61869fdc0 100644
--- a/module/plugins/crypter/ILoadTo.py
+++ b/module/plugins/crypter/ILoadTo.py
@@ -1,10 +1,10 @@
-
 import re
 import urllib
 
 from module.plugins.Crypter import Crypter
 from module.lib.BeautifulSoup import BeautifulSoup
 
+
 class ILoadTo(Crypter):
     __name__ = "ILoadTo"
     __type__ = "crypter"
@@ -14,8 +14,8 @@ class ILoadTo(Crypter):
     __description__ = """iload.to Crypter Plugin"""
     __author_name__ = ("hzpz")
     __author_mail__ = ("none")
-    
-    
+
+
     def decrypt(self, pyfile):
         url = pyfile.url
         src = self.req.load(str(url))
@@ -34,19 +34,21 @@ class ILoadTo(Crypter):
         formTag = soup.find("form", attrs={"id": "CaptchaForm"})
         formUrl = "http://iload.to" + formTag["action"]
         self.logDebug("Form URL: %s" % formUrl)
-        
+
         # submit decrypted captcha
         self.req.lastURL = url
         src = self.req.load(str(formUrl), post={'captcha': result})
-        
+
         # find decrypted links
-        links = re.findall(r"<a href=\"(.+)\" style=\"text-align:center;font-weight:bold;\" class=\"button\" target=\"_blank\" onclick=\"this.className\+=' success';\">", src)
-        
+        links = re.findall(
+            r"<a href=\"(.+)\" style=\"text-align:center;font-weight:bold;\" class=\"button\" target=\"_blank\" onclick=\"this.className\+=' success';\">",
+            src)
+
         if not len(links) > 0:
             self.retry()
-        
+
         self.correctCaptcha()
-        
+
         cleanedLinks = []
         for link in links:
             if link.startswith("http://dontknow.me/at/?"):
@@ -55,8 +57,8 @@ class ILoadTo(Crypter):
                 cleanedLink = link
             self.logDebug("Link: %s" % cleanedLink)
             cleanedLinks.append(cleanedLink)
-        
+
         self.logDebug("Decrypted %d links" % len(links))
-        
+
         self.pyfile.package().password = "iload.to"
-        self.packages.append((self.pyfile.package().name, cleanedLinks, self.pyfile.package().folder))
\ No newline at end of file
+        self.packages.append((self.pyfile.package().name, cleanedLinks, self.pyfile.package().folder))
diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py
index e021316bf..a73b7cc19 100644
--- a/module/plugins/crypter/LinkSaveIn.py
+++ b/module/plugins/crypter/LinkSaveIn.py
@@ -6,13 +6,15 @@
 # * only best available link source is used (priority: cnl2>rsdf>ccf>dlc>web
 #
 
-from Crypto.Cipher import AES
-from module.plugins.Crypter import Crypter
-from module.unescape import unescape
 import base64
 import binascii
 import re
 
+from Crypto.Cipher import AES
+from module.plugins.Crypter import Crypter
+from module.unescape import unescape
+
+
 class LinkSaveIn(Crypter):
     __name__ = "LinkSaveIn"
     __type__ = "crypter"
@@ -26,31 +28,31 @@ class LinkSaveIn(Crypter):
     _JK_KEY_ = "jk"
     _CRYPTED_KEY_ = "crypted"
     HOSTER_DOMAIN = "linksave.in"
-        
+
     def setup(self):
         self.html = None
         self.fileid = None
         self.captcha = False
         self.package = None
         self.preferred_sources = ['cnl2', 'rsdf', 'ccf', 'dlc', 'web']
-        
+
     def decrypt(self, pyfile):
 
         # Init
         self.package = pyfile.package()
         self.fileid = re.match(self.__pattern__, pyfile.url).group('id')
         self.req.cj.setCookie(self.HOSTER_DOMAIN, "Linksave_Language", "english")
-        
+
         # Request package
         self.html = self.load(self.pyfile.url)
         if not self.isOnline():
             self.offline()
-        
+
         # Check for protection    
         if self.isPasswordProtected():
             self.unlockPasswordProtection()
             self.handleErrors()
-            
+
         if self.isCaptchaProtected():
             self.captcha = True
             self.unlockCaptchaProtection()
@@ -78,49 +80,49 @@ class LinkSaveIn(Crypter):
             self.logDebug("File not found")
             return False
         return True
-    
+
     def isPasswordProtected(self):
         if re.search(r'''<input.*?type="password"''', self.html):
             self.logDebug("Links are password protected")
             return True
-        
+
     def isCaptchaProtected(self):
         if "<b>Captcha:</b>" in self.html:
             self.logDebug("Links are captcha protected")
             return True
         return False
-        
+
     def unlockPasswordProtection(self):
         password = self.getPassword()
         self.logDebug("Submitting password [%s] for protected links" % password)
         post = {"id": self.fileid, "besucherpasswort": password, 'login': 'submit'}
         self.html = self.load(self.pyfile.url, post=post)
-            
+
     def unlockCaptchaProtection(self):
         captcha_hash = re.search(r'name="hash" value="([^"]+)', self.html).group(1)
         captcha_url = re.search(r'src=".(/captcha/cap.php\?hsh=[^"]+)', self.html).group(1)
         captcha_code = self.decryptCaptcha("http://linksave.in" + captcha_url, forceUser=True)
-        self.html = self.load(self.pyfile.url, post={"id": self.fileid, "hash": captcha_hash, "code": captcha_code})   
+        self.html = self.load(self.pyfile.url, post={"id": self.fileid, "hash": captcha_hash, "code": captcha_code})
 
     def getPackageInfo(self):
         name = self.pyfile.package().name
         folder = self.pyfile.package().folder
         self.logDebug("Defaulting to pyfile name [%s] and folder [%s] for package" % (name, folder))
         return name, folder
-    
-    def handleErrors(self):      
+
+    def handleErrors(self):
         if "The visitorpassword you have entered is wrong" in self.html:
             self.logDebug("Incorrect password, please set right password on 'Edit package' form and retry")
-            self.fail("Incorrect password, please set right password on 'Edit package' form and retry")  
+            self.fail("Incorrect password, please set right password on 'Edit package' form and retry")
 
-        if self.captcha:          
+        if self.captcha:
             if "Wrong code. Please retry" in self.html:
                 self.logDebug("Invalid captcha, retrying")
                 self.invalidCaptcha()
                 self.retry()
             else:
                 self.correctCaptcha()
-           
+
     def handleLinkSource(self, type_):
         if type_ == 'cnl2':
             return self.handleCNL2()
@@ -136,15 +138,15 @@ class LinkSaveIn(Crypter):
         self.logDebug("Search for Web links")
         if not self.js:
             self.logDebug("no JS -> skip Web links")
-        else: 
-            #@TODO: Gather paginated web links  
+        else:
+        #@TODO: Gather paginated web links
             pattern = r'<a href="http://linksave\.in/(\w{43})"'
             ids = re.findall(pattern, self.html)
             self.logDebug("Decrypting %d Web links" % len(ids))
             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))
+                    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]
@@ -155,9 +157,9 @@ class LinkSaveIn(Crypter):
                     link = unescape(re.search(r'<iframe src="(.+?)"', response).group(1))
                     package_links.append(link)
                 except Exception, detail:
-                    self.logDebug("Error decrypting Web link %s, %s" % (webLink, detail))    
+                    self.logDebug("Error decrypting Web link %s, %s" % (webLink, detail))
         return package_links
-    
+
     def handleContainer(self, type_):
         package_links = []
         type_ = type_.lower()
@@ -183,17 +185,17 @@ class LinkSaveIn(Crypter):
                 for (crypted, jk) in zip(vcrypted, vjk):
                     package_links.extend(self._getLinks(crypted, jk))
             except:
-                self.fail("Unable to decrypt CNL2 links")            
+                self.fail("Unable to decrypt CNL2 links")
         return package_links
-    
+
     def _getCipherParams(self):
-            
+
         # Get jk
-        jk_re = r'<INPUT.*?NAME="%s".*?VALUE="(.*?)"' % LinkSaveIn._JK_KEY_       
+        jk_re = r'<INPUT.*?NAME="%s".*?VALUE="(.*?)"' % LinkSaveIn._JK_KEY_
         vjk = re.findall(jk_re, self.html)
-        
+
         # Get crypted
-        crypted_re = r'<INPUT.*?NAME="%s".*?VALUE="(.*?)"' % LinkSaveIn._CRYPTED_KEY_       
+        crypted_re = r'<INPUT.*?NAME="%s".*?VALUE="(.*?)"' % LinkSaveIn._CRYPTED_KEY_
         vcrypted = re.findall(crypted_re, self.html)
 
         # Log and return
@@ -224,4 +226,3 @@ class LinkSaveIn(Crypter):
         # Log and return
         self.logDebug("Package has %d links" % len(links))
         return links
-
diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py
index 69d2f8192..6a11c98b0 100644
--- a/module/plugins/crypter/LinkdecrypterCom.py
+++ b/module/plugins/crypter/LinkdecrypterCom.py
@@ -19,6 +19,7 @@
 import re
 from module.plugins.Crypter import Crypter
 
+
 class LinkdecrypterCom(Crypter):
     __name__ = "LinkdecrypterCom"
     __type__ = "crypter"
@@ -44,14 +45,16 @@ class LinkdecrypterCom(Crypter):
 
     def decryptAPI(self):
 
-        get_dict = { "t": "link", "url": self.pyfile.url, "lcache": "1" }
-        self.html = self.load('http://linkdecrypter.com/api', get = get_dict)
-        if self.html.startswith('http://'): return self.html.splitlines()
+        get_dict = {"t": "link", "url": self.pyfile.url, "lcache": "1"}
+        self.html = self.load('http://linkdecrypter.com/api', get=get_dict)
+        if self.html.startswith('http://'):
+            return self.html.splitlines()
 
         if self.html == 'INTERRUPTION(PASSWORD)':
             for get_dict['pass'] in self.passwords:
-                self.html = self.load('http://linkdecrypter.com/api', get= get_dict)
-                if self.html.startswith('http://'): return self.html.splitlines()
+                self.html = self.load('http://linkdecrypter.com/api', get=get_dict)
+                if self.html.startswith('http://'):
+                    return self.html.splitlines()
 
         self.logError('API', self.html)
         if self.html == 'INTERRUPTION(PASSWORD)':
@@ -63,12 +66,13 @@ class LinkdecrypterCom(Crypter):
 
         retries = 5
 
-        post_dict = { "link_cache": "on", "pro_links": self.pyfile.url, "modo_links": "text" }
+        post_dict = {"link_cache": "on", "pro_links": self.pyfile.url, "modo_links": "text"}
         self.html = self.load('http://linkdecrypter.com/', post=post_dict, cookies=True, decode=True)
 
         while self.passwords or retries:
             found = re.search(self.TEXTAREA_PATTERN, self.html, flags=re.DOTALL)
-            if found: return [ x for x in found.group(1).splitlines() if '[LINK-ERROR]' not in x ]
+            if found:
+                return [x for x in found.group(1).splitlines() if '[LINK-ERROR]' not in x]
 
             found = re.search(self.CAPTCHA_PATTERN, self.html)
             if found:
@@ -79,10 +83,10 @@ class LinkdecrypterCom(Crypter):
                 msg = found.group(1) if found else ""
                 self.logInfo("Captcha protected link", result_type, msg)
 
-                captcha = self.decryptCaptcha(captcha_url, result_type = result_type)
+                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}, decode=True)
                 retries -= 1
 
             elif self.PASSWORD_PATTERN in self.html:
diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py
index e2ee30731..b7a188e81 100644
--- a/module/plugins/crypter/LixIn.py
+++ b/module/plugins/crypter/LixIn.py
@@ -5,6 +5,7 @@ import re
 
 from module.plugins.Crypter import Crypter
 
+
 class LixIn(Crypter):
     __name__ = "LixIn"
     __type__ = "container"
@@ -13,25 +14,24 @@ class LixIn(Crypter):
     __description__ = """Lix.in Container Plugin"""
     __author_name__ = ("spoob")
     __author_mail__ = ("spoob@pyload.org")
-    
-    CAPTCHA_PATTERN='<img src="(?P<image>captcha_img.php\?.*?)"'
-    SUBMIT_PATTERN=r"value='continue.*?'"
-    LINK_PATTERN=r'name="ifram" src="(?P<link>.*?)"'
-    
+
+    CAPTCHA_PATTERN = '<img src="(?P<image>captcha_img.php\?.*?)"'
+    SUBMIT_PATTERN = r"value='continue.*?'"
+    LINK_PATTERN = r'name="ifram" src="(?P<link>.*?)"'
 
     def decrypt(self, pyfile):
         url = pyfile.url
-        
-        matches = re.search(self.__pattern__,url)
+
+        matches = re.search(self.__pattern__, url)
         if not matches:
             self.fail("couldn't identify file id")
-            
+
         id = matches.group("id")
         self.logDebug("File id is %s" % id)
-        
+
         self.html = self.req.load(url, decode=True)
-        
-        matches = re.search(self.SUBMIT_PATTERN,self.html)
+
+        matches = re.search(self.SUBMIT_PATTERN, self.html)
         if not matches:
             self.fail("link doesn't seem valid")
 
@@ -41,15 +41,15 @@ class LixIn(Crypter):
                 matches = re.search(self.CAPTCHA_PATTERN, self.html)
                 if matches:
                     self.logDebug("trying captcha")
-                    captcharesult = self.decryptCaptcha("http://lix.in/"+matches.group("image"))
-                self.html = self.req.load(url, decode=True, post={"capt" : captcharesult, "submit":"submit","tiny":id})
+                    captcharesult = self.decryptCaptcha("http://lix.in/" + matches.group("image"))
+                self.html = self.req.load(url, decode=True,
+                                          post={"capt": captcharesult, "submit": "submit", "tiny": id})
             else:
                 self.logDebug("no captcha/captcha solved")
                 break
         else:
-            self.html = self.req.load(url, decode=True, post={"submit" : "submit",
-                                                          "tiny"   : id})
-                                         
+            self.html = self.req.load(url, decode=True, post={"submit": "submit", "tiny": id})
+
         matches = re.search(self.LINK_PATTERN, self.html)
         if not matches:
             self.fail("can't find destination url")
diff --git a/module/plugins/crypter/LofCc.py b/module/plugins/crypter/LofCc.py
index 9c98c48a0..ec9cdaac6 100644
--- a/module/plugins/crypter/LofCc.py
+++ b/module/plugins/crypter/LofCc.py
@@ -2,12 +2,12 @@
 # -*- coding: utf-8 -*-
 
 import re
-from time import sleep
 from os.path import join
 
 from module.plugins.Crypter import Crypter
 from module.plugins.ReCaptcha import ReCaptcha
 
+
 class LofCc(Crypter):
     __name__ = "LofCc"
     __type__ = "container"
@@ -19,31 +19,33 @@ class LofCc(Crypter):
 
     def setup(self):
         self.multiDL = False
-    
+
     def decrypt(self, pyfile):
         html = self.req.load(self.pyfile.url, cookies=True)
-        
+
         m = re.search(r"src=\"http://www.google.com/recaptcha/api/challenge\?k=(.*?)\"></script>", html)
         if not m:
             self.offline()
-        
+
         recaptcha = ReCaptcha(self)
         challenge, code = recaptcha.challenge(m.group(1))
-        
-        resultHTML = self.req.load(self.pyfile.url, post={"recaptcha_challenge_field":challenge, "recaptcha_response_field":code}, cookies=True)
-        
+
+        resultHTML = self.req.load(self.pyfile.url,
+                                   post={"recaptcha_challenge_field": challenge, "recaptcha_response_field": code},
+                                   cookies=True)
+
         if re.search("class=\"error\"", resultHTML):
             self.retry()
-        
+
         self.correctCaptcha()
-        
-        dlc = self.req.load(self.pyfile.url+"/dlc", cookies=True)
-        
-        name = re.search(self.__pattern__, self.pyfile.url).group(1)+".dlc"
-        
+
+        dlc = self.req.load(self.pyfile.url + "/dlc", cookies=True)
+
+        name = re.search(self.__pattern__, self.pyfile.url).group(1) + ".dlc"
+
         dlcFile = join(self.config["general"]["download_folder"], name)
         f = open(dlcFile, "wb")
         f.write(dlc)
         f.close()
-        
+
         self.packages.append((self.pyfile.package().name, [dlcFile], self.pyfile.package().folder))
diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py
index ddd61379c..3709d3349 100644
--- a/module/plugins/crypter/MediafireComFolder.py
+++ b/module/plugins/crypter/MediafireComFolder.py
@@ -5,6 +5,7 @@ from module.plugins.Crypter import Crypter
 from module.plugins.hoster.MediafireCom import checkHTMLHeader
 from module.common.json_layer import json_loads
 
+
 class MediafireComFolder(Crypter):
     __name__ = "MediafireComFolder"
     __type__ = "crypter"
@@ -19,10 +20,10 @@ class MediafireComFolder(Crypter):
 
     def decrypt(self, pyfile):
         new_links = []
-        
+
         url, result = checkHTMLHeader(pyfile.url)
         self.logDebug('Location (%d): %s' % (result, url))
-            
+
         if result == 0:
             # load and parse html            
             html = self.load(pyfile.url)
@@ -33,23 +34,24 @@ class MediafireComFolder(Crypter):
             else:
                 # folder page
                 found = re.search(self.FOLDER_KEY_PATTERN, html)
-                if found:                               
+                if found:
                     folder_key = found.group(1)
                     self.logDebug("FOLDER KEY: %s" % folder_key)
-                    
-                    json_resp = json_loads(self.load("http://www.mediafire.com/api/folder/get_info.php?folder_key=%s&response_format=json&version=1" % folder_key))
+
+                    json_resp = json_loads(self.load(
+                        "http://www.mediafire.com/api/folder/get_info.php?folder_key=%s&response_format=json&version=1" % folder_key))
                     #self.logInfo(json_resp)
                     if json_resp['response']['result'] == "Success":
                         for link in json_resp['response']['folder_info']['files']:
-                            new_links.append("http://www.mediafire.com/file/%s" % link['quickkey'])            
+                            new_links.append("http://www.mediafire.com/file/%s" % link['quickkey'])
                     else:
                         self.fail(json_resp['response']['message'])
         elif result == 1:
-            self.offline()             
+            self.offline()
         else:
             new_links.append(url)
-    
+
         if new_links:
             self.core.files.addLinks(new_links, self.pyfile.package().id)
         else:
-            self.fail('Could not extract any links')
\ No newline at end of file
+            self.fail('Could not extract any links')
diff --git a/module/plugins/crypter/Movie2kTo.py b/module/plugins/crypter/Movie2kTo.py
index 097cb702e..92ec7211a 100644
--- a/module/plugins/crypter/Movie2kTo.py
+++ b/module/plugins/crypter/Movie2kTo.py
@@ -2,150 +2,159 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Crypter import Crypter
 from collections import defaultdict
 
+from module.plugins.Crypter import Crypter
+
+
 class Movie2kTo(Crypter):
-	__name__ = 'Movie2kTo'
-	__type__ = 'container'
-	__pattern__ = r'http://(?:www\.)?movie2k\.to/(.*)\.html'
-	__version__ = '0.5'
-	__config__ = [('accepted_hosters', 'str', 'List of accepted hosters', 'Xvidstage, Putlocker, '),
-				('dir_quality', 'bool', 'Show the quality of the footage in the folder name', 'True'),
-				('whole_season', 'bool', 'Download whole season', 'False'),
-				('everything', 'bool', 'Download everything', 'False'),
-				('firstN', 'int', 'Download the first N files for each episode (the first file is probably all you will need)', '1')]
-	__description__ = """Movie2k.to Container Plugin"""
-	__author_name__ = ('4Christopher')
-	__author_mail__ = ('4Christopher@gmx.de')
-	BASE_URL_PATTERN = r'http://(?:www\.)?movie2k\.to/'
-	TVSHOW_URL_PATH_PATTERN = r'tvshows-(?P<id>\d+?)-(?P<name>.+)'
-	FILM_URL_PATH_PATTERN = r'(?P<name>.+?)-(?:online-film|watch-movie)-(?P<id>\d+)'
-	SEASON_PATTERN = r'<div id="episodediv(\d+?)" style="display:(inline|none)">(.*?)</div>'
-	EP_PATTERN = r'<option value="(.+?)"( selected)?>Episode\s*?(\d+?)</option>'
-	BASE_URL = 'http://www.movie2k.to'
+    __name__ = 'Movie2kTo'
+    __type__ = 'container'
+    __pattern__ = r'http://(?:www\.)?movie2k\.to/(.*)\.html'
+    __version__ = '0.5'
+    __config__ = [('accepted_hosters', 'str', 'List of accepted hosters', 'Xvidstage, Putlocker, '),
+                  ('dir_quality', 'bool', 'Show the quality of the footage in the folder name', 'True'),
+                  ('whole_season', 'bool', 'Download whole season', 'False'),
+                  ('everything', 'bool', 'Download everything', 'False'),
+                  ('firstN', 'int',
+                   'Download the first N files for each episode (the first file is probably all you will need)', '1')]
+    __description__ = """Movie2k.to Container Plugin"""
+    __author_name__ = ('4Christopher')
+    __author_mail__ = ('4Christopher@gmx.de')
+    BASE_URL_PATTERN = r'http://(?:www\.)?movie2k\.to/'
+    TVSHOW_URL_PATH_PATTERN = r'tvshows-(?P<id>\d+?)-(?P<name>.+)'
+    FILM_URL_PATH_PATTERN = r'(?P<name>.+?)-(?:online-film|watch-movie)-(?P<id>\d+)'
+    SEASON_PATTERN = r'<div id="episodediv(\d+?)" style="display:(inline|none)">(.*?)</div>'
+    EP_PATTERN = r'<option value="(.+?)"( selected)?>Episode\s*?(\d+?)</option>'
+    BASE_URL = 'http://www.movie2k.to'
 
-	def decrypt(self, pyfile):
-		self.package = pyfile.package()
-		self.folder = self.package.folder
-		self.qStatReset()
-		whole_season = self.getConfig('whole_season')
-		everything = self.getConfig('everything')
-		self.getInfo(pyfile.url)
+    def decrypt(self, pyfile):
+        self.package = pyfile.package()
+        self.folder = self.package.folder
+        self.qStatReset()
+        whole_season = self.getConfig('whole_season')
+        everything = self.getConfig('everything')
+        self.getInfo(pyfile.url)
 
-		if (whole_season or everything) and self.format == 'tvshow':
-			self.logDebug('Downloading the whole season')
-			for season, season_sel, html in re.findall(self.SEASON_PATTERN, self.html, re.DOTALL | re.I):
-				if (season_sel == 'inline') or everything:
-					season_links = []
-					for url_path, ep_sel, ep in re.findall(self.EP_PATTERN, html, re.I):
-						season_name = self.name_tvshow(season, ep)
-						self.logDebug('%s: %s' % (season_name, url_path))
-						if ep_sel and (season_sel == 'inline'):
-							self.logDebug('%s selected (in the start URL: %s)' % (season_name, pyfile.url))
-							season_links += self.getInfoAndLinks('%s/%s' % (self.BASE_URL, url_path))
-						elif (whole_season and (season_sel == 'inline')) or everything:
-							season_links += self.getInfoAndLinks('%s/%s' % (self.BASE_URL, url_path))
+        if (whole_season or everything) and self.format == 'tvshow':
+            self.logDebug('Downloading the whole season')
+            for season, season_sel, html in re.findall(self.SEASON_PATTERN, self.html, re.DOTALL | re.I):
+                if (season_sel == 'inline') or everything:
+                    season_links = []
+                    for url_path, ep_sel, ep in re.findall(self.EP_PATTERN, html, re.I):
+                        season_name = self.name_tvshow(season, ep)
+                        self.logDebug('%s: %s' % (season_name, url_path))
+                        if ep_sel and (season_sel == 'inline'):
+                            self.logDebug('%s selected (in the start URL: %s)' % (season_name, pyfile.url))
+                            season_links += self.getInfoAndLinks('%s/%s' % (self.BASE_URL, url_path))
+                        elif (whole_season and (season_sel == 'inline')) or everything:
+                            season_links += self.getInfoAndLinks('%s/%s' % (self.BASE_URL, url_path))
 
-					self.logDebug(season_links)
-					folder = '%s: Season %s' % (self.name, season)
-					name = '%s%s' % (folder, self.qStat())
-					self.packages.append((name, season_links, folder))
-					self.qStatReset()
-		else:
-			links = self.getLinks()
-			name = '%s%s' % (self.package.name, self.qStat())
-			self.packages.append((name, links , self.package.folder))
+                    self.logDebug(season_links)
+                    folder = '%s: Season %s' % (self.name, season)
+                    name = '%s%s' % (folder, self.qStat())
+                    self.packages.append((name, season_links, folder))
+                    self.qStatReset()
+        else:
+            links = self.getLinks()
+            name = '%s%s' % (self.package.name, self.qStat())
+            self.packages.append((name, links, self.package.folder))
 
-	def qStat(self):
-		if len(self.q) == 0: return ''
-		if not self.getConfig('dir_quality'): return ''
-		if len(self.q) == 1: return (' (Quality: %d, max (all hosters): %d)' % (self.q[0], self.max_q))
-		return (' (Average quality: %d, min: %d, max: %d, %s, max (all hosters): %d)'
-			% (sum(self.q) / float(len(self.q)), min(self.q), max(self.q), self.q, self.max_q))
+    def qStat(self):
+        if len(self.q) == 0:
+            return ''
+        if not self.getConfig('dir_quality'):
+            return ''
+        if len(self.q) == 1:
+            return ' (Quality: %d, max (all hosters): %d)' % (self.q[0], self.max_q)
+        return (' (Average quality: %d, min: %d, max: %d, %s, max (all hosters): %d)'
+                % (sum(self.q) / float(len(self.q)), min(self.q), max(self.q), self.q, self.max_q))
 
-	def qStatReset(self):
-		self.q = []		## to calculate the average, min and max of the quality
-		self.max_q = None	## maximum quality of all hosters
+    def qStatReset(self):
+        self.q = []  # to calculate the average, min and max of the quality
+        self.max_q = None  # maximum quality of all hosters
 
-	def tvshow_number(self, number):
-		if int(number) < 10:
-			return '0%s' % number
-		else:
-			return number
+    def tvshow_number(self, number):
+        if int(number) < 10:
+            return '0%s' % number
+        else:
+            return number
 
-	def name_tvshow(self, season, ep):
-		return '%s S%sE%s' % (self.name, self.tvshow_number(season), self.tvshow_number(ep))
+    def name_tvshow(self, season, ep):
+        return '%s S%sE%s' % (self.name, self.tvshow_number(season), self.tvshow_number(ep))
 
-	def getInfo(self, url):
-		self.html = self.load(url)
-		self.url_path = re.match(self.__pattern__, url).group(1)
-		self.format = pattern_re = None
-		if re.match(r'tvshows', self.url_path):
-			self.format = 'tvshow'
-			pattern_re = re.search(self.TVSHOW_URL_PATH_PATTERN, self.url_path)
-		elif re.search(self.FILM_URL_PATH_PATTERN, self.url_path):
-			self.format = 'film'
-			pattern_re = re.search(self.FILM_URL_PATH_PATTERN, self.url_path)
-		self.name = pattern_re.group('name')
-		self.id = pattern_re.group('id')
-		self.logDebug('URL Path: %s (ID: %s, Name: %s, Format: %s)'
-			% (self.url_path, self.id, self.name, self.format))
+    def getInfo(self, url):
+        self.html = self.load(url)
+        self.url_path = re.match(self.__pattern__, url).group(1)
+        self.format = pattern_re = None
+        if re.match(r'tvshows', self.url_path):
+            self.format = 'tvshow'
+            pattern_re = re.search(self.TVSHOW_URL_PATH_PATTERN, self.url_path)
+        elif re.search(self.FILM_URL_PATH_PATTERN, self.url_path):
+            self.format = 'film'
+            pattern_re = re.search(self.FILM_URL_PATH_PATTERN, self.url_path)
+        self.name = pattern_re.group('name')
+        self.id = pattern_re.group('id')
+        self.logDebug('URL Path: %s (ID: %s, Name: %s, Format: %s)'
+                      % (self.url_path, self.id, self.name, self.format))
 
-	def getInfoAndLinks(self, url):
-		self.getInfo(url)
-		return self.getLinks()
+    def getInfoAndLinks(self, url):
+        self.getInfo(url)
+        return self.getLinks()
 
-	## This function returns the links for one episode as list
-	def getLinks(self):
-		accepted_hosters = re.findall(r'\b(\w+?)\b', self.getConfig('accepted_hosters'))
-		firstN = self.getConfig('firstN')
-		links = []
-		re_quality = re.compile(r'.+?Quality:.+?smileys/(\d)\.gif')
-		## The quality is one digit. 0 is the worst and 5 is the best.
-		## Is not always there …
-		re_hoster_id_js = re.compile(r'links\[(\d+?)\].+&nbsp;(.+?)</a>(.+?)</tr>')
-		re_hoster_id_html = re.compile(r'(?:<td height|<tr id).+?<a href=".*?(\d{7}).*?".+?&nbsp;([^<>]+?)</a>(.+?)</tr>')
-		## I assume that the ID is 7 digits longs
-		count = defaultdict(int)
-		matches = re_hoster_id_html.findall(self.html)
-		matches += re_hoster_id_js.findall(self.html)
-		# self.logDebug(matches)
-		## h_id: hoster_id of a possible hoster
-		for h_id, hoster, q_html in matches:
-			match_q = re_quality.search(q_html)
-			if match_q:
-				quality = int(match_q.group(1))
-				if self.max_q == None:
-					self.max_q = quality
-				else:
-					if self.max_q < quality: self.max_q = quality
-				q_s = ', Quality: %d' % quality
-			else:
-				q_s = ', unknown quality'
-			if hoster in accepted_hosters:
-				self.logDebug('Accepted: %s, ID: %s%s' % (hoster, h_id, q_s))
-				count[hoster] += 1
-				if count[hoster] <= firstN:
-					if match_q: self.q.append(quality)
-					if h_id != self.id:
-						self.html = self.load('%s/tvshows-%s-%s.html' % (self.BASE_URL, h_id, self.name))
-					else:
-						self.logDebug('This is already the right ID')
-					# The iframe tag must continue with a width. There where
-					# two iframes in the site and I try to make sure that it
-					# matches the right one. This is not (yet) nessesary
-					# because the right iframe happens to be the first iframe.
-					for pattern in (r'<a target="_blank" href="(http://[^"]*?)"', r'<iframe src="(http://[^"]*?)" width'):
-						try:
-							url = re.search(pattern, self.html).group(1)
-						except:
-							self.logDebug('Failed to find the URL (pattern %s)' % pattern)
-						else:
-							self.logDebug('id: %s, %s: %s' % (h_id, hoster, url))
-							links.append(url)
-							break
-			else:
-				self.logDebug('Not accepted: %s, ID: %s%s' % (hoster, h_id, q_s))
-		# self.logDebug(links)
-		return links
+    ## This function returns the links for one episode as list
+    def getLinks(self):
+        accepted_hosters = re.findall(r'\b(\w+?)\b', self.getConfig('accepted_hosters'))
+        firstN = self.getConfig('firstN')
+        links = []
+        re_quality = re.compile(r'.+?Quality:.+?smileys/(\d)\.gif')
+        ## The quality is one digit. 0 is the worst and 5 is the best.
+        ## Is not always there …
+        re_hoster_id_js = re.compile(r'links\[(\d+?)\].+&nbsp;(.+?)</a>(.+?)</tr>')
+        re_hoster_id_html = re.compile(
+            r'(?:<td height|<tr id).+?<a href=".*?(\d{7}).*?".+?&nbsp;([^<>]+?)</a>(.+?)</tr>')
+        ## I assume that the ID is 7 digits longs
+        count = defaultdict(int)
+        matches = re_hoster_id_html.findall(self.html)
+        matches += re_hoster_id_js.findall(self.html)
+        # self.logDebug(matches)
+        ## h_id: hoster_id of a possible hoster
+        for h_id, hoster, q_html in matches:
+            match_q = re_quality.search(q_html)
+            if match_q:
+                quality = int(match_q.group(1))
+                if self.max_q == None:
+                    self.max_q = quality
+                else:
+                    if self.max_q < quality:
+                        self.max_q = quality
+                q_s = ', Quality: %d' % quality
+            else:
+                q_s = ', unknown quality'
+            if hoster in accepted_hosters:
+                self.logDebug('Accepted: %s, ID: %s%s' % (hoster, h_id, q_s))
+                count[hoster] += 1
+                if count[hoster] <= firstN:
+                    if match_q: self.q.append(quality)
+                    if h_id != self.id:
+                        self.html = self.load('%s/tvshows-%s-%s.html' % (self.BASE_URL, h_id, self.name))
+                    else:
+                        self.logDebug('This is already the right ID')
+                    # The iframe tag must continue with a width. There where
+                    # two iframes in the site and I try to make sure that it
+                    # matches the right one. This is not (yet) nessesary
+                    # because the right iframe happens to be the first iframe.
+                    for pattern in (r'<a target="_blank" href="(http://[^"]*?)"',
+                                    r'<iframe src="(http://[^"]*?)" width'):
+                        try:
+                            url = re.search(pattern, self.html).group(1)
+                        except:
+                            self.logDebug('Failed to find the URL (pattern %s)' % pattern)
+                        else:
+                            self.logDebug('id: %s, %s: %s' % (h_id, hoster, url))
+                            links.append(url)
+                            break
+            else:
+                self.logDebug('Not accepted: %s, ID: %s%s' % (hoster, h_id, q_s))
+        # self.logDebug(links)
+        return links
diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py
index 2c71b8fea..055d72375 100644
--- a/module/plugins/crypter/MultiloadCz.py
+++ b/module/plugins/crypter/MultiloadCz.py
@@ -3,6 +3,7 @@
 import re
 from module.plugins.Crypter import Crypter
 
+
 class MultiloadCz(Crypter):
     __name__ = "MultiloadCz"
     __type__ = "crypter"
@@ -10,7 +11,7 @@ class MultiloadCz(Crypter):
     __version__ = "0.4"
     __description__ = """multiload.cz"""
     __config__ = [("usedHoster", "str", "Prefered hoster list (bar-separated) ", ""),
-        ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")]
+                  ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")]
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
@@ -38,4 +39,4 @@ class MultiloadCz(Crypter):
         if new_links:
             self.core.files.addLinks(new_links, self.pyfile.package().id)
         else:
-            self.fail('Could not extract any links')
\ No newline at end of file
+            self.fail('Could not extract any links')
diff --git a/module/plugins/crypter/MultiuploadCom.py b/module/plugins/crypter/MultiuploadCom.py
index bf5540982..111ecdf6c 100644
--- a/module/plugins/crypter/MultiuploadCom.py
+++ b/module/plugins/crypter/MultiuploadCom.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 
 import re
+from time import time
+
 from module.plugins.Crypter import Crypter
 from module.common.json_layer import json_loads
-from time import time
+
 
 class MultiuploadCom(Crypter):
     __name__ = "MultiuploadCom"
@@ -12,7 +14,7 @@ class MultiuploadCom(Crypter):
     __version__ = "0.01"
     __description__ = """MultiUpload.com crypter"""
     __config__ = [("preferedHoster", "str", "Prefered hoster list (bar-separated) ", "multiupload"),
-        ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")]
+                  ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")]
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
@@ -22,37 +24,41 @@ class MultiuploadCom(Crypter):
         self.html = self.load(pyfile.url)
         found = re.search(self.ML_LINK_PATTERN, self.html)
         ml_url = found.group(1) if found else None
-        
-        json_list = json_loads(self.load("http://multiupload.com/progress/", get = {
+
+        json_list = json_loads(self.load("http://multiupload.com/progress/", get={
             "d": re.search(self.__pattern__, pyfile.url).group(1),
-            "r": str(int(time()*1000))        
-            }))
+            "r": str(int(time() * 1000))
+        }))
         new_links = []
-               
-        prefered_set = map(lambda s: s.lower().split('.')[0], set(self.getConfig("preferedHoster").split('|')))       
-        
-        if ml_url and 'multiupload' in prefered_set: new_links.append(ml_url)               
-        
-        for link in json_list:          
+
+        prefered_set = map(lambda s: s.lower().split('.')[0], set(self.getConfig("preferedHoster").split('|')))
+
+        if ml_url and 'multiupload' in prefered_set:
+            new_links.append(ml_url)
+
+        for link in json_list:
             if link['service'].lower() in prefered_set and int(link['status']) and not int(link['deleted']):
                 url = self.getLocation(link['url'])
-                if url: new_links.append(url)        
+                if url:
+                    new_links.append(url)
 
-        if not new_links:                    
+        if not new_links:
             ignored_set = map(lambda s: s.lower().split('.')[0], set(self.getConfig("ignoredHoster").split('|')))
-            
-            if 'multiupload' not in ignored_set: new_links.append(ml_url)                   
-        
-            for link in json_list:         
+
+            if 'multiupload' not in ignored_set:
+                new_links.append(ml_url)
+
+            for link in json_list:
                 if link['service'].lower() not in ignored_set and int(link['status']) and not int(link['deleted']):
                     url = self.getLocation(link['url'])
-                    if url: new_links.append(url)
+                    if url:
+                        new_links.append(url)
 
         if new_links:
             self.core.files.addLinks(new_links, self.pyfile.package().id)
         else:
             self.fail('Could not extract any links')
-            
+
     def getLocation(self, url):
-        header = self.load(url, just_header = True)
-        return header['location'] if "location" in header else None     
\ No newline at end of file
+        header = self.load(url, just_header=True)
+        return header['location'] if "location" in header else None
diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py
index 821636821..6e0c35e92 100644
--- a/module/plugins/crypter/NCryptIn.py
+++ b/module/plugins/crypter/NCryptIn.py
@@ -1,17 +1,19 @@
 # -*- coding: utf-8 -*-
 
-from Crypto.Cipher import AES
-from module.plugins.Crypter import Crypter
-from module.plugins.ReCaptcha import ReCaptcha
 import base64
 import binascii
 import re
 
+from Crypto.Cipher import AES
+from module.plugins.Crypter import Crypter
+from module.plugins.ReCaptcha import ReCaptcha
+
+
 class NCryptIn(Crypter):
     __name__ = "NCryptIn"
     __type__ = "crypter"
     __pattern__ = r"http://(?:www\.)?ncrypt.in/folder-([^/\?]+)"
-    __version__ = "1.22"
+    __version__ = "1.23"
     __description__ = """NCrypt.in Crypter Plugin"""
     __author_name__ = ("fragonib")
     __author_mail__ = ("fragonib[AT]yahoo[DOT]es")
@@ -19,7 +21,7 @@ class NCryptIn(Crypter):
     # Constants
     _JK_KEY_ = "jk"
     _CRYPTED_KEY_ = "crypted"
-        
+
     def setup(self):
         self.html = None
         self.cleanedHtml = None
@@ -27,16 +29,16 @@ class NCryptIn(Crypter):
         self.package = None
 
     def decrypt(self, pyfile):
-        
+
         # Init
         self.package = pyfile.package()
-        
+
         # Request package
         self.html = self.load(self.pyfile.url)
         self.cleanedHtml = self.removeCrap(self.html)
         if not self.isOnline():
             self.offline()
-        
+
         # Check for protection    
         if self.isProtected():
             self.html = self.unlockProtection()
@@ -50,13 +52,13 @@ class NCryptIn(Crypter):
         package_links = []
         package_links.extend(self.handleWebLinks())
         package_links.extend(self.handleContainers())
-        package_links.extend(self.handleCNL2()) 
+        package_links.extend(self.handleCNL2())
         package_links = self.removeContainers(package_links)
         package_links = set(package_links)
 
         # Pack
         self.packages = [(package_name, package_links, folder_name)]
-        
+
     def removeCrap(self, content):
         patterns = (r'(type="hidden".*?(name=".*?")?.*?value=".*?")',
                     r'display:none;">(.*?)</(div|span)>',
@@ -67,8 +69,8 @@ class NCryptIn(Crypter):
             content = re.sub(rexpr, "", content)
         return content
 
-    def removeContainers(self,package_links):
-        tmp_package_links = package_links[:]      
+    def removeContainers(self, package_links):
+        tmp_package_links = package_links[:]
         for link in tmp_package_links:
             self.logDebug(link)
             if ".dlc" in link or ".ccf" in link or ".rsdf" in link:
@@ -80,18 +82,18 @@ class NCryptIn(Crypter):
         else:
             return tmp_package_links
 
-    def isOnline(self):        
+    def isOnline(self):
         if "Your folder does not exist" in self.cleanedHtml:
             self.logDebug("File not found")
             return False
         return True
-    
+
     def isProtected(self):
         if re.search(r'''<form.*?name.*?protected.*?>''', self.cleanedHtml):
             self.logDebug("Links are protected")
             return True
         return False
-    
+
     def getPackageInfo(self):
         title_re = r'<h2><span.*?class="arrow".*?>(?P<title>[^<]+).*?</span>.*?</h2>'
         m = re.findall(title_re, self.html, re.DOTALL)
@@ -104,19 +106,19 @@ class NCryptIn(Crypter):
             folder = self.package.folder
             self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder))
         return name, folder
-    
+
     def unlockProtection(self):
-        
+
         postData = {}
-                
-        form = re.search(r'''<form\ name="protected"(.*?)</form>''', self.cleanedHtml, re.DOTALL).group(1)
-        
+
+        form = re.search(r'<form name="protected"(.*?)</form>', self.cleanedHtml, re.DOTALL).group(1)
+
         # Submit package password
         if "password" in form:
             password = self.getPassword()
             self.logDebug("Submitting password [%s] for protected links" % password)
             postData['password'] = password
-        
+
         # Resolve anicaptcha
         if "anicaptcha" in form:
             self.captcha = True
@@ -125,10 +127,10 @@ class NCryptIn(Crypter):
             captcha = self.decryptCaptcha("http://ncrypt.in" + captchaUri)
             self.logDebug("Captcha resolved [%s]" % captcha)
             postData['captcha'] = captcha
-        
+
         # Resolve recaptcha           
         if "recaptcha" in form:
-            self.captcha = True    
+            self.captcha = True
             id = re.search(r'\?k=(.*?)"', form).group(1)
             self.logDebug("Resolving ReCaptcha with key [%s]" % id)
             recaptcha = ReCaptcha(self)
@@ -148,18 +150,17 @@ class NCryptIn(Crypter):
             postData['circle.x'] = coords[0]
             postData['circle.y'] = coords[1]
 
-                   
         # Unlock protection
         postData['submit_protected'] = 'Continue to folder '
         return self.load(self.pyfile.url, post=postData)
-        
+
     def handleErrors(self):
-                   
+
         if "This password is invalid!" in self.cleanedHtml:
             self.logDebug("Incorrect password, please set right password on 'Edit package' form and retry")
-            self.fail("Incorrect password, please set right password on 'Edit package' form and retry")  
+            self.fail("Incorrect password, please set right password on 'Edit package' form and retry")
 
-        if self.captcha:          
+        if self.captcha:
             if "The securitycheck was wrong!" in self.cleanedHtml:
                 self.logDebug("Invalid captcha, retrying")
                 self.invalidCaptcha()
@@ -170,24 +171,24 @@ class NCryptIn(Crypter):
     def handleWebLinks(self):
         package_links = []
         self.logDebug("Handling Web links")
-        
+
         pattern = r"(http://ncrypt\.in/link-.*?=)"
         links = re.findall(pattern, self.html)
         self.logDebug("Decrypting %d Web links" % len(links))
         for i, link in enumerate(links):
-            self.logDebug("Decrypting Web link %d, %s" % (i+1, link))
+            self.logDebug("Decrypting Web link %d, %s" % (i + 1, link))
             try:
                 url = link.replace("link-", "frame-")
                 link = self.load(url, just_header=True)['location']
                 package_links.append(link)
             except Exception, detail:
-                self.logDebug("Error decrypting Web link %s, %s" % (link, detail))    
+                self.logDebug("Error decrypting Web link %s, %s" % (link, detail))
         return package_links
-    
+
     def handleContainers(self):
         package_links = []
         self.logDebug("Handling Container links")
-        
+
         pattern = r"/container/(rsdf|dlc|ccf)/([a-z0-9]+)"
         containersLinks = re.findall(pattern, self.html)
         self.logDebug("Decrypting %d Container links" % len(containersLinks))
@@ -195,30 +196,30 @@ class NCryptIn(Crypter):
             link = "http://ncrypt.in/container/%s/%s.%s" % (containerLink[0], containerLink[1], containerLink[0])
             package_links.append(link)
         return package_links
-                
+
     def handleCNL2(self):
         package_links = []
         self.logDebug("Handling CNL2 links")
-        
+
         if 'cnl2_output' in self.cleanedHtml:
             try:
                 (vcrypted, vjk) = self._getCipherParams()
                 for (crypted, jk) in zip(vcrypted, vjk):
                     package_links.extend(self._getLinks(crypted, jk))
             except:
-                self.fail("Unable to decrypt CNL2 links")            
+                self.fail("Unable to decrypt CNL2 links")
         return package_links
-    
+
     def _getCipherParams(self):
-            
-        pattern = r'<input.*?name="%s".*?value="(.*?)"'    
-            
+
+        pattern = r'<input.*?name="%s".*?value="(.*?)"'
+
         # Get jk
-        jk_re = pattern % NCryptIn._JK_KEY_       
+        jk_re = pattern % NCryptIn._JK_KEY_
         vjk = re.findall(jk_re, self.html)
-        
+
         # Get crypted
-        crypted_re = pattern % NCryptIn._CRYPTED_KEY_      
+        crypted_re = pattern % NCryptIn._CRYPTED_KEY_
         vcrypted = re.findall(crypted_re, self.html)
 
         # Log and return
diff --git a/module/plugins/crypter/OneKhDe.py b/module/plugins/crypter/OneKhDe.py
index c77203187..a2e6d039e 100644
--- a/module/plugins/crypter/OneKhDe.py
+++ b/module/plugins/crypter/OneKhDe.py
@@ -6,6 +6,7 @@ import re
 from module.unescape import unescape
 from module.plugins.Crypter import Crypter
 
+
 class OneKhDe(Crypter):
     __name__ = "OneKhDe"
     __type__ = "container"
@@ -31,6 +32,7 @@ class OneKhDe(Crypter):
         temp_links = []
         link_ids = re.findall(r"<a id=\"DownloadLink_(\d*)\" href=\"http://1kh.de/", self.html)
         for id in link_ids:
-            new_link = unescape(re.search("width=\"100%\" src=\"(.*)\"></iframe>", self.req.load("http://1kh.de/l/" + id)).group(1))
+            new_link = unescape(
+                re.search("width=\"100%\" src=\"(.*)\"></iframe>", self.req.load("http://1kh.de/l/" + id)).group(1))
             temp_links.append(new_link)
         self.links = temp_links
diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py
index 57b273163..f6637033b 100755
--- a/module/plugins/crypter/OronComFolder.py
+++ b/module/plugins/crypter/OronComFolder.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 
-import re 
+import re
 
 from module.plugins.Crypter import Crypter
 
+
 class OronComFolder(Crypter):
     __name__ = "OronComFolder"
     __type__ = "crypter"
@@ -22,10 +23,11 @@ class OronComFolder(Crypter):
         new_links = []
 
         folder = re.search(self.FOLDER_PATTERN, html, re.DOTALL)
-        if folder is None: self.fail("Parse error (FOLDER)")
-        
+        if folder is None:
+            self.fail("Parse error (FOLDER)")
+
         new_links.extend(re.findall(self.LINK_PATTERN, folder.group(0)))
-        
+
         if new_links:
             self.core.files.addLinks(new_links, self.pyfile.package().id)
         else:
diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py
index 6cb049935..18ac68eec 100644
--- a/module/plugins/crypter/QuickshareCzFolder.py
+++ b/module/plugins/crypter/QuickshareCzFolder.py
@@ -3,6 +3,7 @@
 import re
 from module.plugins.Crypter import Crypter
 
+
 class QuickshareCzFolder(Crypter):
     __name__ = "QuickshareCzFolder"
     __type__ = "crypter"
@@ -12,16 +13,16 @@ class QuickshareCzFolder(Crypter):
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
-    
     FOLDER_PATTERN = r'<textarea[^>]*>(.*?)</textarea>'
     LINK_PATTERN = r'(http://www.quickshare.cz/\S+)'
 
     def decrypt(self, pyfile):
         html = self.load(self.pyfile.url)
 
-        new_links = []      
+        new_links = []
         found = re.search(self.FOLDER_PATTERN, html, re.DOTALL)
-        if found is None: self.fail("Parse error (FOLDER)")
+        if found is None:
+            self.fail("Parse error (FOLDER)")
         new_links.extend(re.findall(self.LINK_PATTERN, found.group(1)))
 
         if new_links:
diff --git a/module/plugins/crypter/RSLayerCom.py b/module/plugins/crypter/RSLayerCom.py
index 6e4266f2e..6a1f86657 100644
--- a/module/plugins/crypter/RSLayerCom.py
+++ b/module/plugins/crypter/RSLayerCom.py
@@ -7,6 +7,7 @@ from module.plugins.Crypter import Crypter
 from module.lib.BeautifulSoup import BeautifulSoup
 from module.unescape import unescape
 
+
 class RSLayerCom(Crypter):
     __name__ = "RSLayerCom"
     __type__ = "container"
diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py
index 8f29a9158..104968e06 100644
--- a/module/plugins/crypter/RelinkUs.py
+++ b/module/plugins/crypter/RelinkUs.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 
-from Crypto.Cipher import AES
-from module.plugins.Crypter import Crypter
 import base64
 import binascii
 import re
 import os
 
+from Crypto.Cipher import AES
+from module.plugins.Crypter import Crypter
+
 
 class RelinkUs(Crypter):
     __name__ = "RelinkUs"
@@ -27,45 +28,44 @@ class RelinkUs(Crypter):
     CAPTCHA_TOKEN = "container_captcha.php"
     CAPTCHA_ERROR_ROKEN = "You have solved the captcha wrong"
     CAPTCHA_IMG_URL = "http://www.relink.us/core/captcha/circlecaptcha.php"
-    CAPTCHA_SUBMIT_URL = "http://www.relink.us/container_captcha.php" 
+    CAPTCHA_SUBMIT_URL = "http://www.relink.us/container_captcha.php"
     FILE_TITLE_REGEX = r"<th>Title</th><td><i>(.*)</i></td></tr>"
     FILE_NOTITLE = 'No title'
-        
+
     CNL2_FORM_REGEX = r'<form id="cnl_form-(.*?)</form>'
     CNL2_FORMINPUT_REGEX = r'<input.*?name="%s".*?value="(.*?)"'
     CNL2_JK_KEY = "jk"
     CNL2_CRYPTED_KEY = "crypted"
     DLC_LINK_REGEX = r'<a href=".*?" class="dlc_button" target="_blank">'
-    DLC_DOWNLOAD_URL = "http://www.relink.us/download.php" 
-    WEB_FORWARD_REGEX = r"getFile\('(?P<link>.+)'\)";
-    WEB_FORWARD_URL = "http://www.relink.us/frame.php" 
+    DLC_DOWNLOAD_URL = "http://www.relink.us/download.php"
+    WEB_FORWARD_REGEX = r"getFile\('(?P<link>.+)'\)"
+    WEB_FORWARD_URL = "http://www.relink.us/frame.php"
     WEB_LINK_REGEX = r'<iframe name="Container" height="100%" frameborder="no" width="100%" src="(?P<link>.+)"></iframe>'
-    
-    
+
     def setup(self):
         self.fileid = None
         self.package = None
         self.password = None
         self.html = None
         self.captcha = False
-        
+
     def decrypt(self, pyfile):
 
         # Init
         self.initPackage(pyfile)
-        
+
         # Request package
         self.requestPackage()
-        
+
         # Check for online
         if not self.isOnline():
             self.offline()
-        
+
         # Check for protection    
         if self.isPasswordProtected():
             self.unlockPasswordProtection()
             self.handleErrors()
-            
+
         if self.isCaptchaProtected():
             self.captcha = True
             self.unlockCaptchaProtection()
@@ -95,38 +95,38 @@ class RelinkUs(Crypter):
         self.url = pyfile.url
 
     def requestPackage(self):
-        self.html = self.load(self.url, decode = True)
+        self.html = self.load(self.url, decode=True)
 
     def isOnline(self):
         if self.OFFLINE_TOKEN in self.html:
             self.logDebug("File not found")
             return False
         return True
-    
+
     def isPasswordProtected(self):
         if self.PASSWORD_TOKEN in self.html:
             self.logDebug("Links are password protected")
             return True
-        
+
     def isCaptchaProtected(self):
         if self.CAPTCHA_TOKEN in self.html:
             self.logDebug("Links are captcha protected")
             return True
         return False
-        
+
     def unlockPasswordProtection(self):
         self.logDebug("Submitting password [%s] for protected links" % self.password)
         passwd_url = self.PASSWORD_SUBMIT_URL + "?id=%s" % self.fileid
-        passwd_data = { 'id': self.fileid, 'password': self.password, 'pw': 'submit' }
+        passwd_data = {'id': self.fileid, 'password': self.password, 'pw': 'submit'}
         self.html = self.load(passwd_url, post=passwd_data, decode=True)
-            
+
     def unlockCaptchaProtection(self):
         self.logDebug("Request user positional captcha resolving")
         captcha_img_url = self.CAPTCHA_IMG_URL + "?id=%s" % self.fileid
         coords = self.decryptCaptcha(captcha_img_url, forceUser=True, imgtype="png", result_type='positional')
         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' }
+        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)
 
     def getPackageInfo(self):
@@ -139,30 +139,30 @@ class RelinkUs(Crypter):
             if not self.FILE_NOTITLE in title:
                 name = folder = title
                 self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder))
-                
+
         # Fallback to defaults
         if not name or not folder:
             name = self.package.name
             folder = self.package.folder
             self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder))
-            
+
         # Return package info 
-        return name, folder 
-    
-    def handleErrors(self):      
+        return name, folder
+
+    def handleErrors(self):
         if self.PASSWORD_ERROR_ROKEN in self.html:
             msg = "Incorrect password, please set right password on 'Edit package' form and retry"
             self.logDebug(msg)
-            self.fail(msg)  
+            self.fail(msg)
 
-        if self.captcha:          
+        if self.captcha:
             if self.CAPTCHA_ERROR_ROKEN in self.html:
                 self.logDebug("Invalid captcha, retrying")
                 self.invalidCaptcha()
                 self.retry()
             else:
                 self.correctCaptcha()
-           
+
     def handleLinkSource(self, source):
         if source == 'cnl2':
             return self.handleCNL2Links()
@@ -172,7 +172,7 @@ class RelinkUs(Crypter):
             return self.handleWEBLinks()
         else:
             self.fail('Unknown source [%s] (this is probably a bug)' % source)
-            
+
     def handleCNL2Links(self):
         self.logDebug("Search for CNL2 links")
         package_links = []
@@ -186,13 +186,13 @@ class RelinkUs(Crypter):
             except:
                 self.logDebug("Unable to decrypt CNL2 links")
         return package_links
-    
+
     def handleDLCLinks(self):
         self.logDebug('Search for DLC links')
         package_links = []
         m = re.search(self.DLC_LINK_REGEX, self.html)
         if m is not None:
-            container_url = self.DLC_DOWNLOAD_URL + "?id=%s&dlc=1" % self.fileid 
+            container_url = self.DLC_DOWNLOAD_URL + "?id=%s&dlc=1" % self.fileid
             self.logDebug("Downloading DLC container link [%s]" % container_url)
             try:
                 dlc = self.load(container_url)
@@ -203,7 +203,7 @@ class RelinkUs(Crypter):
                 f.close()
                 package_links.append(dlc_filepath)
             except:
-                self.logDebug("Unable to download DLC container")    
+                self.logDebug("Unable to download DLC container")
         return package_links
 
     def handleWEBLinks(self):
@@ -214,7 +214,7 @@ class RelinkUs(Crypter):
         for index, fw_param in enumerate(fw_params):
             try:
                 fw_url = self.WEB_FORWARD_URL + "?%s" % fw_param
-                self.logDebug("Decrypting Web link %d, %s" % (index+1, fw_url))
+                self.logDebug("Decrypting Web link %d, %s" % (index + 1, fw_url))
                 fw_response = self.load(fw_url, decode=True)
                 dl_link = re.search(self.WEB_LINK_REGEX, fw_response).group('link')
                 package_links.append(dl_link)
@@ -223,15 +223,15 @@ class RelinkUs(Crypter):
             self.setWait(4)
             self.wait()
         return package_links
-    
+
     def _getCipherParams(self, cnl2_form):
-            
+
         # Get jk
-        jk_re = self.CNL2_FORMINPUT_REGEX % self.CNL2_JK_KEY       
+        jk_re = self.CNL2_FORMINPUT_REGEX % self.CNL2_JK_KEY
         vjk = re.findall(jk_re, cnl2_form, re.IGNORECASE)
-        
+
         # Get crypted
-        crypted_re = self.CNL2_FORMINPUT_REGEX % RelinkUs.CNL2_CRYPTED_KEY       
+        crypted_re = self.CNL2_FORMINPUT_REGEX % RelinkUs.CNL2_CRYPTED_KEY
         vcrypted = re.findall(crypted_re, cnl2_form, re.IGNORECASE)
 
         # Log and return
diff --git a/module/plugins/crypter/SecuredIn.py b/module/plugins/crypter/SecuredIn.py
index e41896c5f..7c0b27c8b 100644
--- a/module/plugins/crypter/SecuredIn.py
+++ b/module/plugins/crypter/SecuredIn.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
 import re
+from math import ceil
 
 from module.plugins.Crypter import Crypter
 from module.lib.BeautifulSoup import BeautifulSoup
 
-from math import ceil
 
 class SecuredIn(Crypter):
     __name__ = "SecuredIn"
@@ -15,39 +15,40 @@ class SecuredIn(Crypter):
     __description__ = """secured.in Container Plugin"""
     __author_name__ = ("mkaay")
     __author_mail__ = ("mkaay@mkaay.de")
-        
+
     def __init__(self, parent):
         Crypter.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.multi_dl = False
-    
+
     def file_exists(self):
         return True
-    
+
     def proceed(self, url, location):
         links = []
         ajaxUrl = "http://secured.in/ajax-handler.php"
         src = self.req.load(url, cookies=True)
         soup = BeautifulSoup(src)
-        img = soup.find("img", attrs={"id":"captcha_img"})
+        img = soup.find("img", attrs={"id": "captcha_img"})
         for i in range(3):
-            form = soup.find("form", attrs={"id":"frm_captcha"})
-            captchaHash = form.find("input", attrs={"id":"captcha_hash"})["value"]
+            form = soup.find("form", attrs={"id": "frm_captcha"})
+            captchaHash = form.find("input", attrs={"id": "captcha_hash"})["value"]
             captchaUrl = "http://secured.in/%s" % img["src"]
             captchaData = self.req.load(str(captchaUrl), cookies=True)
             result = self.waitForCaptcha(captchaData, "jpg")
-            src = self.req.load(url, cookies=True, post={"captcha_key":result, "captcha_hash":captchaHash})
+            src = self.req.load(url, cookies=True, post={"captcha_key": result, "captcha_hash": captchaHash})
             soup = BeautifulSoup(src)
-            img = soup.find("img", attrs={"id":"captcha_img"})
+            img = soup.find("img", attrs={"id": "captcha_img"})
             if not img:
-                files = soup.findAll("tr", attrs={"id":re.compile("file-\d+")})
+                files = soup.findAll("tr", attrs={"id": re.compile("file-\d+")})
                 dlIDPattern = re.compile("accessDownload\(\d, \d+, '(.*?)', \d\)")
                 cypher = self.Cypher()
                 for cfile in files:
                     m = dlIDPattern.search(cfile["onclick"])
                     if m:
-                        crypted = self.req.load(ajaxUrl, cookies=True, post={"cmd":"download", "download_id":m.group(1)})
+                        crypted = self.req.load(ajaxUrl, cookies=True,
+                                                post={"cmd": "download", "download_id": m.group(1)})
                         cypher.reset()
                         link = cypher.cypher(crypted)
                         links.append(link)
@@ -57,37 +58,61 @@ class SecuredIn(Crypter):
     class Cypher():
         def __init__(self):
             self.reset()
-        
+
         def reset(self):
             self.iatwbfrd = [
-                0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7, 0x0801f2e2,
-                0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5,
-                0x9c30d539, 0x2af26013, 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1,
-                0xbd314b27, 0x78af2fda, 0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-                0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c, 0x7a325381,
-                0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, 0xef845d5d, 0xe98575b1,
-                0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239, 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842,
-                0xf6e96c9a, 0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-                0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, 0xe06f75d8, 0x85c12073, 0x401a449f,
-                0x56c16aa6, 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, 0x075372c9, 0x80991b7b,
-                0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463, 0x68fb6faf,
-                0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-                0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8,
-                0xdb3222f8, 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0,
-                0x1a87562e, 0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98,
-                0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-                0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f,
-                0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777,
-                0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266,
-                0x80957705, 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-                0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f, 0x207d5ba2,
-                0x02e5b9c5, 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915, 0xd60f573f, 0xbc9bc6e4,
-                0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, 0x53b02d5d,
+                0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+                0x24a19947, 0xb3916cf7, 0x0801f2e2,
+                0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658, 0x718bcd58,
+                0x82154aee, 0x7b54a41d, 0xc25a59b5,
+                0x9c30d539, 0x2af26013, 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e,
+                0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1,
+                0xbd314b27, 0x78af2fda, 0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a,
+                0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+                0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+                0xafd6ba33, 0x6c24cf5c, 0x7a325381,
+                0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, 0x61d809cc, 0xfb21a991, 0x487cac60,
+                0x5dec8032, 0xef845d5d, 0xe98575b1,
+                0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239, 0x2e0b4482, 0xa4842004,
+                0x69c8f04a, 0x9e1f9b5e, 0x21c66842,
+                0xf6e96c9a, 0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, 0x6eef0b6c,
+                0x137a3be4, 0xba3bf050, 0x7efb2a98,
+                0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+                0xe06f75d8, 0x85c12073, 0x401a449f,
+                0x56c16aa6, 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3,
+                0x49f1c09b, 0x075372c9, 0x80991b7b,
+                0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4,
+                0x5e5c9ec2, 0x196a2463, 0x68fb6faf,
+                0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09, 0xbee3d004,
+                0xde334afd, 0x660f2807, 0x192e4bb3,
+                0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+                0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8,
+                0xdb3222f8, 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760, 0x53317b48,
+                0x3e00df82, 0x9e5c57bb, 0xca6f8ca0,
+                0x1a87562e, 0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8,
+                0xe1ffa35d, 0xb8f011a0, 0x10fa3d98,
+                0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da,
+                0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+                0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+                0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f,
+                0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, 0x4fad5ea0, 0x688fc31c, 0xd1cff191,
+                0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777,
+                0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, 0xb4a84fe0, 0xfd13e0b7,
+                0x7cc43b81, 0xd2ada8d9, 0x165fa266,
+                0x80957705, 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, 0xebcdaf0c,
+                0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+                0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+                0x78c14389, 0xd95a537f, 0x207d5ba2,
+                0x02e5b9c5, 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052,
+                0x9a532915, 0xd60f573f, 0xbc9bc6e4,
+                0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6,
+                0xff34052e, 0xc5855664, 0x53b02d5d,
                 0xa99f8fa1, 0x08ba4799, 0x6e85076a
             ]
 
             self.olkemfjq = [
-                0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf,
+                0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+                0x452821e6, 0x38d01377, 0xbe5466cf,
                 0x34e90c6c, 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b
             ]
 
@@ -98,88 +123,157 @@ class SecuredIn(Crypter):
             self.ldiwkqly = 0
 
             self.plkodnyq = [
-                0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e,
-                0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d,
-                0xd5730a1d, 0x4cd04dc6, 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22, 0xc089c2b8,
-                0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-                0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9,
-                0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, 0xe029ac71, 0xe019a5e6,
-                0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4,
-                0x88f46dba, 0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-                0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, 0x4de81751, 0x3830dc8e, 0x379d5862,
-                0x9320f991, 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, 0xa2ae0810, 0xdd6db224,
-                0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb, 0xdda26a7e,
-                0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-                0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4,
-                0xce6ea048, 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b,
-                0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, 0x0339c32a,
-                0xc6913667, 0x8df9317c, 0xe0b12b4f, 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-                0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be,
-                0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e,
-                0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 0xf523f357,
-                0xa6327623, 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-                0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c,
-                0xcd769c2b, 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060, 0x85cbfe4e, 0x8ae88dd8,
-                0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, 0xb74e6132,
+                0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+                0xd5118e9d, 0xbf0f7315, 0xd62d1c7e,
+                0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79, 0xc6a376d2,
+                0x6549c2c8, 0x530ff8ee, 0x468dde7d,
+                0xd5730a1d, 0x4cd04dc6, 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a,
+                0x63ef8ce2, 0x9a86ee22, 0xc089c2b8,
+                0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9,
+                0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+                0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+                0xe990fd5a, 0x9e34d797, 0x2cf0b7d9,
+                0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472,
+                0x5a88f54c, 0xe029ac71, 0xe019a5e6,
+                0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, 0x785f0191, 0xed756055,
+                0xf7960e44, 0xe3d35e8c, 0x15056dd4,
+                0x88f46dba, 0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, 0x1b3f6d9b,
+                0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+                0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+                0x4de81751, 0x3830dc8e, 0x379d5862,
+                0x9320f991, 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369,
+                0x6413e680, 0xa2ae0810, 0xdd6db224,
+                0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40,
+                0xccd2017f, 0x6bb4e3bb, 0xdda26a7e,
+                0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47, 0xd29be463,
+                0x542f5d9e, 0xaec2771b, 0xf64e6370,
+                0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+                0xe1b00428, 0x95983a1d, 0x06b89fb4,
+                0xce6ea048, 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc, 0xbb3a792b,
+                0x344525bd, 0xa08839e1, 0x51ce794b,
+                0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a,
+                0xd0dadecb, 0xd50ada38, 0x0339c32a,
+                0xc6913667, 0x8df9317c, 0xe0b12b4f, 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c,
+                0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+                0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+                0xe0ec6e0e, 0x1698db3b, 0x4c98a0be,
+                0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, 0x1b0a7441, 0x4ba3348c, 0xc5be7120,
+                0xc37632d8, 0xdf359f8d, 0x9b992f2e,
+                0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05,
+                0x848fd2c5, 0xf6fb2299, 0xf523f357,
+                0xa6327623, 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, 0xde966292,
+                0x81b949d0, 0x4c50901b, 0x71c65614,
+                0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+                0x71126905, 0xb2040222, 0xb6cbcf7c,
+                0xcd769c2b, 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5,
+                0x20756060, 0x85cbfe4e, 0x8ae88dd8,
+                0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0,
+                0x3f09252d, 0xc208e69f, 0xb74e6132,
                 0xce77e25b, 0x578fdfe3, 0x3ac372e6
             ]
 
             self.pnjzokye = None
 
             self.thdlpsmy = [
-                0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, 0xd4082471, 0x3320f46a, 0x43b7d4b7,
-                0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785,
-                0x7fac6dd0, 0x31cb8504, 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb, 0x68dc1462,
-                0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-                0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, 0x6841e7f7,
-                0xca7820fb, 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58,
-                0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548,
-                0xe4c66d22, 0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-                0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, 0x6b2395e0, 0x333e92e1, 0x3b240b62,
-                0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, 0x5449a36f, 0x877d48fa,
-                0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, 0xc67b5510,
-                0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b, 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-                0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc,
-                0x782ef11c, 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9, 0x44421659, 0x0a121386,
-                0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, 0xd1fd8346,
-                0xf6381fb0, 0x7745ae04, 0xd736fccc, 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-                0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84, 0x846a0e79,
-                0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09,
-                0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, 0xdcb7da83,
-                0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-                0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de, 0xebfc7da1,
-                0xce591d76, 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, 0xed545578, 0x08fca5b5,
-                0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234,
+                0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+                0xd4082471, 0x3320f46a, 0x43b7d4b7,
+                0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af, 0x70f4ddd3,
+                0x66a02f45, 0xbfbc09ec, 0x03bd9785,
+                0x7fac6dd0, 0x31cb8504, 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4,
+                0x0a2c86da, 0xe9b66dfb, 0x68dc1462,
+                0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c,
+                0xd3375fec, 0xce78a399, 0x406b2a42,
+                0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+                0x3a6efa74, 0xdd5b4332, 0x6841e7f7,
+                0xca7820fb, 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, 0xfe6ba9b7,
+                0xd096954b, 0x55a867bc, 0xa1159a58,
+                0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, 0xfdf8e802, 0x04272f70,
+                0x80bb155c, 0x05282ce3, 0x95c11548,
+                0xe4c66d22, 0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, 0x325f51eb,
+                0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+                0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+                0x6b2395e0, 0x333e92e1, 0x3b240b62,
+                0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862,
+                0xe7ccf5f0, 0x5449a36f, 0x877d48fa,
+                0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8,
+                0x991be14c, 0xdb6e6b0d, 0xc67b5510,
+                0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b, 0x667b9ffb,
+                0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+                0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+                0x6842ada7, 0xc66a2b3b, 0x12754ccc,
+                0x782ef11c, 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8,
+                0xe2e1c3c9, 0x44421659, 0x0a121386,
+                0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086,
+                0x60787bf8, 0x6003604d, 0xd1fd8346,
+                0xf6381fb0, 0x7745ae04, 0xd736fccc, 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be,
+                0xbde8ae24, 0x55464299, 0xbf582e61,
+                0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+                0x7aeb2661, 0x8b1ddf84, 0x846a0e79,
+                0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, 0xb90bace1, 0xbb8205d0, 0x11a86248,
+                0x7574a99e, 0xb77f19b6, 0xe0a9dc09,
+                0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df,
+                0xa186f20f, 0x2868f169, 0xdcb7da83,
+                0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, 0x9af88c27,
+                0x773f8641, 0xc3604c06, 0x61a806b5,
+                0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+                0xbbcbee56, 0x90bcb6de, 0xebfc7da1,
+                0xce591d76, 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4,
+                0xd39eb8fc, 0xed545578, 0x08fca5b5,
+                0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4,
+                0x362abfce, 0xddc6c837, 0xd79a3234,
                 0x92638212, 0x670efa8e, 0x406000e0
             ]
 
             self.ybghjtik = [
-                0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c,
-                0xc2b19ee1, 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5,
-                0x4d2d38e6, 0xf0255dc1, 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1, 0x687f3584,
-                0x52a0e286, 0xb79c5305, 0xaa500737, 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-                0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc, 0xc8b57634,
-                0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908,
-                0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f,
-                0x2e6b7124, 0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-                0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, 0x71dff89e, 0x10314e55, 0x81ac77d6,
-                0x5f11199b, 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, 0x86e34570, 0xeae96fb1,
-                0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a, 0xc6150eba,
-                0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-                0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad,
-                0x5b6e2f84, 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239,
-                0xd59e9e0b, 0xcbaade14, 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50, 0x40685a32,
-                0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-                0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054, 0x8fd948e4,
-                0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea,
-                0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2,
-                0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-                0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, 0x7cde3759, 0xcbee7460, 0x4085f2a7,
-                0xce77326e, 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc, 0x9e447a2e, 0xc3453484,
-                0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7,
+                0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+                0xecaa8c71, 0x699a17ff, 0x5664526c,
+                0xc2b19ee1, 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65, 0x6b8fe4d6,
+                0x99f73fd6, 0xa1d29c07, 0xefe830f5,
+                0x4d2d38e6, 0xf0255dc1, 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9,
+                0x3c971814, 0x6b6a70a1, 0x687f3584,
+                0x52a0e286, 0xb79c5305, 0xaa500737, 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37,
+                0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+                0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+                0x3ae5e581, 0x37c2dadc, 0xc8b57634,
+                0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, 0xe238cd99, 0x3bea0e2f, 0x3280bba1,
+                0x183eb331, 0x4e548b38, 0x4f6db908,
+                0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, 0xde9a771f, 0xd9930810,
+                0xb38bae12, 0xdccf3f2e, 0x5512721f,
+                0x2e6b7124, 0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, 0xec7aec3a,
+                0xdb851dfa, 0x63094366, 0xc464c3d2,
+                0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+                0x71dff89e, 0x10314e55, 0x81ac77d6,
+                0x5f11199b, 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c,
+                0x1e153c6e, 0x86e34570, 0xeae96fb1,
+                0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825,
+                0x2e4cc978, 0x9c10b36a, 0xc6150eba,
+                0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960, 0x5223a708,
+                0xf71312b6, 0xebadfe6e, 0xeac31f66,
+                0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+                0xeecea50f, 0xdb2f953b, 0x2aef7dad,
+                0x5b6e2f84, 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, 0x0334fe1e,
+                0xaa0363cf, 0xb5735c90, 0x4c70a239,
+                0xd59e9e0b, 0xcbaade14, 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca,
+                0xa02369b9, 0x655abb50, 0x40685a32,
+                0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a,
+                0x97e32d77, 0x11ed935f, 0x16681281,
+                0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+                0xcdb30aeb, 0x532e3054, 0x8fd948e4,
+                0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, 0x5d4a14d9, 0xe864b7e3, 0x42105d14,
+                0x203e13e0, 0x45eee2b6, 0xa3aaabea,
+                0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, 0xd81e799e, 0x86854dc7,
+                0xe44b476a, 0x3d816250, 0xcf62a1f2,
+                0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, 0x095bbf00,
+                0xad19489d, 0x1462b174, 0x23820e00,
+                0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+                0x7cde3759, 0xcbee7460, 0x4085f2a7,
+                0xce77326e, 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc,
+                0x800bcadc, 0x9e447a2e, 0xc3453484,
+                0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8,
+                0x3d28f89e, 0xf16dff20, 0x153e21e7,
                 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
             ]
-        
+
         def cypher(self, code):
             return self.lskdqpyr(code, "")
 
@@ -195,7 +289,7 @@ class SecuredIn(Crypter):
             tzghbndf = lokimyas[1]
             awsedrft = [None, None]
             for kiujzhqa in range(8, alokijuh, 8):
-                lokimyas = self.ylomiktb(alokfmth[kiujzhqa:kiujzhqa+8])
+                lokimyas = self.ylomiktb(alokfmth[kiujzhqa:kiujzhqa + 8])
                 awsedrft[0] = lokimyas[0]
                 awsedrft[1] = lokimyas[1]
                 lokimyas = self.okaqnhlp(lokimyas[0], lokimyas[1])
@@ -210,7 +304,9 @@ class SecuredIn(Crypter):
             ujhaqylw = 0
             for yalmhopr in range(17, 1, -1):
                 lahgrnvp ^= self.ldiwkqly[yalmhopr]
-                trenlpys ^= (self.oqlaoymh[lahgrnvp >> 24 & 0xff] + self.oqmykrna[lahgrnvp >> 16 & 0xff] ^ self.pqmyzkid[lahgrnvp >> 8 & 0xff]) + self.pldmjnde[lahgrnvp & 0xff]
+                trenlpys ^= (
+                    self.oqlaoymh[lahgrnvp >> 24 & 0xff] + self.oqmykrna[lahgrnvp >> 16 & 0xff] ^ self.pqmyzkid[
+                        lahgrnvp >> 8 & 0xff]) + self.pldmjnde[lahgrnvp & 0xff]
                 ujhaqylw = lahgrnvp
                 lahgrnvp = trenlpys
                 trenlpys = ujhaqylw
@@ -263,7 +359,9 @@ class SecuredIn(Crypter):
             dolizmvw = 0
             for iumswkya in range(0, 16):
                 oqlamykt ^= self.ldiwkqly[iumswkya]
-                yalkionj ^= (self.oqlaoymh[oqlamykt >> 24 & 0xff] + self.oqmykrna[oqlamykt >> 16 & 0xff] ^ self.pqmyzkid[oqlamykt >> 8 & 0xff]) + self.pldmjnde[oqlamykt & 0xff]
+                yalkionj ^= (
+                    self.oqlaoymh[oqlamykt >> 24 & 0xff] + self.oqmykrna[oqlamykt >> 16 & 0xff] ^ self.pqmyzkid[
+                        oqlamykt >> 8 & 0xff]) + self.pldmjnde[oqlamykt & 0xff]
                 dolizmvw = oqlamykt
                 oqlamykt = yalkionj
                 yalkionj = dolizmvw
@@ -278,7 +376,8 @@ class SecuredIn(Crypter):
             loipamyu = len(yoirlkqw)
             yoirlkqwchar = []
             for ymujtnbq in range(0, loipamyu):
-                yoir = [yoirlkqw[ymujtnbq] >> 24 & 0xff, yoirlkqw[ymujtnbq] >> 16 & 0xff, yoirlkqw[ymujtnbq] >> 8 & 0xff, yoirlkqw[ymujtnbq] & 0xff]
+                yoir = [yoirlkqw[ymujtnbq] >> 24 & 0xff, yoirlkqw[ymujtnbq] >> 16 & 0xff,
+                        yoirlkqw[ymujtnbq] >> 8 & 0xff, yoirlkqw[ymujtnbq] & 0xff]
                 for c in yoir:
                     yoirlkqwchar.append(chr(c))
             return "".join(yoirlkqwchar)
@@ -287,7 +386,8 @@ class SecuredIn(Crypter):
             plokimqw = int(ceil(len(lofiuzmq) / 4.0))
             lopkisdq = []
             for ypoqlktz in range(0, plokimqw):
-                lopkisdq.append(ord(lofiuzmq[(ypoqlktz << 2) + 3]) + (ord(lofiuzmq[(ypoqlktz << 2) + 2]) << 8) + (ord(lofiuzmq[(ypoqlktz << 2) + 1]) << 16) + (ord(lofiuzmq[(ypoqlktz << 2)]) << 24))
+                lopkisdq.append(ord(lofiuzmq[(ypoqlktz << 2) + 3]) + (ord(lofiuzmq[(ypoqlktz << 2) + 2]) << 8) + (
+                    ord(lofiuzmq[(ypoqlktz << 2) + 1]) << 16) + (ord(lofiuzmq[(ypoqlktz << 2)]) << 24))
             return lopkisdq
 
         def yoliukev(self, kaiumylq):
@@ -331,4 +431,3 @@ class SecuredIn(Crypter):
                 yalopiuq = self.qmyjuila(yalopiuq[0], yalopiuq[1])
                 self.pldmjnde[btzqwsay] = yalopiuq[0]
                 self.pldmjnde[btzqwsay + 1] = yalopiuq[1]
-
diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py
index 3fcc12e36..5b720533c 100644
--- a/module/plugins/crypter/SerienjunkiesOrg.py
+++ b/module/plugins/crypter/SerienjunkiesOrg.py
@@ -7,6 +7,7 @@ from module.plugins.Crypter import Crypter
 from module.lib.BeautifulSoup import BeautifulSoup
 from module.unescape import unescape
 
+
 class SerienjunkiesOrg(Crypter):
     __name__ = "SerienjunkiesOrg"
     __type__ = "container"
@@ -16,10 +17,12 @@ class SerienjunkiesOrg(Crypter):
         ("changeNameSJ", "Packagename;Show;Season;Format;Episode", "Take SJ.org name", "Show"),
         ("changeNameDJ", "Packagename;Show;Format;Episode", "Take DJ.org name", "Show"),
         ("randomPreferred", "bool", "Randomize Preferred-List", False),
-        ("hosterListMode", "OnlyOne;OnlyPreferred(One);OnlyPreferred(All);All", "Use for hosters (if supported)", "All"),
-        ("hosterList", "str", "Preferred Hoster list (comma separated)", "RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom,FreakshareNet,FilebaseTo,HotfileCom,DepositfilesCom,EasyshareCom,KickloadCom"),
+        (
+        "hosterListMode", "OnlyOne;OnlyPreferred(One);OnlyPreferred(All);All", "Use for hosters (if supported)", "All"),
+        ("hosterList", "str", "Preferred Hoster list (comma separated)",
+         "RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom,FreakshareNet,FilebaseTo,HotfileCom,DepositfilesCom,EasyshareCom,KickloadCom"),
         ("ignoreList", "str", "Ignored Hoster list (comma separated)", "MegauploadCom")
-        ]
+    ]
     __description__ = """serienjunkies.org Container Plugin"""
     __author_name__ = ("mkaay", "godofdream")
     __author_mail__ = ("mkaay@mkaay.de", "soilfiction@gmail.com")
@@ -44,7 +47,7 @@ class SerienjunkiesOrg(Crypter):
         if self.getConfig("changeNameSJ") == "Show":
             found = unescape(soup.find("h2").find("a").string.split(' &#8211;')[0])
             if found:
-                 packageName = found
+                packageName = found
 
         nav = soup.find("div", attrs={"id": "scb"})
 
@@ -58,7 +61,7 @@ class SerienjunkiesOrg(Crypter):
             self.packages.append((packageName, package_links, packageName))
         else:
             self.core.files.addLinks(package_links, self.pyfile.package().id)
-            
+
 
     def handleSeason(self, url):
         src = self.getSJSrc(url)
@@ -91,15 +94,16 @@ class SerienjunkiesOrg(Crypter):
             elif re.search("<strong>Download:", str(p)):
                 parts = str(p).split("<br />")
                 if re.search("<strong>", parts[0]):
-                    ename = re.search('<strong>(.*?)</strong>',parts[0]).group(1).strip().decode("utf-8").replace("&#8211;", "-")
+                    ename = re.search('<strong>(.*?)</strong>', parts[0]).group(1).strip().decode("utf-8").replace(
+                        "&#8211;", "-")
                     groups[gid]["ep"][ename] = {}
                     parts.remove(parts[0])
                     for part in parts:
-                        hostername = re.search(" \| ([-a-zA-Z0-9]+\.\w+)",part)
+                        hostername = re.search(" \| ([-a-zA-Z0-9]+\.\w+)", part)
                         if hostername:
                             hostername = hostername.group(1)
                             groups[gid]["ep"][ename][hostername] = []
-                            links = re.findall('href="(.*?)"',part)
+                            links = re.findall('href="(.*?)"', part)
                             for link in links:
                                 groups[gid]["ep"][ename][hostername].append(link + "#hasName")
 
@@ -122,7 +126,7 @@ class SerienjunkiesOrg(Crypter):
     def handleEpisode(self, url):
         src = self.getSJSrc(url)
         if not src.find(
-            "Du hast das Download-Limit &uuml;berschritten! Bitte versuche es sp&auml;ter nocheinmal.") == -1:
+                "Du hast das Download-Limit &uuml;berschritten! Bitte versuche es sp&auml;ter nocheinmal.") == -1:
             self.fail(_("Downloadlimit reached"))
         else:
             soup = BeautifulSoup(src)
@@ -156,7 +160,8 @@ class SerienjunkiesOrg(Crypter):
             for link in rawLinks:
                 frameUrl = link["action"].replace("/go-", "/frame/go-")
                 links.append(self.handleFrame(frameUrl))
-            if re.search("#hasName", url) or ((self.getConfig("changeNameSJ") == "Packagename") and (self.getConfig("changeNameDJ") == "Packagename")):
+            if re.search("#hasName", url) or ((self.getConfig("changeNameSJ") == "Packagename") and
+                                              (self.getConfig("changeNameDJ") == "Packagename")):
                 self.core.files.addLinks(links, self.pyfile.package().id)
             else:
                 if h1.text[2] == "_":
@@ -164,7 +169,6 @@ class SerienjunkiesOrg(Crypter):
                 else:
                     eName = h1.text
                 self.packages.append((eName, links, eName))
-                
 
     def handleOldStyleLink(self, url):
         sj = self.req.load(str(url))
@@ -177,7 +181,7 @@ class SerienjunkiesOrg(Crypter):
         sinp = form.find(attrs={"name": "s"})
 
         self.req.load(str(url), post={'s': sinp["value"], 'c': result, 'dl.start': "Download"}, cookies=False,
-            just_header=True)
+                      just_header=True)
         decrypted = self.req.lastEffectiveURL
         if decrypted == str(url):
             self.retry()
@@ -220,15 +224,16 @@ class SerienjunkiesOrg(Crypter):
             elif re.search("<strong>Download:", str(p)):
                 parts = str(p).split("<br />")
                 if re.search("<strong>", parts[0]):
-                    ename = re.search('<strong>(.*?)</strong>',parts[0]).group(1).strip().decode("utf-8").replace("&#8211;", "-")
+                    ename = re.search('<strong>(.*?)</strong>', parts[0]).group(1).strip().decode("utf-8").replace(
+                        "&#8211;", "-")
                     groups[gid]["ep"][ename] = {}
                     parts.remove(parts[0])
                     for part in parts:
-                        hostername = re.search(" \| ([-a-zA-Z0-9]+\.\w+)",part)
+                        hostername = re.search(" \| ([-a-zA-Z0-9]+\.\w+)", part)
                         if hostername:
                             hostername = hostername.group(1)
                             groups[gid]["ep"][ename][hostername] = []
-                            links = re.findall('href="(.*?)"',part)
+                            links = re.findall('href="(.*?)"', part)
                             for link in links:
                                 groups[gid]["ep"][ename][hostername].append(link + "#hasName")
 
@@ -248,12 +253,6 @@ class SerienjunkiesOrg(Crypter):
         elif (self.getConfig("changeNameDJ") == "Show") or not re.search("#hasName", url):
             self.packages.append((seasonName, links, seasonName))
 
-
-
-
-
-            
-
     def handleCategoryDJ(self, url):
         package_links = []
         src = self.getSJSrc(url)
@@ -289,33 +288,35 @@ class SerienjunkiesOrg(Crypter):
 
     #selects the preferred hoster, after that selects any hoster (ignoring the one to ignore)
     def getpreferred(self, hosterlist):
-        
+
         result = []
-        preferredList = self.getConfig("hosterList").strip().lower().replace('|',',').replace('.','').replace(';',',').split(',')
-        if (self.getConfig("randomPreferred") == True) and (self.getConfig("hosterListMode") in ["OnlyOne","OnlyPreferred(One)"]) :
+        preferredList = self.getConfig("hosterList").strip().lower().replace(
+            '|', ',').replace('.', '').replace(';', ',').split( ',')
+        if (self.getConfig("randomPreferred") == True) and (
+                self.getConfig("hosterListMode") in ["OnlyOne", "OnlyPreferred(One)"]):
             random.shuffle(preferredList)
-        # we don't want hosters be read two times
+            # we don't want hosters be read two times
         hosterlist2 = hosterlist.copy()
-        
+
         for preferred in preferredList:
             for Hoster in hosterlist:
-                if preferred == Hoster.lower().replace('.',''):
+                if preferred == Hoster.lower().replace('.', ''):
                     for Part in hosterlist[Hoster]:
                         self.logDebug("selected " + Part)
                         result.append(str(Part))
-                        del(hosterlist2[Hoster])
-                    if (self.getConfig("hosterListMode") in ["OnlyOne","OnlyPreferred(One)"]):
+                        del (hosterlist2[Hoster])
+                    if self.getConfig("hosterListMode") in ["OnlyOne", "OnlyPreferred(One)"]:
                         return result
-                    
-        
-        ignorelist = self.getConfig("ignoreList").strip().lower().replace('|',',').replace('.','').replace(';',',').split(',')
-        if self.getConfig('hosterListMode') in ["OnlyOne","All"]:
+
+        ignorelist = self.getConfig("ignoreList").strip().lower().replace(
+            '|', ',').replace('.', '').replace(';', ',').split( ',')
+        if self.getConfig('hosterListMode') in ["OnlyOne", "All"]:
             for Hoster in hosterlist2:
-                if Hoster.strip().lower().replace('.','') not in ignorelist:
+                if Hoster.strip().lower().replace('.', '') not in ignorelist:
                     for Part in hosterlist2[Hoster]:
                         self.logDebug("selected2 " + Part)
                         result.append(str(Part))
-                        
+
                     if self.getConfig('hosterListMode') == "OnlyOne":
                         return result
         return result
diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index b0e735896..252766811 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from Crypto.Cipher import AES
-from module.plugins.Crypter import Crypter
-from module.plugins.ReCaptcha import ReCaptcha
 import base64
 import binascii
 import re
 
+from Crypto.Cipher import AES
+from module.plugins.Crypter import Crypter
+
 
 class ShareLinksBiz(Crypter):
     __name__ = "ShareLinksBiz"
@@ -16,8 +16,7 @@ class ShareLinksBiz(Crypter):
     __description__ = """Share-Links.biz Crypter"""
     __author_name__ = ("fragonib")
     __author_mail__ = ("fragonib[AT]yahoo[DOT]es")
-    
-    
+
     def setup(self):
         self.baseUrl = None
         self.fileId = None
@@ -29,31 +28,31 @@ class ShareLinksBiz(Crypter):
 
         # Init
         self.initFile(pyfile)
-        
+
         # Request package
         url = self.baseUrl + '/' + self.fileId
         self.html = self.load(url, decode=True)
-        
+
         # Unblock server (load all images)
         self.unblockServer()
-           
+
         # Check for protection    
         if self.isPasswordProtected():
             self.unlockPasswordProtection()
             self.handleErrors()
-            
+
         if self.isCaptchaProtected():
             self.captcha = True
             self.unlockCaptchaProtection()
             self.handleErrors()
-            
+
         # Extract package links
         package_links = []
         package_links.extend(self.handleWebLinks())
         package_links.extend(self.handleContainers())
         package_links.extend(self.handleCNL2())
         package_links = set(package_links)
-        
+
         # Get package info 
         package_name, package_folder = self.getPackageInfo()
 
@@ -64,7 +63,7 @@ class ShareLinksBiz(Crypter):
         url = pyfile.url
         if 's2l.biz' in url:
             url = self.load(url, just_header=True)['location']
-        self.baseUrl = re.search(self.__pattern__, url).group(1)            
+        self.baseUrl = re.search(self.__pattern__, url).group(1)
         self.fileId = re.match(self.__pattern__, url).group('id')
         self.package = pyfile.package()
 
@@ -73,24 +72,24 @@ class ShareLinksBiz(Crypter):
             self.logDebug("File not found")
             return False
         return True
-    
+
     def isPasswordProtected(self):
         if re.search(r'''<form.*?id="passwordForm".*?>''', self.html):
             self.logDebug("Links are protected")
             return True
         return False
-    
+
     def isCaptchaProtected(self):
         if '<map id="captchamap"' in self.html:
             self.logDebug("Links are captcha protected")
             return True
         return False
-    
+
     def unblockServer(self):
         imgs = re.findall("(/template/images/.*?\.gif)", self.html)
         for img in imgs:
             self.load(self.baseUrl + img)
-    
+
     def unlockPasswordProtection(self):
         password = self.getPassword()
         self.logDebug("Submitting password [%s] for protected links" % password)
@@ -109,7 +108,7 @@ class ShareLinksBiz(Crypter):
         self.logDebug("Waiting user for correct position")
         coords = self.decryptCaptcha(captchaUrl, forceUser=True, imgtype="gif", result_type='positional')
         self.logDebug("Captcha resolved, coords [%s]" % str(coords))
-    
+
         # Resolve captcha
         href = self._resolveCoords(coords, captchaMap)
         if href is None:
@@ -120,7 +119,7 @@ class ShareLinksBiz(Crypter):
             self.retry()
         url = self.baseUrl + href
         self.html = self.load(url, decode=True)
-        
+
     def _getCaptchaMap(self):
         map = {}
         for m in re.finditer(r'<area shape="rect" coords="(.*?)" href="(.*?)"', self.html):
@@ -133,13 +132,13 @@ class ShareLinksBiz(Crypter):
         x, y = coords
         for rect, href in captchaMap.items():
             x1, y1, x2, y2 = rect
-            if (x>=x1 and x<=x2) and (y>=y1 and y<=y2):
+            if (x >= x1 and x <= x2) and (y >= y1 and y <= y2):
                 return href
 
     def handleErrors(self):
         if "The inserted password was wrong" in self.html:
             self.logDebug("Incorrect password, please set right password on 'Edit package' form and retry")
-            self.fail("Incorrect password, please set right password on 'Edit package' form and retry")  
+            self.fail("Incorrect password, please set right password on 'Edit package' form and retry")
 
         if self.captcha:
             if "Your choice was wrong" in self.html:
@@ -149,11 +148,11 @@ class ShareLinksBiz(Crypter):
                 self.wait()
                 self.retry()
             else:
-                self.correctCaptcha() 
+                self.correctCaptcha()
 
     def getPackageInfo(self):
         name = folder = None
-        
+
         # Extract from web package header
         title_re = r'<h2><img.*?/>(.*)</h2>'
         m = re.search(title_re, self.html, re.DOTALL)
@@ -162,54 +161,55 @@ class ShareLinksBiz(Crypter):
             if 'unnamed' not in title:
                 name = folder = title
                 self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder))
-                
+
         # Fallback to defaults
         if not name or not folder:
             name = self.package.name
             folder = self.package.folder
             self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder))
-            
+
         # Return package info 
-        return name, folder 
-    
+        return name, folder
+
     def handleWebLinks(self):
         package_links = []
         self.logDebug("Handling Web links")
-        
+
         #@TODO: Gather paginated web links  
         pattern = r"javascript:_get\('(.*?)', \d+, ''\)"
         ids = re.findall(pattern, self.html)
         self.logDebug("Decrypting %d Web links" % len(ids))
         for i, id in enumerate(ids):
             try:
-                self.logDebug("Decrypting Web link %d, [%s]" % (i+1, id))
+                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)
                 fwLink = self.baseUrl + "/get/frm/" + code
                 response = self.load(fwLink)
-                jscode = re.search(r'<script language="javascript">\s*eval\((.*)\)\s*</script>', response, re.DOTALL).group(1)
+                jscode = re.search(r'<script language="javascript">\s*eval\((.*)\)\s*</script>', response,
+                                   re.DOTALL).group(1)
                 jscode = self.js.eval("f = %s" % jscode)
-                jslauncher = "window=''; parent={frames:{Main:{location:{href:''}}},location:''}; %s; parent.frames.Main.location.href" 
+                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)
+                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))
         return package_links
-    
+
     def handleContainers(self):
         package_links = []
         self.logDebug("Handling Container links")
-        
+
         pattern = r"javascript:_get\('(.*?)', 0, '(rsdf|ccf|dlc)'\)"
         containersLinks = re.findall(pattern, self.html)
         self.logDebug("Decrypting %d Container links" % len(containersLinks))
         for containerLink in containersLinks:
-            link = "%s/get/%s/%s" % (self.baseUrl, containerLink[1], containerLink[0]) 
+            link = "%s/get/%s/%s" % (self.baseUrl, containerLink[1], containerLink[0])
             package_links.append(link)
         return package_links
-    
+
     def handleCNL2(self):
         package_links = []
         self.logDebug("Handling CNL2 links")
@@ -219,17 +219,17 @@ class ShareLinksBiz(Crypter):
                 (crypted, jk) = self._getCipherParams()
                 package_links.extend(self._getLinks(crypted, jk))
             except:
-                self.fail("Unable to decrypt CNL2 links")            
+                self.fail("Unable to decrypt CNL2 links")
         return package_links
-    
+
     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(";;")
-        
+
         # Get jk
         strlist = list(base64.standard_b64decode(params[1]))
         strlist.reverse()
@@ -244,7 +244,7 @@ class ShareLinksBiz(Crypter):
         return crypted, jk
 
     def _getLinks(self, crypted, jk):
-        
+
         # Get key
         jreturn = self.js.eval("%s f()" % jk)
         self.logDebug("JsEngine returns value [%s]" % jreturn)
@@ -266,4 +266,4 @@ class ShareLinksBiz(Crypter):
 
         # Log and return
         self.logDebug("Block has %d links" % len(links))
-        return links
\ No newline at end of file
+        return links
diff --git a/module/plugins/crypter/ShareRapidComFolder.py b/module/plugins/crypter/ShareRapidComFolder.py
index cb7f37525..951c09d45 100644
--- a/module/plugins/crypter/ShareRapidComFolder.py
+++ b/module/plugins/crypter/ShareRapidComFolder.py
@@ -2,13 +2,14 @@
 
 from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
+
 class ShareRapidComFolder(SimpleCrypter):
     __name__ = "ShareRapidComFolder"
     __type__ = "crypter"
-    __pattern__ = r"http://(?:www\.)?((share(-?rapid\.(biz|com|cz|info|eu|net|org|pl|sk)|-(central|credit|free|net)\.cz|-ms\.net)|(s-?rapid|rapids)\.(cz|sk))|(e-stahuj|mediatack|premium-rapidshare|rapidshare-premium|qiuck)\.cz|kadzet\.com|stahuj-zdarma\.eu|strelci\.net|universal-share\.com)/(slozka/.+)"  
+    __pattern__ = r"http://(?:www\.)?((share(-?rapid\.(biz|com|cz|info|eu|net|org|pl|sk)|-(central|credit|free|net)\.cz|-ms\.net)|(s-?rapid|rapids)\.(cz|sk))|(e-stahuj|mediatack|premium-rapidshare|rapidshare-premium|qiuck)\.cz|kadzet\.com|stahuj-zdarma\.eu|strelci\.net|universal-share\.com)/(slozka/.+)"
     __version__ = "0.01"
     __description__ = """Share-Rapid.com Folder Plugin"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
-    LINK_PATTERN = r'<td class="soubor"[^>]*><a href="([^"]+)">'
\ No newline at end of file
+    LINK_PATTERN = r'<td class="soubor"[^>]*><a href="([^"]+)">'
diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py
index f85ede6f3..8223eb7b9 100644
--- a/module/plugins/crypter/SpeedLoadOrgFolder.py
+++ b/module/plugins/crypter/SpeedLoadOrgFolder.py
@@ -17,6 +17,7 @@
 
 from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
+
 class SpeedLoadOrgFolder(SimpleCrypter):
     __name__ = "SpeedLoadOrgFolder"
     __type__ = "crypter"
diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py
index cf7a79e9b..45a14f5a2 100644
--- a/module/plugins/crypter/StealthTo.py
+++ b/module/plugins/crypter/StealthTo.py
@@ -5,6 +5,7 @@ import re
 
 from module.plugins.Crypter import Crypter
 
+
 class StealthTo(Crypter):
     __name__ = "StealthTo"
     __type__ = "container"
@@ -29,17 +30,20 @@ class StealthTo(Crypter):
         self.html = self.req.load(url, cookies=True)
         temp_links = []
         ids = []
-        ats = [] # authenticity_token
+        ats = []  # authenticity_token
         inputs = re.findall(r"(<(input|form)[^>]+)", self.html)
         for input in inputs:
-            if re.search(r"name=\"authenticity_token\"",input[0]):
+            if re.search(r"name=\"authenticity_token\"", input[0]):
                 ats.append(re.search(r"value=\"([^\"]+)", input[0]).group(1))
-            if re.search(r"name=\"id\"",input[0]):
+            if re.search(r"name=\"id\"", input[0]):
                 ids.append(re.search(r"value=\"([^\"]+)", input[0]).group(1))
-                
+
         for i in range(0, len(ids)):
-            self.req.load(url + "/web", post={"authenticity_token": ats[i], "id": str(ids[i]), "link": ("download_" + str(ids[i]))}, cookies=True)
-            new_html = self.req.load(url + "/web", post={"authenticity_token": ats[i], "id": str(ids[i]), "link": "1"}, cookies=True)
+            self.req.load(url + "/web",
+                          post={"authenticity_token": ats[i], "id": str(ids[i]), "link": ("download_" + str(ids[i]))},
+                          cookies=True)
+            new_html = self.req.load(url + "/web", post={"authenticity_token": ats[i], "id": str(ids[i]), "link": "1"},
+                                     cookies=True)
             temp_links.append(re.search(r"iframe src=\"(.*)\" frameborder", new_html).group(1))
 
         self.links = temp_links
diff --git a/module/plugins/crypter/TrailerzoneInfo.py b/module/plugins/crypter/TrailerzoneInfo.py
index 43a4fcce5..b55c8d219 100644
--- a/module/plugins/crypter/TrailerzoneInfo.py
+++ b/module/plugins/crypter/TrailerzoneInfo.py
@@ -3,6 +3,7 @@
 import re
 from module.plugins.Crypter import Crypter
 
+
 class TrailerzoneInfo(Crypter):
     __name__ = "TrailerzoneInfo"
     __type__ = "crypter"
@@ -24,22 +25,22 @@ class TrailerzoneInfo(Crypter):
             self.handleGo(url)
 
     def handleProtect(self, url):
-        self.handleGo("http://trailerzone.info/go.html#:::" + url.split("#:::",1)[1])
+        self.handleGo("http://trailerzone.info/go.html#:::" + url.split("#:::", 1)[1])
 
     def handleGo(self, url):
-        
+
         src = self.req.load(str(url))
         pattern = re.compile(self.JS_KEY_PATTERN, re.DOTALL)
         found = re.search(pattern, src)
-        
+
         # Get package info 
-        package_links = []  
+        package_links = []
         try:
-            result = self.js.eval(found.group(1) + " decodeLink('" + url.split("#:::",1)[1] + "');")
+            result = self.js.eval(found.group(1) + " decodeLink('" + url.split("#:::", 1)[1] + "');")
             result = str(result)
             self.logDebug("RESULT: %s" % result)
             package_links.append(result)
             self.core.files.addLinks(package_links, self.pyfile.package().id)
         except Exception, e:
-            self.logDebug(e)                                       
+            self.logDebug(e)
             self.fail('Could not extract any links by javascript')
diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py
index 814d5240d..a5ccfc753 100644
--- a/module/plugins/crypter/UlozToFolder.py
+++ b/module/plugins/crypter/UlozToFolder.py
@@ -3,6 +3,7 @@
 import re
 from module.plugins.Crypter import Crypter
 
+
 class UlozToFolder(Crypter):
     __name__ = "UlozToFolder"
     __type__ = "crypter"
@@ -20,10 +21,11 @@ class UlozToFolder(Crypter):
         html = self.load(self.pyfile.url)
 
         new_links = []
-        for i in range(1,100):
+        for i in range(1, 100):
             self.logInfo("Fetching links from page %i" % i)
             found = re.search(self.FOLDER_PATTERN, html, re.DOTALL)
-            if found is None: self.fail("Parse error (FOLDER)")
+            if found is None:
+                self.fail("Parse error (FOLDER)")
 
             new_links.extend(re.findall(self.LINK_PATTERN, found.group(1)))
             found = re.search(self.NEXT_PAGE_PATTERN, html)
@@ -35,6 +37,6 @@ class UlozToFolder(Crypter):
             self.logInfo("Limit of 99 pages reached, aborting")
 
         if new_links:
-            self.core.files.addLinks(map(lambda s:"http://ulozto.net/%s" % s, new_links), self.pyfile.package().id)
+            self.core.files.addLinks(map(lambda s: "http://ulozto.net/%s" % s, new_links), self.pyfile.package().id)
         else:
-            self.fail('Could not extract any links')
\ No newline at end of file
+            self.fail('Could not extract any links')
diff --git a/module/plugins/crypter/WiiReloadedOrg.py b/module/plugins/crypter/WiiReloadedOrg.py
index ba101892d..31c041bf0 100644
--- a/module/plugins/crypter/WiiReloadedOrg.py
+++ b/module/plugins/crypter/WiiReloadedOrg.py
@@ -1,8 +1,8 @@
-
 import re
 
 from module.plugins.Crypter import Crypter
 
+
 class WiiReloadedOrg(Crypter):
     __name__ = "WiiReloadedOrg"
     __type__ = "crypter"
@@ -12,16 +12,15 @@ class WiiReloadedOrg(Crypter):
     __description__ = """Wii-Reloaded.org Crypter Plugin"""
     __author_name__ = ("hzpz")
     __author_mail__ = ("none")
-    
-    
+
     def decrypt(self, pyfile):
         url = pyfile.url
         src = self.req.load(str(url))
-        
+
         ids = re.findall(r"onClick=\"popup_dl\((.+)\)\"", src)
         if len(ids) == 0:
             self.fail("Unable to decrypt links, this plugin probably needs to be updated")
-        
+
         packageName = self.pyfile.package().name
         if self.getConfig("changeName"):
             packageNameMatch = re.search(r"<div id=\"foldername\">(.+)</div>", src)
@@ -29,9 +28,9 @@ class WiiReloadedOrg(Crypter):
                 self.logWarning("Unable to get folder name, this plugin probably needs to be updated")
             else:
                 packageName = packageNameMatch.group(1)
-                
+
         self.pyfile.package().password = "wii-reloaded.info"
-        
+
         self.logDebug("Processing %d links" % len(ids))
         links = []
         for id in ids:
@@ -47,6 +46,6 @@ class WiiReloadedOrg(Crypter):
                 self.offline()
             self.logDebug("Decrypted link: %s" % redirectLocation)
             links.append(redirectLocation)
-            
+
         self.logDebug("Decrypted %d links" % len(links))
-        self.packages.append((packageName, links, packageName))
\ No newline at end of file
+        self.packages.append((packageName, links, packageName))
diff --git a/module/plugins/crypter/YoutubeBatch.py b/module/plugins/crypter/YoutubeBatch.py
index 72b72aab7..b6178448d 100644
--- a/module/plugins/crypter/YoutubeBatch.py
+++ b/module/plugins/crypter/YoutubeBatch.py
@@ -8,6 +8,7 @@ from module.plugins.Crypter import Crypter
 
 API_KEY = "AIzaSyCKnWLNlkX-L4oD1aEzqqhRw1zczeD6_k0"
 
+
 class YoutubeBatch(Crypter):
     __name__ = "YoutubeBatch"
     __type__ = "container"
@@ -18,7 +19,8 @@ class YoutubeBatch(Crypter):
     __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org", "zoidberg@mujmail.cz", "roland@enkore.de")
 
     def get_videos(self, playlist_id, token=None):
-        url = "https://www.googleapis.com/youtube/v3/playlistItems?playlistId=%s&part=snippet&key=%s&maxResults=50" % (playlist_id, API_KEY)
+        url = "https://www.googleapis.com/youtube/v3/playlistItems?playlistId=%s&part=snippet&key=%s&maxResults=50" % (
+            playlist_id, API_KEY)
         if token:
             url += "&pageToken=" + token