3 files changed, 51 insertions, 2 deletions
diff --git a/module/plugins/crypter/HotfileFolderCom.py b/module/plugins/crypter/HotfileFolderCom.py
new file mode 100644
index 000000000..00771e2a3
--- /dev/null
+++ b/module/plugins/crypter/HotfileFolderCom.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.Crypter import Crypter
+
+class HotfileFolderCom(Crypter):
+    __name__ = "HotfileFolderCom"
+    __type__ = "crypter"
+    __pattern__ = r"http://(?:www\.)?hotfile.com/list/\w+/\w+"
+    __version__ = "0.1"
+    __description__ = """HotfileFolder Download Plugin"""
+    __author_name__ = ("RaNaN")
+    __author_mail__ = ("RaNaN@pyload.org")
+
+    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("/", "")
+        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
diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py
new file mode 100644
index 000000000..86777c61c
--- /dev/null
+++ b/module/plugins/crypter/NetfolderIn.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.Crypter import Crypter
+
+class NetfolderIn(Crypter):
+    __name__ = "NetfolderIn"
+    __type__ = "crypter"
+    __pattern__ = r"http://(?:www\.)?netfolder.in/(\w+/\w+|folder.php)"
+    __version__ = "0.1"
+    __description__ = """NetFolder Download Plugin"""
+    __author_name__ = ("RaNaN")
+    __author_mail__ = ("RaNaN@pyload.org")
+
+    def decrypt(self, pyfile):
+        html = self.load(pyfile.url)
+
+        name = re.findall(r'<span style="color: #ff9000;">([^<]+)', html)[0]
+        new_links = re.findall(r'href="(http://.{0,3}netload\.in/(datei|index.php?id=10&file_id=)[^"]+)', html)
+
+        new_links = [x[0] for x in new_links]
+
+        self.packages.append((name, new_links, name))
+\ No newline at end of file
diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py
index 161c7bd9d..adf62434d 100644
--- a/module/plugins/hoster/FileserveCom.py
+++ b/module/plugins/hoster/FileserveCom.py
@@ -92,8 +92,7 @@ class FileserveCom(Hoster):
         
         self.load(self.pyfile.url, post={"downloadLink":"show"})
 
-        header = self.load(self.pyfile.url, post={"download":"normal"}, just_header=True)
-        print header #TODO remove
+        self.load(self.pyfile.url, post={"download":"normal"}, just_header=True)
         self.download(self.pyfile.url, post={"download":"normal"})