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

[twitter] fix trendy tweets (site changed)

Browse source
This commit is contained in:
Bezleputh 2015-06-05 22:07:31 +02:00 • committed by Romain Bignon
commit cb02ab94a7
2 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/twitter/pages.py
View file

@ -23,7 +23,8 @@ from io import StringIO
import lxml.html as html
import urllib
from weboob.browser.pages import HTMLPage, JsonPage, FormNotFound, pagination
from weboob.tools.json import json
from weboob.browser.pages import HTMLPage, JsonPage, FormNotFound, pagination, LoggedPage
from weboob.browser.elements import ListElement, ItemElement, method
from weboob.browser.filters.standard import CleanText, Format, Regexp, Env, DateTime, Filter
from weboob.browser.filters.html import Link, Attr
@ -62,11 +63,14 @@ class TwitterJsonHTMLPage(JsonPage):
class LoginPage(HTMLPage):
def login(self, login, passwd):
form = self.get_form(xpath='//form[@action="https://twitter.com/sessions"]')
form['session[username_or_email]'] = login
form['session[password]'] = passwd
form.submit()
return form['authenticity_token']
try:
form = self.get_form(xpath='//form[@action="https://twitter.com/sessions"]')
form['session[username_or_email]'] = login
form['session[password]'] = passwd
form.submit()
return form['authenticity_token']
except FormNotFound:
return CleanText('(//input[@id="authenticity_token"])[1]/@value')(self.doc)
@property
def logged(self):
@ -112,6 +116,12 @@ class ThreadPage(HTMLPage):
obj_date = DatetimeFromTimestamp(Attr('./div/div[@class="stream-item-header"]/small/a/span | ./div/div[@class="ProfileTweet-authorDetails"]/span/a/span', 'data-time'))
class SearchHomePage(HTMLPage):
def get_trends_token(self):
json_data = CleanText('//input[@id="init-data"]/@value')(self.doc)
return json.loads(json_data)['trendsCacheKey']
class TrendsPage(TwitterJsonHTMLPage):
@method
@ -154,7 +164,7 @@ class TimelinePage(TwitterJsonHTMLPage):
return u'%s?max_position=%s' % (self.page.url.split('?')[0], self.get_last_id())
class HomeTimelinePage(TwitterJsonHTMLPage):
class HomeTimelinePage(TwitterJsonHTMLPage, LoggedPage):
@pagination
@method
class iter_threads(TimelineListElement):