1 files changed, 43 insertions, 40 deletions
diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py
index 8eeabc17c..5f6fd2d4c 100644
--- a/module/plugins/hoster/FastixRu.py
+++ b/module/plugins/hoster/FastixRu.py
@@ -1,20 +1,25 @@
 # -*- coding: utf-8 -*-
 
 import re
-from urllib import unquote
+
 from random import randrange
-from module.plugins.Hoster import Hoster
+from urllib import unquote
+
 from module.common.json_layer import json_loads
+from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 
 
-class FastixRu(Hoster):
-    __name__ = "FastixRu"
-    __version__ = "0.04"
-    __type__ = "hoster"
-    __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/(?P<ID>[a-zA-Z0-9]{24})'
+class FastixRu(MultiHoster):
+    __name__    = "FastixRu"
+    __type__    = "hoster"
+    __version__ = "0.08"
+
+    __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}'
+
     __description__ = """Fastix hoster plugin"""
-    __author_name__ = "Massimo Rosamilia"
-    __author_mail__ = "max@spiritix.eu"
+    __license__     = "GPLv3"
+    __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")]
+
 
     def getFilename(self, url):
         try:
@@ -25,42 +30,40 @@ class FastixRu(Hoster):
             name += "%s.tmp" % randrange(100, 999)
         return name
 
+
     def setup(self):
-        self.chunkLimit = 3
+        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")
+
+    def handlePremium(self):
+        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': self.pyfile.url})
+        data = json_loads(page)
+
+        self.logDebug("Json data", data)
+
+        if "error\":true" in page:
+            self.offline()
         else:
-            self.logDebug("Old URL: %s" % pyfile.url)
-            api_key = self.account.getAccountData(self.user)
-            api_key = api_key["api"]
-            url = "http://fastix.ru/api_v2/?apikey=%s&sub=getdirectlink&link=%s" % (api_key, pyfile.url)
-            page = self.load(url)
-            data = json_loads(page)
-            self.logDebug("Json data: %s" % str(data))
-            if "error\":true" in page:
-                self.offline()
-            else:
-                new_url = data["downloadlink"]
-
-        if new_url != pyfile.url:
-            self.logDebug("New URL: %s" % new_url)
-
-        if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown"):
+            self.link = data['downloadlink']
+
+        if self.link != self.pyfile.url:
+            self.logDebug("New URL: %s" % self.link)
+
+        if self.pyfile.name.startswith("http") or self.pyfile.name.startswith("Unknown"):
             #only use when name wasnt already set
-            pyfile.name = self.getFilename(new_url)
+            self.pyfile.name = self.getFilename(self.link)
+
+
+    def checkFile(self):
+        super(FastixRu, self).checkFile()
 
-        self.download(new_url, disposition=True)
+        if self.checkDownload({"error": "<title>An error occurred while processing your request</title>"}) is "error":
+            self.retry(wait_time=60, reason=_("An error occurred while generating link"))
 
-        check = self.checkDownload({"error": "<title>An error occurred while processing your request</title>",
-                                    "empty": re.compile(r"^$")})
 
-        if check == "error":
-            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.")
+getInfo = create_getInfo(FastixRu)