Fix previous merging

28 files changed, 266 insertions, 82 deletions

diff --git a/pyload/plugins/account/BillionuploadsCom.py b/pyload/plugins/account/BillionuploadsCom.py
new file mode 100644
index 000000000..a8ad94bd3
--- /dev/null
+++ b/pyload/plugins/account/BillionuploadsCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class BillionuploadsCom(XFSPAccount):
+    __name__ = "BillionuploadsCom"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """Billionuploads.com account plugin"""
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_URL = "http://www.billionuploads.com/"
diff --git a/pyload/plugins/account/EasybytezCom.py b/pyload/plugins/account/EasybytezCom.py
index 0fcc187dc..bb4948811 100644
--- a/pyload/plugins/account/EasybytezCom.py
+++ b/pyload/plugins/account/EasybytezCom.py
@@ -4,7 +4,7 @@ import re
 
 from time import mktime, strptime, gmtime
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 from pyload.utils import parseFileSize
 
 
diff --git a/pyload/plugins/account/FileParadoxIn.py b/pyload/plugins/account/FileParadoxIn.py
new file mode 100644
index 000000000..f36456da0
--- /dev/null
+++ b/pyload/plugins/account/FileParadoxIn.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class FileParadoxIn(XFSPAccount):
+    __name__ = "FileParadoxIn"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """FileParadox.in account plugin"""
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_URL = "http://www.fileparadox.in/"
diff --git a/pyload/plugins/account/FileomCom.py b/pyload/plugins/account/FileomCom.py
new file mode 100644
index 000000000..3ca32416d
--- /dev/null
+++ b/pyload/plugins/account/FileomCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class FileomCom(XFSPAccount):
+    __name__ = "FileomCom"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """Fileom.com account plugin"""
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_URL = "http://www.fileom.com/"
diff --git a/pyload/plugins/account/HugefilesNet.py b/pyload/plugins/account/HugefilesNet.py
new file mode 100644
index 000000000..d9828e333
--- /dev/null
+++ b/pyload/plugins/account/HugefilesNet.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class HugefilesNet(XFSPAccount):
+    __name__ = "HugefilesNet"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """Hugefiles.net account plugin"""
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_URL = "http://www.hugefiles.net/"
diff --git a/pyload/plugins/account/HundredEightyUploadCom.py b/pyload/plugins/account/HundredEightyUploadCom.py
new file mode 100644
index 000000000..77768fbef
--- /dev/null
+++ b/pyload/plugins/account/HundredEightyUploadCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class HundredEightyUploadCom(XFSPAccount):
+    __name__ = "HundredEightyUploadCom"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """180upload.com account plugin"""
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_URL = "http://www.180upload.com/"
diff --git a/pyload/plugins/account/LomafileCom.py b/pyload/plugins/account/LomafileCom.py
new file mode 100644
index 000000000..b1faf3bf6
--- /dev/null
+++ b/pyload/plugins/account/LomafileCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class LomafileCom(XFSPAccount):
+    __name__ = "LomafileCom"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """Lomafile.com account plugin"""
+    __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
+
+
+    HOSTER_URL = "http://www.lomafile.com/"
diff --git a/pyload/plugins/account/NosuploadCom.py b/pyload/plugins/account/NosuploadCom.py
new file mode 100644
index 000000000..b02ae50e8
--- /dev/null
+++ b/pyload/plugins/account/NosuploadCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class NosuploadCom(XFSPAccount):
+    __name__ = "NosuploadCom"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """Nosupload.com account plugin"""
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_URL = "http://www.nosupload.com/"
diff --git a/pyload/plugins/account/NovafileCom.py b/pyload/plugins/account/NovafileCom.py
new file mode 100644
index 000000000..fa5e28946
--- /dev/null
+++ b/pyload/plugins/account/NovafileCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class NovafileCom(XFSPAccount):
+    __name__ = "NovafileCom"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """Novafile.com account plugin"""
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_URL = "http://www.novafile.com/"
diff --git a/pyload/plugins/account/SecureUploadEu.py b/pyload/plugins/account/SecureUploadEu.py
new file mode 100644
index 000000000..efcfabba0
--- /dev/null
+++ b/pyload/plugins/account/SecureUploadEu.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class SecureUploadEu(XFSPAccount):
+    __name__ = "SecureUploadEu"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """SecureUpload.eu account plugin"""
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_URL = "http://www.secureupload.eu/"
diff --git a/pyload/plugins/account/SendmywayCom.py b/pyload/plugins/account/SendmywayCom.py
new file mode 100644
index 000000000..5a169dcc0
--- /dev/null
+++ b/pyload/plugins/account/SendmywayCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class SendmywayCom(XFSPAccount):
+    __name__ = "SendmywayCom"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """Sendmyway.com account plugin"""
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_URL = "http://www.sendmyway.com/"
diff --git a/pyload/plugins/account/StreamcloudEu.py b/pyload/plugins/account/StreamcloudEu.py
new file mode 100644
index 000000000..78d4179bf
--- /dev/null
+++ b/pyload/plugins/account/StreamcloudEu.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class StreamcloudEu(XFSPAccount):
+    __name__ = "StreamcloudEu"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """Streamcloud.eu account plugin"""
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_URL = "http://www.streamcloud.eu/"
diff --git a/pyload/plugins/account/TusfilesNet.py b/pyload/plugins/account/TusfilesNet.py
index 6a80105be..36110fca7 100644
--- a/pyload/plugins/account/TusfilesNet.py
+++ b/pyload/plugins/account/TusfilesNet.py
@@ -4,7 +4,7 @@ import re
 
 from time import mktime, strptime, gmtime
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
 from pyload.utils import parseFileSize
 
 
