1 files changed, 12 insertions, 37 deletions
diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py
index a4c85b4ca..cc50f4229 100644
--- a/module/plugins/hoster/FastixRu.py
+++ b/module/plugins/hoster/FastixRu.py
@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-
-from random import randrange
-from urllib import unquote
+import urllib
 
 from module.common.json_layer import json_loads
 from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
@@ -12,58 +10,35 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 class FastixRu(MultiHoster):
     __name__    = "FastixRu"
     __type__    = "hoster"
-    __version__ = "0.08"
+    __version__ = "0.11"
 
-    __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/(?P<ID>\w{24})'
+    __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}'
+    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Fastix hoster plugin"""
+    __description__ = """Fastix multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")]
 
 
-    def getFilename(self, url):
-        try:
-            name = unquote(url.rsplit("/", 1)[1])
-        except IndexError:
-            name = "Unknown_Filename..."
-        if name.endswith("..."):  # incomplete filename, append random stuff
-            name += "%s.tmp" % randrange(100, 999)
-        return name
-
-
     def setup(self):
-        self.chunkLimit     = 3
-        self.resumeDownload = True
+        self.chunkLimit = 3
 
 
-    def handlePremium(self):
+    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': self.pyfile.url})
-        data = json_loads(page)
+        self.html = self.load("http://fastix.ru/api_v2/",
+                         get={'apikey': api_key, 'sub': "getdirectlink", 'link': pyfile.url})
+
+        data = json_loads(self.html)
 
         self.logDebug("Json data", data)
 
-        if "error\":true" in page:
+        if "error\":true" in self.html:
             self.offline()
         else:
             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
-            self.pyfile.name = self.getFilename(self.link)
-
-
-    def checkFile(self):
-        super(FastixRu, self).checkFile()
-
-        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"))
-
 
 getInfo = create_getInfo(FastixRu)