12 files changed, 70 insertions, 20 deletions
diff --git a/pyload/plugin/hoster/ExtabitCom.py b/pyload/plugin/hoster/ExtabitCom.py
index dfd37b0a0..c0fa782fa 100644
--- a/pyload/plugin/hoster/ExtabitCom.py
+++ b/pyload/plugin/hoster/ExtabitCom.py
@@ -4,7 +4,7 @@ import re
 
 from pyload.utils import json_loads
 
-from pyload.plugin.internal.CaptchaService import ReCaptcha
+from pyload.plugin.captcha.ReCaptcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster, secondsToMidnight
 
 
diff --git a/pyload/plugin/hoster/FileserveCom.py b/pyload/plugin/hoster/FileserveCom.py
index 18322fa00..eb80889b1 100644
--- a/pyload/plugin/hoster/FileserveCom.py
+++ b/pyload/plugin/hoster/FileserveCom.py
@@ -6,7 +6,7 @@ from pyload.utils import json_loads
 from pyload.network.RequestFactory import getURL
 from pyload.plugin.Hoster import Hoster
 from pyload.plugin.Plugin import chunks
-from pyload.plugin.internal.CaptchaService import ReCaptcha
+from pyload.plugin.captcha.ReCaptcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import secondsToMidnight
 from pyload.utils import parseFileSize
 
diff --git a/pyload/plugin/hoster/FreakshareCom.py b/pyload/plugin/hoster/FreakshareCom.py
index 331d7f2a3..53eb10e55 100644
--- a/pyload/plugin/hoster/FreakshareCom.py
+++ b/pyload/plugin/hoster/FreakshareCom.py
@@ -3,7 +3,7 @@
 import re
 
 from pyload.plugin.Hoster import Hoster
-from pyload.plugin.internal.CaptchaService import ReCaptcha
+from pyload.plugin.captcha.ReCaptcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import secondsToMidnight
 
 
diff --git a/pyload/plugin/hoster/Keep2ShareCc.py b/pyload/plugin/hoster/Keep2ShareCc.py
index 3c2b6c570..67af087b7 100644
--- a/pyload/plugin/hoster/Keep2ShareCc.py
+++ b/pyload/plugin/hoster/Keep2ShareCc.py
@@ -4,7 +4,7 @@ import re
 
 from urlparse import urljoin
 
-from pyload.plugin.internal.CaptchaService import ReCaptcha
+from pyload.plugin.captcha.ReCaptcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugin/hoster/LetitbitNet.py b/pyload/plugin/hoster/LetitbitNet.py
index 01767cabf..545cde27c 100644
--- a/pyload/plugin/hoster/LetitbitNet.py
+++ b/pyload/plugin/hoster/LetitbitNet.py
@@ -12,7 +12,7 @@ from urlparse import urljoin
 
 from pyload.utils import json_loads, json_dumps
 from pyload.network.RequestFactory import getURL
-from pyload.plugin.internal.CaptchaService import ReCaptcha
+from pyload.plugin.captcha.ReCaptcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster, secondsToMidnight
 
 
diff --git a/pyload/plugin/hoster/MediafireCom.py b/pyload/plugin/hoster/MediafireCom.py
index 3b39e2420..8b05a95ec 100644
--- a/pyload/plugin/hoster/MediafireCom.py
+++ b/pyload/plugin/hoster/MediafireCom.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.CaptchaService import SolveMedia
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from pyload.plugin.captcha.SolveMedia import SolveMedia
+from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class MediafireCom(SimpleHoster):
@@ -58,6 +58,3 @@ class MediafireCom(SimpleHoster):
                     self.fail(_("Incorrect password"))
 
         return super(MediafireCom, self).handleFree(pyfile)