diff --git a/pyload/plugins/account/VidPlayNet.py b/pyload/plugins/account/VidPlayNet.py
new file mode 100644
index 000000000..a7e71365e
--- /dev/null
+++ b/pyload/plugins/account/VidPlayNet.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class VidPlayNet(XFSPAccount):
+    __name__ = "VidPlayNet"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """VidPlay.net account plugin"""
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_URL = "http://www.vidplay.net/"
diff --git a/pyload/plugins/base/Addon.py b/pyload/plugins/base/Addon.py
index 3cc152666..2dfeba83c 100644
--- a/pyload/plugins/base/Addon.py
+++ b/pyload/plugins/base/Addon.py
@@ -31,8 +31,9 @@ class Addon(Base):
     __config__ = [("name", "type", "desc", "default")]
 
     __description__ = """Interface for addon"""
-    __author_name__ = ("mkaay", "RaNaN")
-    __author_mail__ = ("mkaay@mkaay.de", "RaNaN@pyload.org")
+    __authors__ = [("mkaay", "mkaay@mkaay.de"),
+                   ("RaNaN", "RaNaN@pyload.org")]
+
 
     #: automatically register event listeners for functions, attribute will be deleted dont use it yourself
     event_map = None
diff --git a/pyload/plugins/base/Captcha.py b/pyload/plugins/base/Captcha.py
index 4aafedd5f..86b073710 100644
--- a/pyload/plugins/base/Captcha.py
+++ b/pyload/plugins/base/Captcha.py
@@ -10,13 +10,13 @@ class Captcha(Plugin):
     __version__ = "0.09"
 
     __description__ = """Base captcha service plugin"""
-    __author_name__ = "pyLoad Team"
-    __author_mail__ = "admin@pyload.org"
+    __authors__ = [("pyLoad Team", "admin@pyload.org")]
 
-    KEY_PATTERN = None
 
     key = None
 
+    KEY_PATTERN = None
+
 
     def __init__(self, plugin):
         self.plugin = plugin
@@ -47,64 +47,3 @@ class Captcha(Plugin):
 
     def result(self, server, challenge):
         raise NotImplementedError
