Update plugins after merging

1 files changed, 11 insertions, 9 deletions

diff --git a/pyload/plugins/captcha/SolveMedia.py b/pyload/plugins/captcha/SolveMedia.py
index c8e87bb7a..d1b9eba6a 100644
--- a/pyload/plugins/captcha/SolveMedia.py
+++ b/pyload/plugins/captcha/SolveMedia.py
@@ -2,36 +2,38 @@
 
 import re
 
-from pyload.plugins.base.Captcha import Captcha
+from pyload.plugins.internal.Captcha import Captcha
 
 
 class SolveMedia(Captcha):
-    __name__ = "SolveMedia"
-    __version__ = "0.02"
+    __name__    = "SolveMedia"
+    __type__    = "captcha"
+    __version__ = "0.05"
 
     __description__ = """SolveMedia captcha service plugin"""
-    __authors__ = [("pyLoad Team", "admin@pyload.org")]
+    __license__     = "GPLv3"
+    __authors__     = [("pyLoad Team", "admin@pyload.org")]
 
 
-    KEY_PATTERN = r'http://api\.solvemedia\.com/papi/challenge\.(no)?script\?k=(?P<KEY>.+?)"'
+    KEY_PATTERN = r'api\.solvemedia\.com/papi/challenge\.(no)?script\?k=(?P<KEY>.+?)["\']'
 
 
     def challenge(self, key=None):
         if not key:
-            if self.key:
+            if self.detect_key():
                 key = self.key
             else:
-                errmsg = "SolveMedia key missing"
+                errmsg = _("SolveMedia key not found")
                 self.plugin.fail(errmsg)
                 raise TypeError(errmsg)
 
-        html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript", get={'k': key}, cookies=True)
+        html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript", get={'k': key})
         try:
             challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="([^"]+)">',
                                   html).group(1)
             server = "http://api.solvemedia.com/papi/media"
         except:
-            self.plugin.parseError("SolveMedia challenge pattern not found")
+            self.plugin.error("SolveMedia challenge pattern not found")
 
         result = self.result(server, challenge)