nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix authenticate and retrieve of video url (closes #880)

Browse source
This commit is contained in:
Romain Bignon 2012-10-27 15:36:40 +02:00
commit 12a11d98b7
2 changed files with 49 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/nolifetv/browser.py
View file

@ -37,27 +37,29 @@ class NolifeTVBrowser(BaseBrowser):
PAGES = {r'http://online.nolife-tv.com/index.php\??': IndexPage,
r'http://online.nolife-tv.com/': IndexPage,
r'http://online.nolife-tv.com/do.php': IndexPage,
r'http://online.nolife-tv.com/emission-(?P<id>.+)/?.*': VideoPage}
r'http://online.nolife-tv.com/emission-(?P<id>[^/]+)/?.*': VideoPage}
def is_logged(self):
if self.password is None:
return True
login = self.page.document.getroot().cssselect('div#form_login')
return len(login) == 0
if not self.page:
return False
l = self.page.document.xpath('//form[@name="login"]')
return len(l) == 0
def login(self):
if self.password is None:
return
params = {'cookieuser': 1,
'do': 'login',
'securitytoken': 'guest',
'vb_login_username': self.username,
'vb_login_password': self.password,
params = {'cookieuser': 1,
'login': 1,
'username': self.username,
'password': self.password,
}
self.readurl('http://forum.nolife-tv.com/login.php?do=login', urllib.urlencode(params))
self.readurl('http://online.nolife-tv.com/login', urllib.urlencode(params))
self.location('/', no_login=True)
@ -82,6 +84,7 @@ class NolifeTVBrowser(BaseBrowser):
return self.page.iter_videos()
def latest_videos(self):
self.home()
self.location('/do.php', 'a=em')
assert self.is_on_page(IndexPage)
return self.page.iter_videos()