From 0fd436d7d647d7c26b8b43e1ec09b7c7819e2df7 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Sun, 9 Jan 2011 15:30:33 +0100
Subject: closed #209, #211, #186

---
 module/plugins/accounts/FileserveCom.py | 4 +++-
 module/plugins/hoster/FileserveCom.py   | 8 ++++++--
 module/plugins/hoster/MegauploadCom.py  | 1 -
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'module/plugins')

diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py
index 7754de253..752987c0d 100644
--- a/module/plugins/accounts/FileserveCom.py
+++ b/module/plugins/accounts/FileserveCom.py
@@ -38,8 +38,10 @@ class FileserveCom(Account):
             zone = -5 if m.group(2) == "S" else -4
             validuntil = int(mktime(strptime(m.group(1), "%d %B %Y"))) + 24*3600 + (zone*3600)
             tmp = {"validuntil":validuntil, "trafficleft":-1}
+        elif 'Account Type</h4></td> <td><h5 class="inline">Free' in src:
+            tmp = {"premium": False, "trafficleft": None, "validuntil": None}
         else:
-            tmp = {"trafficleft":-1}
+            tmp = {"trafficleft": None}
         return tmp
     
     def login(self, user, data, req):
diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py
index 36d4b2f59..38d47ee3a 100644
--- a/module/plugins/hoster/FileserveCom.py
+++ b/module/plugins/hoster/FileserveCom.py
@@ -46,7 +46,11 @@ class FileserveCom(Hoster):
         
     def setup(self):
         if self.account:
-            self.req.canContinue = True
+            self.premium = self.account.getAccountInfo(self.user)["premium"]
+            if not self.premium:
+                self.multiDL = False
+                self.resumeDownload = False
+                self.chunkLimit = 1
         else:
             self.multiDL = False
 
@@ -63,7 +67,7 @@ class FileserveCom(Hoster):
             
         self.pyfile.name = re.search('<h1>(.*?)<br/></h1>', self.html).group(1)
         
-        if self.account:
+        if self.account and self.premium:
             self.handlePremium()
         else:
             self.handleFree()
diff --git a/module/plugins/hoster/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py
index e67237af2..20cff6e63 100644
--- a/module/plugins/hoster/MegauploadCom.py
+++ b/module/plugins/hoster/MegauploadCom.py
@@ -61,7 +61,6 @@ class MegauploadCom(Hoster):
             self.premium = self.account.getAccountInfo(self.user)["premium"]
             if not self.premium:
                 self.multiDL = False
-                self.resumeDownload = False
                 self.chunkLimit = 1
         else:
             self.multiDL = False
-- 
cgit v1.2.3