diff options
| author |  Sahil Shekhawat <sahilshekhawat01@gmail.com>
| 2015-01-11 14:54:48 +0100 |
|---|---|---|
| committer | Sahil Shekhawat <sahilshekhawat01@gmail.com>
| 2015-01-11 14:54:48 +0100 |
| commit | d2b60b5ceb369814a0de41c8b8744b5c4ed81523 (patch) | |
| tree | 6619e01fc0e5f281e4d28678ec565860a86784ec /module/plugins/internal/XFSAccount.py | |
| parent | updated nitroflare.com's plugin (diff) | |
| parent | Code improvements (diff) | |
| download | pyload-d2b60b5ceb369814a0de41c8b8744b5c4ed81523.tar.xz | |
Merged with the updated nitroflare
Diffstat (limited to 'module/plugins/internal/XFSAccount.py')
| -rw-r--r-- | module/plugins/internal/XFSAccount.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py index 2784ecd0b..c350729ac 100644 --- a/module/plugins/internal/XFSAccount.py +++ b/module/plugins/internal/XFSAccount.py @@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies class XFSAccount(Account): __name__ = "XFSAccount" __type__ = "account" - __version__ = "0.33" + __version__ = "0.35" __description__ = """XFileSharing account plugin""" __license__ = "GPLv3" @@ -35,7 +35,7 @@ class XFSAccount(Account): LEECH_TRAFFIC_PATTERN = r'Leech Traffic left:<b>.*?(?P<S>[\d.,]+|[Uu]nlimited)\s*(?:(?P<U>[\w^_]+)\s*)?</b>' LEECH_TRAFFIC_UNIT = "MB" #: used only if no group <U> was found - LOGIN_FAIL_PATTERN = r'>\s*(Incorrect Login or Password|Error<)' + LOGIN_FAIL_PATTERN = r'Incorrect Login or Password|account was banned|Error<' def __init__(self, manager, accounts): #@TODO: remove in 0.4.10 @@ -48,7 +48,7 @@ class XFSAccount(Account): self.logError(_("Missing HOSTER_DOMAIN")) if not self.HOSTER_URL: - self.HOSTER_URL = "http://www.%s/" % self.HOSTER_DOMAIN or "" + self.HOSTER_URL = "http://www.%s/" % (self.HOSTER_DOMAIN or "") def loadAccountInfo(self, user, req): @@ -76,10 +76,10 @@ class XFSAccount(Account): self.logDebug("Valid until: %s" % validuntil) if validuntil > mktime(gmtime()): - premium = True + premium = True trafficleft = -1 else: - premium = False + premium = False validuntil = None #: registered account type (not premium) else: self.logDebug("VALID_UNTIL_PATTERN not found") @@ -143,7 +143,7 @@ class XFSAccount(Account): if isinstance(self.COOKIES, list): set_cookies(req.cj, self.COOKIES) - url = urljoin(self.HOSTER_URL, "login.html") + url = urljoin(self.HOSTER_URL, "login.html") html = req.load(url, decode=True) action, inputs = parseHtmlForm('name="FL"', html) |