Merge pull request #320 from vuolter/s/dead_crypters

Mark dead crypters as DeadCrypter

1 files changed, 3 insertions, 24 deletions

diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py
index f6637033b..98d7e8242 100755
--- a/module/plugins/crypter/OronComFolder.py
+++ b/module/plugins/crypter/OronComFolder.py
@@ -1,34 +1,13 @@
 # -*- coding: utf-8 -*-
 
-import re
+from module.plugins.internal.DeadCrypter import DeadCrypter
 
-from module.plugins.Crypter import Crypter
 
-
-class OronComFolder(Crypter):
+class OronComFolder(DeadCrypter):
     __name__ = "OronComFolder"
     __type__ = "crypter"
     __pattern__ = r"http://(?:www\.)?oron.com/folder/\w+"
-    __version__ = "0.1"
+    __version__ = "0.11"
     __description__ = """Oron.com Folder Plugin"""
     __author_name__ = ("DHMH")
     __author_mail__ = ("webmaster@pcProfil.de")
-
-    FOLDER_PATTERN = r'<table width="100%" cellpadding="7" cellspacing="1" class="tbl2">(.*)</table>\n		</div>'
-    LINK_PATTERN = r'<a href="([^"]+)" target="_blank">'
-
-    def decrypt(self, pyfile):
-        html = self.load(self.pyfile.url)
-
-        new_links = []
-
-        folder = re.search(self.FOLDER_PATTERN, html, re.DOTALL)
-        if folder is None:
-            self.fail("Parse error (FOLDER)")
-
-        new_links.extend(re.findall(self.LINK_PATTERN, folder.group(0)))
-
-        if new_links:
-            self.core.files.addLinks(new_links, self.pyfile.package().id)
-        else:
-            self.fail('Could not extract any links')
\ No newline at end of file