Merge pull request #320 from vuolter/s/dead_crypters

Mark dead crypters as DeadCrypter

1 files changed, 3 insertions, 17 deletions

diff --git a/module/plugins/crypter/MBLinkInfo.py b/module/plugins/crypter/MBLinkInfo.py
index e266c7722..434819d07 100644
--- a/module/plugins/crypter/MBLinkInfo.py
+++ b/module/plugins/crypter/MBLinkInfo.py
@@ -1,27 +1,13 @@
 # -*- coding: utf-8 -*-
 
-import re
+from module.plugins.internal.DeadCrypter import DeadCrypter
 
-from module.plugins.Crypter import Crypter
 
-
-class MBLinkInfo(Crypter):
+class MBLinkInfo(DeadCrypter):
     __name__ = "MBLinkInfo"
     __type__ = "container"
     __pattern__ = r"http://(?:www\.)?mblink\.info/?\?id=(\d+)"
-    __version__ = "0.02"
+    __version__ = "0.03"
     __description__ = """MBLink.Info Container Plugin"""
     __author_name__ = ("Gummibaer", "stickell")
     __author_mail__ = ("Gummibaer@wiki-bierkiste.de", "l.stickell@yahoo.it")
-
-    URL_PATTERN = r'<meta[^;]+; URL=(.*)["\']>'
-
-    def decrypt(self, pyfile):
-        src = self.load(pyfile.url)
-        found = re.search(self.URL_PATTERN, src)
-        if found:
-            link = found.group(1)
-            self.logDebug("Redirected to " + link)
-            self.core.files.addLinks([link], self.pyfile.package().id)
-        else:
-            self.fail('Unable to detect valid link')