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

Add a real id for all details objects

Browse source 
close #932
This commit is contained in:
Florent 2012-11-22 12:03:34 +01:00
commit f05786441a
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/freemobile/pages/history.py
View file

@ -82,7 +82,7 @@ class DetailsPage(BasePage):
divs = divglobal.xpath('div[@class="detail"]') divs = divglobal.xpath('div[@class="detail"]')
# Two informations in one div... # Two informations in one div...
div = divs.pop(0) div = divs.pop(0)
voice = self.parse_voice(div, string, inter) voice = self.parse_voice(div, string, num, inter)
self.details[num].append(voice) self.details[num].append(voice)
self.iter_divs(divs, num, inter) self.iter_divs(divs, num, inter)
@ -91,18 +91,22 @@ class DetailsPage(BasePage):
detail = Detail() detail = Detail()
detail.label = unicode(div.find('div[@class="titre"]/p').text_content()) detail.label = unicode(div.find('div[@class="titre"]/p').text_content())
detail.id = "-" + detail.label.split(' ')[1].lower()
if inter: if inter:
detail.label = detail.label + u" (international)" detail.label = detail.label + u" (international)"
detail.id = detail.id + "-inter"
detail.infos = unicode(div.find('div[@class="conso"]/p').text_content().lstrip()) detail.infos = unicode(div.find('div[@class="conso"]/p').text_content().lstrip())
detail.price = convert_price(div) detail.price = convert_price(div)
self.details[num].append(detail) self.details[num].append(detail)
def parse_voice(self, div, string, inter=False): def parse_voice(self, div, string, num, inter=False):
voice = Detail() voice = Detail()
voice.id = "-voice"
voice.label = unicode(div.find('div[@class="titre"]/p').text_content()) voice.label = unicode(div.find('div[@class="titre"]/p').text_content())
if inter: if inter:
voice.label = voice.label + " (international)" voice.label = voice.label + " (international)"
voice.id = voice.id + "-inter"
voice.price = convert_price(div) voice.price = convert_price(div)
voice1 = div.xpath('div[@class="conso"]/p/span')[0].text voice1 = div.xpath('div[@class="conso"]/p/span')[0].text
voice2 = div.xpath('div[@class="conso"]/p/span')[1].text voice2 = div.xpath('div[@class="conso"]/p/span')[1].text
@ -112,7 +116,9 @@ class DetailsPage(BasePage):
def get_details(self, subscription): def get_details(self, subscription):
num = self.details['num' + subscription.id] num = self.details['num' + subscription.id]
return self.details[num] for detail in self.details[num]:
detail.id = subscription.id + detail.id
yield detail
def date_bills(self): def date_bills(self):
return self.datebills return self.datebills