-
-
-class ReCaptcha(CaptchaService):
-    __name__ = "ReCaptcha"
-    __version__ = "0.02"
-
-    __description__ = """ReCaptcha captcha service plugin"""
-    __author_name__ = "pyLoad Team"
-    __author_mail__ = "admin@pyload.org"
-
-
-    KEY_PATTERN = r"https?://(?:www\.)?google\.com/recaptcha/api/challenge\?k=(?P<KEY>\w+?)"
-    KEY_AJAX_PATTERN = r"Recaptcha\.create\s*\(\s*[\"'](?P<KEY>\w+)[\"']\s*,"
-
-
-    def detect_key(self, html=None):
-        if not html:
-            if hasattr(self.plugin, "html") and self.plugin.html:
-                html = self.plugin.html
-            else:
-                errmsg = "ReCaptcha html missing"
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
-
-        m = re.search(self.KEY_PATTERN, html)
-        if m is None:
-            m = re.search(self.KEY_AJAX_PATTERN, html)
-        if m:
-            self.key = m.group("KEY")
-            self.plugin.logDebug("ReCaptcha key: %s" % self.key)
-            return self.key
-        else:
-            self.plugin.logDebug("ReCaptcha key not found")
-            return None
-
-
-    def challenge(self, key=None):
-        if not key:
-            if self.key:
-                key = self.key
-            else:
-                errmsg = "ReCaptcha key missing"
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
-
-        js = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={'k': key}, cookies=True)
-
-        try:
-            challenge = re.search("challenge : '(.+?)',", js).group(1)
-            server = re.search("server : '(.+?)',", js).group(1)
-        except:
-            self.plugin.parseError("ReCaptcha challenge pattern not found")
-
-        result = self.result(server, challenge)
-
-        return challenge, result
-
-
-    def result(self, server, challenge):
-        return self.plugin.decryptCaptcha("%simage" % server, get={'c': challenge},
-                                          cookies=True, forceUser=True, imgtype="jpg")
diff --git a/pyload/plugins/captcha/AdsCaptcha.py b/pyload/plugins/captcha/AdsCaptcha.py
index 277adf3cf..8d4e12e28 100644
--- a/pyload/plugins/captcha/AdsCaptcha.py
+++ b/pyload/plugins/captcha/AdsCaptcha.py
@@ -12,8 +12,7 @@ class AdsCaptcha(Captcha):
     __version__ = "0.02"
 
     __description__ = """AdsCaptcha captcha service plugin"""
-    __author_name__ = "pyLoad Team"
-    __author_mail__ = "admin@pyload.org"
+    __authors__ = [("pyLoad Team", "admin@pyload.org")]
 
 
     ID_PATTERN = r'http://api\.adscaptcha\.com/Get\.aspx\?[^"\']*CaptchaId=(?P<ID>\d+)'
diff --git a/pyload/plugins/captcha/ReCaptcha.py b/pyload/plugins/captcha/ReCaptcha.py
index 841629e9d..445f6b361 100644
--- a/pyload/plugins/captcha/ReCaptcha.py
+++ b/pyload/plugins/captcha/ReCaptcha.py
@@ -10,8 +10,7 @@ class ReCaptcha(Captcha):
     __version__ = "0.02"
 
     __description__ = """ReCaptcha captcha service plugin"""
-    __author_name__ = "pyLoad Team"
-    __author_mail__ = "admin@pyload.org"
+    __authors__ = [("pyLoad Team", "admin@pyload.org")]
 
 
     KEY_PATTERN = r"https?://(?:www\.)?google\.com/recaptcha/api/challenge\?k=(?P<KEY>\w+?)"
diff --git a/pyload/plugins/captcha/SolveMedia.py b/pyload/plugins/captcha/SolveMedia.py
index c1855cdfe..c8e87bb7a 100644
--- a/pyload/plugins/captcha/SolveMedia.py
+++ b/pyload/plugins/captcha/SolveMedia.py
@@ -10,8 +10,7 @@ class SolveMedia(Captcha):
     __version__ = "0.02"
 
     __description__ = """SolveMedia captcha service plugin"""
-    __author_name__ = "pyLoad Team"
-    __author_mail__ = "admin@pyload.org"
+    __authors__ = [("pyLoad Team", "admin@pyload.org")]
 
 
     KEY_PATTERN = r'http://api\.solvemedia\.com/papi/challenge\.(no)?script\?k=(?P<KEY>.+?)"'
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):