Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/internal/CaptchaService.py
	pyload/plugins/account/EasybytezCom.py
	pyload/plugins/account/TusfilesNet.py
	pyload/plugins/base/OCR.py
	pyload/plugins/crypter/MultiuploadCom.py
	pyload/plugins/crypter/UploadableChFolder.py
	pyload/plugins/hoster/DuploadOrg.py
	pyload/plugins/hoster/EpicShareNet.py
	pyload/plugins/hoster/LemUploadsCom.py
	pyload/plugins/hoster/LoadTo.py
	pyload/plugins/hoster/LomafileCom.py
	pyload/plugins/hoster/MegaFilesSe.py
	pyload/plugins/hoster/MegareleaseOrg.py
	pyload/plugins/hoster/PandaPlanet.py
	pyload/plugins/hoster/PotloadCom.py
	pyload/plugins/hoster/PremiumTo.py
	pyload/plugins/hoster/TurbobitNet.py
	pyload/plugins/internal/DeadCrypter.py
	pyload/plugins/internal/DeadHoster.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/plugins/internal/UpdateManager.py
	pyload/plugins/ocr/LinksaveIn.py

14 files changed, 247 insertions, 0 deletions

diff --git a/module/plugins/accounts/BillionuploadsCom.py b/module/plugins/accounts/BillionuploadsCom.py
new file mode 100644
index 000000000..440c7889a
--- /dev/null
+++ b/module/plugins/accounts/BillionuploadsCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from module.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/module/plugins/accounts/FileParadoxIn.py b/module/plugins/accounts/FileParadoxIn.py
new file mode 100644
index 000000000..24c745e6a
--- /dev/null
+++ b/module/plugins/accounts/FileParadoxIn.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from module.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/module/plugins/accounts/FileomCom.py b/module/plugins/accounts/FileomCom.py
new file mode 100644
index 000000000..536d40812
--- /dev/null
+++ b/module/plugins/accounts/FileomCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from module.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/module/plugins/accounts/HugefilesNet.py b/module/plugins/accounts/HugefilesNet.py
new file mode 100644
index 000000000..296780b7c
--- /dev/null
+++ b/module/plugins/accounts/HugefilesNet.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from module.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/module/plugins/accounts/HundredEightyUploadCom.py b/module/plugins/accounts/HundredEightyUploadCom.py
new file mode 100644
index 000000000..76e757222
--- /dev/null
+++ b/module/plugins/accounts/HundredEightyUploadCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from module.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/module/plugins/accounts/LomafileCom.py b/module/plugins/accounts/LomafileCom.py
new file mode 100644
index 000000000..bddccdadc
--- /dev/null
+++ b/module/plugins/accounts/LomafileCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from module.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/module/plugins/accounts/NosuploadCom.py b/module/plugins/accounts/NosuploadCom.py
new file mode 100644
index 000000000..a75ca289f
--- /dev/null
+++ b/module/plugins/accounts/NosuploadCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from module.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/module/plugins/accounts/NovafileCom.py b/module/plugins/accounts/NovafileCom.py
new file mode 100644
index 000000000..34d3e25b5
--- /dev/null
+++ b/module/plugins/accounts/NovafileCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from module.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/module/plugins/accounts/SecureUploadEu.py b/module/plugins/accounts/SecureUploadEu.py
new file mode 100644
index 000000000..a8cf38df2
--- /dev/null
+++ b/module/plugins/accounts/SecureUploadEu.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from module.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/module/plugins/accounts/SendmywayCom.py b/module/plugins/accounts/SendmywayCom.py
new file mode 100644
index 000000000..9f6021774
--- /dev/null
+++ b/module/plugins/accounts/SendmywayCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from module.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/module/plugins/accounts/StreamcloudEu.py b/module/plugins/accounts/StreamcloudEu.py
new file mode 100644
index 000000000..4a544b691
--- /dev/null
+++ b/module/plugins/accounts/StreamcloudEu.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from module.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/module/plugins/accounts/VidPlayNet.py b/module/plugins/accounts/VidPlayNet.py
new file mode 100644
index 000000000..4c542024e
--- /dev/null
+++ b/module/plugins/accounts/VidPlayNet.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from module.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/module/plugins/hoster/FilepupNet.py b/module/plugins/hoster/FilepupNet.py
new file mode 100644
index 000000000..12b2f7798
--- /dev/null
+++ b/module/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 module.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/module/plugins/hoster/PandaPlaNet.py b/module/plugins/hoster/PandaPlaNet.py
new file mode 100644
index 000000000..9473726fa
--- /dev/null
+++ b/module/plugins/hoster/PandaPlaNet.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+from module.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)