[DeadHoster] Improve getInfo + two hosters mark dead

1 files changed, 4 insertions, 28 deletions

diff --git a/module/plugins/hoster/FilezyNet.py b/module/plugins/hoster/FilezyNet.py
index 969007a8a..1831465d3 100644
--- a/module/plugins/hoster/FilezyNet.py
+++ b/module/plugins/hoster/FilezyNet.py
@@ -1,42 +1,18 @@
 # -*- coding: utf-8 -*-
 
-import re
+from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
-from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
 
-
-class FilezyNet(XFileSharingPro):
+class FilezyNet(DeadHoster):
     __name__ = "FilezyNet"
     __type__ = "hoster"
-    __version__ = "0.1"
+    __version__ = "0.2"
 
-    __pattern__ = r'http://(?:www\.)?filezy.net/.*/.*.html'
+    __pattern__ = r'http://(?:www\.)?filezy\.net/\w{12}'
 
     __description__ = """Filezy.net hoster plugin"""
     __author_name__ = None
     __author_mail__ = None
 
-    HOSTER_NAME = "filezy.net"
-
-    FILE_SIZE_PATTERN = r'<span class="plansize">(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</span>'
-    WAIT_PATTERN = r'<div id="countdown_str" class="seconds">\n<!--Wait--> <span id=".*?">(\d+)</span>'
-    DOWNLOAD_JS_PATTERN = r"<script type='text/javascript'>eval(.*)"
-
-
-    def setup(self):
-        self.resumeDownload = True
-        self.multiDL = self.premium
-
-    def getDownloadLink(self):
-        self.logDebug("Getting download link")
-
-        data = self.getPostParameters()
-        self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True)
-
-        obfuscated_js = re.search(self.DOWNLOAD_JS_PATTERN, self.html)
-        dl_file_now = self.js.eval(obfuscated_js.group(1))
-        link = re.search(self.LINK_PATTERN, dl_file_now)
-        return link.group(1)
-
 
 getInfo = create_getInfo(FilezyNet)