Fix previous merging

9 files changed, 75 insertions, 8 deletions

diff --git a/pyload/plugins/hoster/DuploadOrg.py b/pyload/plugins/hoster/DuploadOrg.py
index 02df654c2..213fb717a 100644
--- a/pyload/plugins/hoster/DuploadOrg.py
+++ b/pyload/plugins/hoster/DuploadOrg.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class DuploadOrg(DeadHoster):
diff --git a/pyload/plugins/hoster/EpicShareNet.py b/pyload/plugins/hoster/EpicShareNet.py
index f0fe766f5..75f35646e 100644
--- a/pyload/plugins/hoster/EpicShareNet.py
+++ b/pyload/plugins/hoster/EpicShareNet.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class EpicShareNet(DeadHoster):
diff --git a/pyload/plugins/hoster/FilepupNet.py b/pyload/plugins/hoster/FilepupNet.py
new file mode 100644
index 000000000..6c2437f67
--- /dev/null
+++ b/pyload/plugins/hoster/FilepupNet.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+#
+# Test links:
+# http://www.filepup.net/files/k5w4ZVoF1410184283.html
+# http://www.filepup.net/files/R4GBq9XH1410186553.html
+
+import re
+
+from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
+
+class FilepupNet(SimpleHoster):
+    __name__ = "FilepupNet"
+    __type__ = "hoster"
+    __version__ = "0.01"
+
+    __pattern__ = r'http://(?:www\.)?filepup\.net/files/\w+'
+
+    __description__ = """Filepup.net hoster plugin"""
+    __authors__ = [("zapp-brannigan", "fuerst.reinje@web.de"),
+                   ("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    FILE_NAME_PATTERN = r'>(?P<N>.+?)</h1>'
+    FILE_SIZE_PATTERN = r'class="fa fa-archive"></i> \((?P<S>[\d.]+) (?P<U>\w+)'
+
+    OFFLINE_PATTERN = r'>This file has been deleted'
+
+    LINK_PATTERN = r'(http://www\.filepup\.net/get/.+?)\''
+
+
+    def setup(self):
+        self.multiDL = False
+        self.chunkLimit = 1
+
+
+    def handleFree(self):
+        m = re.search(self.LINK_PATTERN, self.html)
+        if m is None:
+            self.parseError("Download link not found")
+
+        dl_link = m.group(1)
+        self.download(dl_link, post={'task': "download"})
+
+        check = self.checkDownload({'html': re.compile("html")})
+        if check == "html":
+            self.parseError("Downloaded file is an html file")
+
+
+getInfo = create_getInfo(FilepupNet)
diff --git a/pyload/plugins/hoster/LemUploadsCom.py b/pyload/plugins/hoster/LemUploadsCom.py
index 2c77f3106..62da76783 100644
--- a/pyload/plugins/hoster/LemUploadsCom.py
+++ b/pyload/plugins/hoster/LemUploadsCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class LemUploadsCom(DeadHoster):
diff --git a/pyload/plugins/hoster/LomafileCom.py b/pyload/plugins/hoster/LomafileCom.py
index 8184e9393..a7f14b179 100644
--- a/pyload/plugins/hoster/LomafileCom.py
+++ b/pyload/plugins/hoster/LomafileCom.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+from pyload.plugins.internal.XFileSharingPro import XFSPHoster, create_getInfo
 
 
-class LomafileCom(XFileSharingPro):
+class LomafileCom(XFSPHoster):
     __name__ = "LomafileCom"
     __type__ = "hoster"
     __version__ = "0.3"
diff --git a/pyload/plugins/hoster/MegaFilesSe.py b/pyload/plugins/hoster/MegaFilesSe.py
index e5b10f6e1..448e49802 100644
--- a/pyload/plugins/hoster/MegaFilesSe.py
+++ b/pyload/plugins/hoster/MegaFilesSe.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class MegaFilesSe(DeadHoster):
diff --git a/pyload/plugins/hoster/MegareleaseOrg.py b/pyload/plugins/hoster/MegareleaseOrg.py
index b627a8f10..5dd27b5b2 100644
--- a/pyload/plugins/hoster/MegareleaseOrg.py
+++ b/pyload/plugins/hoster/MegareleaseOrg.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class MegareleaseOrg(DeadHoster):
diff --git a/pyload/plugins/hoster/PandaPlaNet.py b/pyload/plugins/hoster/PandaPlaNet.py
new file mode 100644
index 000000000..fed55d278
--- /dev/null
+++ b/pyload/plugins/hoster/PandaPlaNet.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+
+
+class PandaPlaNet(DeadHoster):
+    __name__ = "PandaPlaNet"
+    __type__ = "hoster"
+    __version__ = "0.02"
+
+    __pattern__ = r'http://(?:www\.)?pandapla\.net/\w{12}'
+
+    __description__ = """Pandapla.net hoster plugin"""
+    __authors__ = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
+
+
+getInfo = create_getInfo(PandaPlaNet)
diff --git a/pyload/plugins/hoster/PotloadCom.py b/pyload/plugins/hoster/PotloadCom.py
index ce5f832a1..39f76a923 100644
--- a/pyload/plugins/hoster/PotloadCom.py
+++ b/pyload/plugins/hoster/PotloadCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
 class PotloadCom(DeadHoster):