1 files changed, 14 insertions, 32 deletions
diff --git a/module/plugins/hoster/FshareVn.py b/module/plugins/hoster/FshareVn.py
index a3f9703df..872511afc 100644
--- a/module/plugins/hoster/FshareVn.py
+++ b/module/plugins/hoster/FshareVn.py
@@ -3,6 +3,7 @@
 import re
 
 from time import strptime, mktime, gmtime
+from urlparse import urljoin
 
 from module.network.RequestFactory import getURL
 from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo
@@ -24,7 +25,7 @@ def doubleDecode(m):
 class FshareVn(SimpleHoster):
     __name__    = "FshareVn"
     __type__    = "hoster"
-    __version__ = "0.18"
+    __version__ = "0.19"
 
     __pattern__ = r'http://(?:www\.)?fshare\.vn/file/.+'
 
@@ -38,31 +39,26 @@ class FshareVn(SimpleHoster):
 
     NAME_REPLACEMENTS = [("(.*)", doubleDecode)]
 
-    LINK_PATTERN = r'action="(http://download.*?)[#"]'
+    LINK_FREE_PATTERN = r'action="(http://download.*?)[#"]'
     WAIT_PATTERN = ur'Lượt tải xuống kế tiếp là:\s*(.*?)\s*<'
 
 
-    def process(self, pyfile):
-        self.html = self.load('http://www.fshare.vn/check_link.php', post={
-            "action": "check_link",
-            "arrlinks": pyfile.url
-        }, decode=True)
-        self.getFileInfo()
+    def preload(self):
+        self.html = self.load("http://www.fshare.vn/check_link.php",
+                              post={'action': "check_link", 'arrlinks': pyfile.url},
+                              decode=True)
 
-        if self.premium:
-            self.handlePremium()
-        else:
-            self.handleFree()
-        self.checkDownloadedFile()
+        if isinstance(self.TEXT_ENCODING, basestring):
+            self.html = unicode(self.html, self.TEXT_ENCODING)
 
 
-    def handleFree(self):
-        self.html = self.load(self.pyfile.url, decode=True)
+    def handleFree(self, pyfile):
+        self.html = self.load(pyfile.url, decode=True)
 
         self.checkErrors()
 
         action, inputs = self.parseHtmlForm('frm_download')
-        self.url = self.pyfile.url + action
+        self.url = urljoin(pyfile.url, action)
 
         if not inputs:
             self.error(_("No FORM"))
@@ -88,9 +84,9 @@ class FshareVn(SimpleHoster):
         m = re.search(r'var count = (\d+)', self.html)
         self.setWait(int(m.group(1)) if m else 30)
 
-        m = re.search(self.LINK_PATTERN, self.html)
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
-            self.error(_("LINK_PATTERN not found"))
+            self.error(_("LINK_FREE_PATTERN not found"))
         self.url = m.group(1)
         self.logDebug("FREE DL URL: %s" % self.url)
 
@@ -98,10 +94,6 @@ class FshareVn(SimpleHoster):
         self.download(self.url)
 
 
-    def handlePremium(self):
-        self.download(self.pyfile.url)
-
-
     def checkErrors(self):
         if '/error.php?' in self.req.lastEffectiveURL or u"Liên kết bạn chọn không tồn" in self.html:
             self.offline()
@@ -118,13 +110,3 @@ class FshareVn(SimpleHoster):
             self.retry(30, 2 * 60, msg)
 
         self.info.pop('error', None)
-
-
-    def checkDownloadedFile(self):
-        # check download
-        check = self.checkDownload({
-            "not_found": "<head><title>404 Not Found</title></head>"
-        })
-
-        if check == "not_found":
-            self.fail(_("File not m on server"))