5 files changed, 6 insertions, 8 deletions

diff --git a/module/plugins/Container.py b/module/plugins/Container.py
index 9795ec98a..1539ea37e 100644
--- a/module/plugins/Container.py
+++ b/module/plugins/Container.py
@@ -17,11 +17,10 @@
     @author: mkaay
 """
 
-### can be left blank and removed in future, no seperation of crypter and container needed atm.
-
 from module.plugins.Crypter import Crypter
 
 from os.path import join, exists, basename
+from os import remove
 
 class Container(Crypter):
     __name__ = "Container"
@@ -38,6 +37,8 @@ class Container(Crypter):
     def preprocessing(self, thread):
         """prepare"""
         self.thread = thread
+        
+        self.loadToDisk()
 
         self.decrypt(self.pyfile)
         self.deleteTmp()
@@ -71,6 +72,6 @@ class Container(Crypter):
     #----------------------------------------------------------------------
     def deleteTmp(self):
         if self.pyfile.name.startswith("tmp_"):
-            os.remove(self.pyfile.url)
+            remove(self.pyfile.url)
 
         
diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py
index 6032cd052..a18a7c309 100644
--- a/module/plugins/container/CCF.py
+++ b/module/plugins/container/CCF.py
@@ -19,7 +19,6 @@ class CCF(Container):
     __author_mail__ = ("Willnix@pyload.org")
 
     def decrypt(self, pyfile):
-        self.loadToDisk()
     
         infile = pyfile.url.replace("\n", "")
 
diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py
index 9668b34ad..c9e7a85a3 100644
--- a/module/plugins/container/LinkList.py
+++ b/module/plugins/container/LinkList.py
@@ -14,9 +14,7 @@ class LinkList(Container):
 
 
     def decrypt(self, pyfile):
-        
-        self.loadToDisk()
-        
+                
         txt = open(pyfile.url, 'r')
         links = txt.readlines()
         curPack = "Parsed links %s" % pyfile.name
diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py
index ebd41d279..de2ff9048 100644
--- a/module/plugins/container/RSDF.py
+++ b/module/plugins/container/RSDF.py
@@ -16,7 +16,6 @@ class RSDF(Container):
 
     
     def decrypt(self, pyfile):
-        self.loadToDisk()
     
         from Crypto.Cipher import AES
 
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index a374a0c4d..9d3b0d387 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -92,6 +92,7 @@ class NetloadIn(Hoster):
             try:
                 captcha_url = "http://netload.in/" + re.search('(share/includes/captcha.php\?t=\d*)', self.html[1]).group(1)
             except:
+                open("dump.html", "w").write(self.html[1])
                 url_captcha_html = "http://netload.in/" + re.search('(index.php\?id=10&.*&captcha=1)', self.html[1]).group(1).replace("amp;", "")
                 self.html[1] = self.load(url_captcha_html, cookies=True)
                 captcha_url = "http://netload.in/" + re.search('(share/includes/captcha.php\?t=\d*)', self.html[1]).group(1)