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

[senscritique] fix bug, same id error when rerun occurs

Browse source
This commit is contained in:
Bezleputh 2014-04-01 14:25:14 +02:00 • committed by Florent
commit 913790c1a7
2 changed files with 50 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/senscritique/browser.py
View file

@ -132,5 +132,5 @@ class SenscritiqueBrowser(PagesBrowser):
def get_resume(self, _id):
self._setup_session(SensCritiqueJsonProfile())
re_id = re.compile('^/?.*/(.*)', re.DOTALL)
a_id = re_id.search(_id).group(1)
a_id = re_id.search(_id.split('#')[0]).group(1)
return self.json_page.go(_id=a_id).get_resume()

82
modules/senscritique/pages.py
View file

@ -29,8 +29,47 @@ from weboob.tools.browser2.filters import Filter, Link, CleanText, Regexp, Attr,
__all__ = ['AjaxPage', 'EventPage', 'JsonResumePage']
class AjaxPage(HTMLPage):
class Channel(Filter):
def filter(self, el):
channel_info = el[0].xpath('div/div[@class="elgr-data-channel"]')
if channel_info:
channel = CleanText('.')(channel_info[0])
else:
channel_info = Attr('div[@class="elgr-product-data"]/span', 'class')(el[0])
channel = self.page.CHANNELS_PARAM.get(channel_info)
return channel
class Date(Filter):
def filter(self, el):
spans_date = el[0].xpath("span[@class='d-date']")
_date = date.today()
if len(spans_date) == 2:
day_number = int(spans_date[1].text)
month = _date.month
year = _date.year
if day_number < _date.day:
month = _date.month + 1
if _date.month == 12:
year = _date.year + 1
_date = date(day=day_number, month=month, year=year)
elif spans_date[0].attrib['data-sc-day'] == 'Demain':
_date += timedelta(days=1)
str_time = el[0].xpath("time")[0].attrib['datetime'][:-6]
_time = datetime.strptime(str_time, '%H:%M:%S')
return datetime.combine(_date, _time.time())
class FormatDate(Filter):
def __init__(self, pattern, selector):
super(FormatDate, self).__init__(selector)
self.pattern = pattern
def filter(self, date):
return date.strftime(self.pattern)
class AjaxPage(HTMLPage):
CHANNELS_PARAM = {
'einst-3 elgr-data-logo': u'Action',
'einst-8 elgr-data-logo': u'Canal+ Décalé',
@ -71,7 +110,10 @@ class AjaxPage(HTMLPage):
def condition(self):
if '_id' in self.env and self.env['_id']:
return Regexp(Link('.'), '/film/(.*)')(self) == self.env['_id']
return Format(u'%s#%s#%s',
Regexp(Link('.'), '/film/(.*)'),
FormatDate("%Y%m%d%H%M", Date('div/div[@class="elgr-data-diffusion"]')),
CleanText(Channel('.'), replace=[(' ', '-')]))(self) == self.env['_id']
return True
def validate(self, obj):
@ -87,30 +129,6 @@ class AjaxPage(HTMLPage):
return False
class Date(Filter):
def filter(self, el):
spans_date = el[0].xpath("span[@class='d-date']")
_date = date.today()
if len(spans_date) == 2:
day_number = int(spans_date[1].text)
month = _date.month
year = _date.year
if day_number < _date.day:
month = _date.month + 1
if _date.month == 12:
year = _date.year + 1
_date = date(day=day_number, month=month, year=year)
elif spans_date[0].attrib['data-sc-day'] == 'Demain':
_date += timedelta(days=1)
str_time = el[0].xpath("time")[0].attrib['datetime'][:-6]
_time = datetime.strptime(str_time, '%H:%M:%S')
return datetime.combine(_date, _time.time())
class CombineDate(Filter):
def filter(self, _date):
return datetime.combine(_date, time.max)
@ -118,15 +136,13 @@ class AjaxPage(HTMLPage):
class Summary(Filter):
def filter(self, el):
title = Regexp(Attr('div/img', 'alt'), '^Affiche(.*)')(el[0])
channel_info = el[0].xpath('div/div[@class="elgr-data-channel"]')
if channel_info:
channel = CleanText('.')(channel_info[0])
else:
channel_info = Attr('div[@class="elgr-product-data"]/span', 'class')(el[0])
channel = self.page.CHANNELS_PARAM.get(channel_info)
channel = Channel('.')(el[0])
return u'%s - %s' % (title, channel)
obj_id = Regexp(Link('.'), '/film/(.*)')
obj_id = Format(u'%s#%s#%s',
Regexp(Link('.'), '/film/(.*)'),
FormatDate("%Y%m%d%H%M", Date('div/div[@class="elgr-data-diffusion"]')),
CleanText(Channel('.'), replace=[(' ', '-')]))
obj_start_date = Date('div/div[@class="elgr-data-diffusion"]')
obj_end_date = CombineDate(obj_start_date)
obj_summary = CleanText(Summary('.'))