-
-
-getInfo = create_getInfo(MediafireCom)
diff --git a/pyload/plugin/hoster/MegaRapidoNet.py b/pyload/plugin/hoster/MegaRapidoNet.py
new file mode 100644
index 000000000..938b201d5
--- /dev/null
+++ b/pyload/plugin/hoster/MegaRapidoNet.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+
+from random import randint
+
+from pyload.plugin.internal.MultiHoster import MultiHoster
+
+
+def random_with_N_digits(n):
+    rand = "0."
+    not_zero = 0
+    for i in range(1,n+1):
+        r = randint(0,9)
+        if(r > 0):
+            not_zero += 1
+        rand += str(r)
+
+    if not_zero > 0:
+        return rand
+    else:
+        return random_with_N_digits(n)
+
+
+class MegaRapidoNet(MultiHoster):
+    __name__    = "MegaRapidoNet"
+    __type__    = "hoster"
+    __version__ = "0.02"
+
+    __pattern__ = r'http://(?:www\.)?\w+\.megarapido\.net/\?file=\w+'
+    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+
+    __description__ = """MegaRapido.net multi-hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
+
+
+    LINK_PREMIUM_PATTERN = r'<\s*?a[^>]*?title\s*?=\s*?["\'][^"\']*?download["\'][^>]*?href=["\']([^"\']*)'
+
+    ERROR_PATTERN = r'<\s*?div[^>]*?class\s*?=\s*?["\']?alert-message error[^>]*>([^<]*)'
+
+
+    def handlePremium(self, pyfile):
+        self.html = self.load("http://megarapido.net/gerar.php",
+                         post={'rand'     :random_with_N_digits(16),
+                               'urllist'  : pyfile.url,
+                               'links'    : pyfile.url,
+                               'exibir'   : "normal",
+                               'usar'     : "premium",
+                               'user'     : self.account.getAccountInfo(self.user).get('sid', None),
+                               'autoreset': ""})
+
+        if "desloga e loga novamente para gerar seus links" in self.html.lower():
+            self.error("You have logged in at another place")
+
+        return super(MegaRapidoNet, self).handlePremium(pyfile)
diff --git a/pyload/plugin/hoster/NitroflareCom.py b/pyload/plugin/hoster/NitroflareCom.py
index dfe33e59c..d2bcd871d 100644
--- a/pyload/plugin/hoster/NitroflareCom.py
+++ b/pyload/plugin/hoster/NitroflareCom.py
@@ -2,7 +2,7 @@
 
 import re
 
-from pyload.plugin.internal.CaptchaService import ReCaptcha
+from pyload.plugin.captcha.ReCaptcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugin/hoster/RapidgatorNet.py b/pyload/plugin/hoster/RapidgatorNet.py
index 2af0001df..98a8b97c9 100644
--- a/pyload/plugin/hoster/RapidgatorNet.py
+++ b/pyload/plugin/hoster/RapidgatorNet.py
@@ -6,8 +6,10 @@ from pycurl import HTTPHEADER
 
 from pyload.utils import json_loads
 from pyload.network.HTTPRequest import BadHeader
-from pyload.plugin.internal.CaptchaService import AdsCaptcha, ReCaptcha, SolveMedia
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, secondsToMidnight
+from pyload.plugin.captcha.AdsCaptcha import AdsCaptcha
+from pyload.plugin.captcha.ReCaptcha import ReCaptcha
+from pyload.plugin.captcha.SolveMedia import SolveMedia
+from pyload.plugin.internal.SimpleHoster import SimpleHoster, secondsToMidnight
 
 
 class RapidgatorNet(SimpleHoster):
diff --git a/pyload/plugin/hoster/SoundcloudCom.py b/pyload/plugin/hoster/SoundcloudCom.py
index 31aa7ba3c..524fb6e13 100644
--- a/pyload/plugin/hoster/SoundcloudCom.py
+++ b/pyload/plugin/hoster/SoundcloudCom.py
@@ -2,8 +2,8 @@
 
 import re
 
-from module.plugin.internal.SimpleHoster import SimpleHoster
-from module.common.json_layer import json_loads
+from pyload.plugin.internal.SimpleHoster import SimpleHoster
+from pyload.utils import json_loads
 
 
 class SoundcloudCom(SimpleHoster):
@@ -51,6 +51,3 @@ class SoundcloudCom(SimpleHoster):
         if http_streams:
             stream_name, self.link = http_streams[0 if self.getConfig('quality') == "Higher" else -1]
             pyfile.name += '.' + stream_name.split('_')[1].lower()
-
-
-getInfo = create_getInfo(SoundcloudCom)
diff --git a/pyload/plugin/hoster/UploadedTo.py b/pyload/plugin/hoster/UploadedTo.py
index 165b29c7a..207817122 100644
--- a/pyload/plugin/hoster/UploadedTo.py
+++ b/pyload/plugin/hoster/UploadedTo.py
@@ -4,7 +4,7 @@ import re
 import time
 
 from pyload.network.RequestFactory import getURL
-from pyload.plugin.internal.CaptchaService import ReCaptcha
+from pyload.plugin.captcha.ReCaptcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
diff --git a/pyload/plugin/hoster/ZippyshareCom.py b/pyload/plugin/hoster/ZippyshareCom.py
index 784eccb68..9b1d432cc 100644
--- a/pyload/plugin/hoster/ZippyshareCom.py
+++ b/pyload/plugin/hoster/ZippyshareCom.py
@@ -4,7 +4,7 @@ import re
 
 from BeautifulSoup import BeautifulSoup
 
-from pyload.plugin.internal.CaptchaService import ReCaptcha
+from pyload.plugin.captcha.ReCaptcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster