1 files changed, 24 insertions, 34 deletions
diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py
index d48912a51..8f1b9e694 100644
--- a/module/plugins/hoster/FastixRu.py
+++ b/module/plugins/hoster/FastixRu.py
@@ -6,17 +6,17 @@ from random import randrange
 from urllib import unquote
 
 from pyload.utils import json_loads
-from pyload.plugin.Hoster import Hoster
+from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 
 
-class FastixRu(Hoster):
+class FastixRu(MultiHoster):
     __name__    = "FastixRu"
     __type__    = "hoster"
-    __version__ = "0.04"
+    __version__ = "0.09"
 
-    __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/(?P<ID>\w{24})'
+    __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}'
 
-    __description__ = """Fastix hoster plugin"""
+    __description__ = """Fastix multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")]
 
@@ -33,44 +33,34 @@ class FastixRu(Hoster):
 
     def setup(self):
         self.chunkLimit = 3
-        self.resumeDownload = True
 
 
-    def process(self, pyfile):
-        if re.match(self.__pattern__, pyfile.url):
-            new_url = pyfile.url
-        elif not self.account:
-            self.logError(_("Please enter your %s account or deactivate this plugin") % "Fastix")
-            self.fail(_("No Fastix account provided"))
-        else:
-            self.logDebug("Old URL: %s" % pyfile.url)
-            api_key = self.account.getAccountData(self.user)
-            api_key = api_key['api']
+    def handlePremium(self, pyfile):
+        api_key = self.account.getAccountData(self.user)
+        api_key = api_key['api']
 
-            page = self.load("http://fastix.ru/api_v2/",
-                             get={'apikey': api_key, 'sub': "getdirectlink", 'link': pyfile.url})
-            data = json_loads(page)
+        self.html = self.load("http://fastix.ru/api_v2/",
+                         get={'apikey': api_key, 'sub': "getdirectlink", 'link': pyfile.url})
 
-            self.logDebug("Json data", data)
+        data = json_loads(self.html)
 
-            if "error\":true" in page:
-                self.offline()
-            else:
-                new_url = data['downloadlink']
+        self.logDebug("Json data", data)
 
-        if new_url != pyfile.url:
-            self.logDebug("New URL: %s" % new_url)
+        if "error\":true" in self.html:
+            self.offline()
+        else:
+            self.link = data['downloadlink']
 
         if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown"):
             #only use when name wasnt already set
-            pyfile.name = self.getFilename(new_url)
-
-        self.download(new_url, disposition=True)
+            pyfile.name = self.getFilename(self.link)
 
-        check = self.checkDownload({"error": "<title>An error occurred while processing your request</title>",
-                                    "empty": re.compile(r"^$")})
 
-        if check == "error":
+    def checkFile(self):
+        if self.checkDownload({"error": "<title>An error occurred while processing your request</title>"}):
             self.retry(wait_time=60, reason=_("An error occurred while generating link"))
-        elif check == "empty":
-            self.retry(wait_time=60, reason=_("Downloaded File was empty"))
+
+        return super(FastixRu, self).checkFile()
+
+
+getInfo = create_getInfo(FastixRu)