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

Fix parsing of internationals comings calls

Browse source
This commit is contained in:
Florent 2012-03-14 16:04:48 +01:00 • committed by Romain Bignon
commit d3de7d24de
1 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,22 +42,14 @@ class DetailsPage(BasePage):
self.datebills = [] self.datebills = []
num = self.document.xpath('//div[@class="infosLigneDetail"]')[0].text num = self.document.xpath('//div[@class="infosLigneDetail"]')[0].text
num = num.split("-")[2].strip() num = num.split("-")[2].strip()
# National parsing
divnat = self.document.xpath('//div[@class="national"]')[0] divnat = self.document.xpath('//div[@class="national"]')[0]
divs = divnat.xpath('div[@class="detail"]') self.parse_div(divnat, "National : %s | International : %s", False)
divvoice = divs.pop(0)
# Two informations in one div... # International parsing
voice = Detail()
voice.label = divvoice.find('div[@class="titreDetail"]/p').text_content()
voice.price = convert_price(divvoice)
voicenat = divvoice.xpath('div[@class="consoDetail"]/p/span')[0].text
voiceint = divvoice.xpath('div[@class="consoDetail"]/p/span')[1].text
voice.infos = "National : " + voicenat + " | International : " + voiceint
self.details.append(voice)
self.iter_divs(divs)
divint = self.document.xpath('//div[@class="international hide"]')[0] divint = self.document.xpath('//div[@class="international hide"]')[0]
self.iter_divs(divint.xpath('div[@class="detail"]'), True) self.parse_div(divint, u"Appels émis : %s | Appels reçus : %s", True)
for trbill in self.document.xpath('//tr[@class="derniereFacture"]'): for trbill in self.document.xpath('//tr[@class="derniereFacture"]'):
mydate = trbill.find('td/input').attrib['onclick'].split("'")[1] mydate = trbill.find('td/input').attrib['onclick'].split("'")[1]
@ -68,6 +60,14 @@ class DetailsPage(BasePage):
bill.format = 'html' bill.format = 'html'
self.datebills.append(bill) self.datebills.append(bill)
def parse_div(self, divglobal, string, inter=False):
divs = divglobal.xpath('div[@class="detail"]')
# Two informations in one div...
div = divs.pop(0)
voice = self.parse_voice(div, string, inter)
self.details.append(voice)
self.iter_divs(divs, inter)
def iter_divs(self, divs, inter=False): def iter_divs(self, divs, inter=False):
for div in divs: for div in divs:
detail = Detail() detail = Detail()
@ -80,6 +80,18 @@ class DetailsPage(BasePage):
self.details.append(detail) self.details.append(detail)
def parse_voice(self, div, string, inter=False):
voice = Detail()
voice.label = div.find('div[@class="titreDetail"]/p').text_content()
if inter:
voice.label = voice.label + " (international)"
voice.price = convert_price(div)
voice1 = div.xpath('div[@class="consoDetail"]/p/span')[0].text
voice2 = div.xpath('div[@class="consoDetail"]/p/span')[1].text
voice.infos = string % (voice1, voice2)
return voice
def get_details(self): def get_details(self):
return self.details return self.details