Fix COOKIES in XFS internal plugins

3 files changed, 46 insertions, 22 deletions

diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index c350729ac..c3bd91e52 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -23,7 +23,7 @@ class XFSAccount(Account):
     HOSTER_DOMAIN = None
     HOSTER_URL    = None
 
-    COOKIES = [(HOSTER_DOMAIN, "lang", "english")]
+    COOKIES = True
 
     PREMIUM_PATTERN = r'\(Premium only\)'
 
@@ -46,9 +46,15 @@ class XFSAccount(Account):
     def init(self):
         if not self.HOSTER_DOMAIN:
             self.logError(_("Missing HOSTER_DOMAIN"))
+            self.COOKIES = False
 
-        if not self.HOSTER_URL:
-            self.HOSTER_URL = "http://www.%s/" % (self.HOSTER_DOMAIN or "")
+        else:
+            if not self.HOSTER_URL:
+                self.HOSTER_URL = "http://www.%s/" % self.HOSTER_DOMAIN
+
+            if isinstance(self.COOKIES, list):
+                self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english"))
+                set_cookies(req.cj, self.COOKIES)
 
 
     def loadAccountInfo(self, user, req):
@@ -57,6 +63,12 @@ class XFSAccount(Account):
         leechtraffic = None
         premium      = None
 
+        if not self.HOSTER_URL:  #@TODO: Remove in 0.4.10
+            return {'validuntil'  : validuntil,
+                    'trafficleft' : trafficleft,
+                    'leechtraffic': leechtraffic,
+                    'premium'     : premium}
+
         html = req.load(self.HOSTER_URL, get={'op': "my_account"}, decode=True)
 
         premium = True if re.search(self.PREMIUM_PATTERN, html) else False
@@ -136,22 +148,25 @@ class XFSAccount(Account):
         else:
             self.logDebug("LEECH_TRAFFIC_PATTERN not found")
 
-        return {'validuntil': validuntil, 'trafficleft': trafficleft, 'leechtraffic': leechtraffic, 'premium': premium}
+        return {'validuntil'  : validuntil,
+                'trafficleft' : trafficleft,
+                'leechtraffic': leechtraffic,
+                'premium'     : premium}
 
 
     def login(self, user, data, req):
-        if isinstance(self.COOKIES, list):
-            set_cookies(req.cj, self.COOKIES)
+        if not self.HOSTER_URL:  #@TODO: Remove in 0.4.10
+            raise Exception(_("Missing HOSTER_DOMAIN"))
 
         url  = urljoin(self.HOSTER_URL, "login.html")
         html = req.load(url, decode=True)
 
         action, inputs = parseHtmlForm('name="FL"', html)
         if not inputs:
-            inputs = {'op': "login",
+            inputs = {'op'      : "login",
                       'redirect': self.HOSTER_URL}
 
-        inputs.update({'login': user,
+        inputs.update({'login'   : user,
                        'password': data['password']})
 
         html = req.load(self.HOSTER_URL, post=inputs, decode=True)
diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py
index 3cb837aac..665e13b18 100644
--- a/module/plugins/internal/XFSCrypter.py
+++ b/module/plugins/internal/XFSCrypter.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 class XFSCrypter(SimpleCrypter):
     __name__    = "XFSCrypter"
     __type__    = "crypter"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __pattern__ = r'^unmatchable$'
 
@@ -19,10 +19,27 @@ class XFSCrypter(SimpleCrypter):
 
     URL_REPLACEMENTS = [(r'&?per_page=\d+', ""), (r'[?/&]+$', ""), (r'(.+/[^?]+)$', r'\1?'), (r'$', r'&per_page=10000')]
 
-    COOKIES = [(HOSTER_DOMAIN, "lang", "english")]
-
     LINK_PATTERN = r'<(?:td|TD).*?>\s*<a href="(.+?)".*?>.+?(?:</a>)?\s*</(?:td|TD)>'
     NAME_PATTERN = r'<[tT]itle>.*?\: (?P<N>.+) folder</[tT]itle>'
 
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
+
+
+    def prepare(self):
+        if not self.HOSTER_DOMAIN:
+            if self.account:
+                account      = self.account
+            else:
+                account_name = (self.__name__ + ".py").replace("Folder.py", "").replace(".py", "")
+                account      = self.pyfile.m.core.accountManager.getAccountPlugin(account_name)
+
+            if account and hasattr(account, "HOSTER_DOMAIN") and account.HOSTER_DOMAIN:
+                self.HOSTER_DOMAIN = account.HOSTER_DOMAIN
+            else:
+                self.fail(_("Missing HOSTER_DOMAIN"))
+
+        if isinstance(self.COOKIES, list):
+            self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english"))
+
+        return super(XFSCrypter, self).prepare()
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index bae75c092..75d4df275 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -15,7 +15,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.36"
+    __version__ = "0.37"
 
     __pattern__ = r'^unmatchable$'
 
@@ -29,7 +29,6 @@ class XFSHoster(SimpleHoster):
     HOSTER_DOMAIN = None
 
     TEXT_ENCODING = False
-    COOKIES       = [(HOSTER_DOMAIN, "lang", "english")]
     DIRECT_LINK   = None
     MULTI_HOSTER  = True  #@NOTE: Should be default to False for safe, but I'm lazy...
 
@@ -73,15 +72,8 @@ class XFSHoster(SimpleHoster):
             else:
                 self.fail(_("Missing HOSTER_DOMAIN"))
 
-            try:
-                self.COOKIES.index((None, "lang", "english"))
-
-            except ValueError:
-                pass
-
-            else:
-                self.COOKIES.remove((None, "lang", "english"))
-                self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english"))
+        if isinstance(self.COOKIES, list):
+            self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english"))
 
         if not self.LINK_PATTERN:
             pattern = r'(https?://(?:www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<]'