diff options
Diffstat (limited to 'module/plugins/accounts')
| -rw-r--r-- | module/plugins/accounts/BigfileTo.py (renamed from module/plugins/accounts/UploadableCh.py) | 15 | ||||
| -rw-r--r-- | module/plugins/accounts/FilefactoryCom.py | 14 |
2 files changed, 17 insertions, 12 deletions
diff --git a/module/plugins/accounts/UploadableCh.py b/module/plugins/accounts/BigfileTo.py index a8f17ad6d..23f91e1f6 100644 --- a/module/plugins/accounts/UploadableCh.py +++ b/module/plugins/accounts/BigfileTo.py @@ -3,19 +3,20 @@ from module.plugins.internal.Account import Account -class UploadableCh(Account): - __name__ = "UploadableCh" +class BigfileTo(Account): + __name__ = "BigfileTo" __type__ = "account" - __version__ = "0.09" + __version__ = "0.10" __status__ = "testing" - __description__ = """Uploadable.ch account plugin""" + __description__ = """bigfile.to account plugin""" __license__ = "GPLv3" - __authors__ = [("Sasch", "gsasch@gmail.com")] + __authors__ = [("Sasch" , "gsasch@gmail.com" ), + ("GammaC0de", "nitzo2001[AT]yahoo[DOT]com")] def grab_info(self, user, password, data): - html = self.load("http://www.uploadable.ch/login.php") + html = self.load("https://www.bigfile.to/login.php") premium = '<a href="/logout.php"' in html trafficleft = -1 if premium else None @@ -24,7 +25,7 @@ class UploadableCh(Account): def signin(self, user, password, data): - html = self.load("http://www.uploadable.ch/login.php", + html = self.load("https://www.bigfile.to/login.php", post={'userName' : user, 'userPassword' : password, 'autoLogin' : "1", diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py index 5be4f3cf6..527acbd82 100644 --- a/module/plugins/accounts/FilefactoryCom.py +++ b/module/plugins/accounts/FilefactoryCom.py @@ -11,13 +11,14 @@ from module.plugins.internal.Account import Account class FilefactoryCom(Account): __name__ = "FilefactoryCom" __type__ = "account" - __version__ = "0.21" + __version__ = "0.22" __status__ = "testing" __description__ = """Filefactory.com account plugin""" __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), - ("stickell", "l.stickell@yahoo.it")] + __authors__ = [("zoidberg", "zoidberg@mujmail.cz" ), + ("stickell", "l.stickell@yahoo.it" ), + ("GammaC0de", "nitzo2001[AT]yahoo[DOT]com")] VALID_UNTIL_PATTERN = r'Premium valid until: <strong>(?P<D>\d{1,2})\w{1,2} (?P<M>\w{3}), (?P<Y>\d{4})</strong>' @@ -31,6 +32,7 @@ class FilefactoryCom(Account): premium = True validuntil = re.sub(self.VALID_UNTIL_PATTERN, '\g<D> \g<M> \g<Y>', m.group(0)) validuntil = time.mktime(time.strptime(validuntil, "%d %b %Y")) + else: premium = False validuntil = -1 @@ -39,12 +41,14 @@ class FilefactoryCom(Account): def signin(self, user, password, data): - self.req.http.c.setopt(pycurl.REFERER, "http://www.filefactory.com/member/login.php") + html = self.load("https://www.filefactory.com/member/signin.php") + if "/member/signout.php" in html: + self.skip_login() html = self.load("https://www.filefactory.com/member/signin.php", post={'loginEmail' : user, 'loginPassword': password, 'Submit' : "Sign In"}) - if self.req.lastEffectiveURL != "http://www.filefactory.com/account/": + if "/member/signout.php" not in html: self.fail_login() |