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

[browser2] add a join filter

Browse source
This commit is contained in:
Bezleputh 2014-03-22 19:15:36 +01:00 • committed by Florent
commit d8887cf3d7
2 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/senscritique/pages.py
View file

@ -23,7 +23,7 @@ from .calendar import SensCritiquenCalendarEvent
from datetime import date, datetime, time, timedelta from datetime import date, datetime, time, timedelta
from weboob.tools.browser2.page import HTMLPage, method, ItemElement, ListElement, JsonPage from weboob.tools.browser2.page import HTMLPage, method, ItemElement, ListElement, JsonPage
from weboob.tools.browser2.filters import Filter, Link, CleanText, Regexp, Attr from weboob.tools.browser2.filters import Filter, Link, CleanText, Regexp, Attr, Join, Format
__all__ = ['AjaxPage', 'EventPage', 'JsonResumePage'] __all__ = ['AjaxPage', 'EventPage', 'JsonResumePage']
@ -134,22 +134,13 @@ class AjaxPage(HTMLPage):
class Description(Filter): class Description(Filter):
def filter(self, el): def filter(self, el):
header = el[0].xpath("//div[@class='pvi-hero-product']")[0] header = "//div[@class='pvi-hero-product']"
title = CleanText("div[@class='d-rubric-inner']/h1")(header)
year = CleanText("div[@class='d-rubric-inner']/small")(header)
_infos = header.xpath("ul[@class='pvi-product-specs']/li")
infos = ''
for li in _infos:
infos += u'- %s\n' % CleanText(li)(self)
section = "//section[@class='pvi-productDetails']" section = "//section[@class='pvi-productDetails']"
_infos = el[0].xpath("%s/ul/li" % section) return Format(u'%s %s\n\n%s%s\n\n',
for li in _infos: CleanText("%s/div[@class='d-rubric-inner']/h1" % header),
infos += u'- %s\n' % CleanText(li)(self) CleanText("%s/div[@class='d-rubric-inner']/small" % header),
Join(u'- %s\n', "%s/ul[@class='pvi-product-specs']/li" % header),
return u'%s %s\n\n%s\n\n' % (title, year, infos) Join(u'- %s\n', "%s/ul/li" % section))(el[0])
class Resume(Filter): class Resume(Filter):

13
weboob/tools/browser2/filters.py
View file

@ -323,3 +323,16 @@ class Format(MultiFilter):
def filter(self, values): def filter(self, values):
return self.fmt % values return self.fmt % values
class Join(CleanText):
def __init__(self, pattern, selector):
super(Join, self).__init__(selector)
self.pattern = pattern
def filter(self, el):
res = ''
for li in el:
res += self.pattern % self.clean(li)
return res