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

patch since fortuneo web site changes

Browse source
This commit is contained in:
sputnick 2012-08-22 14:45:15 +02:00
commit 8aa3a10d2a
2 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/fortuneo/browser.py
View file

@ -34,14 +34,17 @@ class Fortuneo(BaseBrowser):
PAGES = { PAGES = {
'.*identification.jsp.*': '.*identification.jsp.*':
LoginPage, LoginPage,
'.*/prive/mes-comptes/synthese-tous-comptes\.jsp.*': '.*/prive/mes-comptes/synthese-tous-comptes.jsp':
AccountsList,
'.*/prive/mes-comptes/synthese-mes-comptes\.jsp':
#'.*/prive/mes-comptes/synthese-tous-comptes\.jsp.*':
AccountsList, AccountsList,
'.*/prive/mes-comptes/livret/consulter-situation/consulter-solde\.jsp\?COMPTE_ACTIF=.*': '.*/prive/mes-comptes/livret/consulter-situation/consulter-solde\.jsp\?COMPTE_ACTIF=.*':
AccountHistoryPage, AccountHistoryPage,
'.*/prive/mes-comptes/compte-courant/consulter-situation/consulter-solde\.jsp\?COMPTE_ACTIF=.*': '.*/prive/mes-comptes/compte-courant/consulter-situation/consulter-solde\.jsp\?COMPTE_ACTIF=.*':
AccountHistoryPage, AccountHistoryPage,
'.*/prive/default\.jsp.*': '.*/prive/default\.jsp.*':
AccountsList AccountsList
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@ -72,7 +75,7 @@ class Fortuneo(BaseBrowser):
self.location('https://' + self.DOMAIN_LOGIN + '/fr/identification.jsp') self.location('https://' + self.DOMAIN_LOGIN + '/fr/identification.jsp')
self.page.login(self.username, self.password) self.page.login(self.username, self.password)
self.location('https://' + self.DOMAIN_LOGIN + '/fr/prive/mes-comptes/synthese-tous-comptes.jsp') self.location('https://' + self.DOMAIN_LOGIN + '/fr/prive/mes-comptes/synthese-mes-comptes.jsp')
def get_history(self, account): def get_history(self, account):
if not self.is_on_page(AccountHistoryPage): if not self.is_on_page(AccountHistoryPage):
@ -83,7 +86,7 @@ class Fortuneo(BaseBrowser):
"""accounts list""" """accounts list"""
if not self.is_on_page(AccountsList): if not self.is_on_page(AccountsList):
self.location('https://' + self.DOMAIN_LOGIN + '/fr/prive/mes-comptes/synthese-tous-comptes.jsp') self.location('https://' + self.DOMAIN_LOGIN + '/fr/prive/mes-comptes/synthese-mes-comptes.jsp')
return self.page.get_list() return self.page.get_list()

29
modules/fortuneo/pages/accounts_list.py
View file

@ -68,32 +68,37 @@ class AccountsList(BasePage):
def get_list(self): def get_list(self):
l = [] l = []
for cpt in self.document.xpath(".//*[@id='tableauComptesTitEtCotit']/tbody/tr"): for cpt in self.document.xpath(".//*[@class='synthese_id_compte']"):
account = Account() account = Account()
# account.id # account.id
account.id = cpt.xpath("./td[1]/a/text()")[0] account.id = cpt.xpath("./span/text()")[0].replace(u"\xa0", "").replace(',', '.').replace("EUR", "").replace("\n", "").replace("\t", "").replace(u"\xb0", '').replace(" ", "").replace('N', '')
print "DEBUG account.id=[",str(account.id),"]\n"
# account balance # account balance
account.balance = Decimal(cpt.xpath("./td[3]/text()")[0].replace(',', '.').replace("EUR", "").replace("\n", "").replace("\t", "").replace(u"\xa0", "")) account.balance = Decimal(cpt.xpath("./span/text()")[1].replace("+", "").replace(u"\xa0", "").replace(',', '.').replace("EUR", "").replace("\n", "").replace("\t", "").replace(" ", ""))
print "DEBUG account.balance=["+str(account.balance)+"]\n"
# account coming # account coming TODO
mycomingval = cpt.xpath("./td[4]/text()")[0].replace(',', '.').replace("EUR", "").replace("\n", "").replace("\t", "").replace(u"\xa0", "") #mycomingval = cpt.xpath("../../following-sibling::*[1]/td[2]/a[@class='lien_synthese_encours']/span/text()")[0].replace(',', '.').replace("EUR", "").replace("\n", "").replace("\t", "").replace(u"\xa0", "")
#mycomingval = cpt.xpath("../../following-sibling::*[1]/td[2]")[0]
#mycomingval = cpt.xpath("./../../../a[@class='lien_synthese_encours']/span[@class='synthese_encours']/text()")[0].replace(',', '.').replace("EUR", "").replace("\n", "").replace("\t", "").replace(u"\xa0", "")
#print "DEBUG mycomingval=", mycomingval.Getchildren
if mycomingval == '-': #if mycomingval == '-':
account.coming = Decimal(0) # account.coming = Decimal(0)
else: #else:
account.coming = Decimal(mycomingval) # account.coming = Decimal(mycomingval)
# account._link_id # account._link_id
url_to_parse = cpt.xpath('./td[1]/a/@href')[0] # link url_to_parse = cpt.xpath('@href')[0].replace("\n", "") # link
print "DEBUG cpt.xpath=["+str(cpt.xpath)+"]\n"
compte_id_re = re.compile(r'/prive/mes-comptes/([^/]+/).*COMPTE_ACTIF=([^\&]+)\&?') compte_id_re = re.compile(r'/prive/mes-comptes/([^/]+/).*COMPTE_ACTIF=([^\&]+)\&?')
account._link_id = '/fr/prive/mes-comptes/%sconsulter-situation/consulter-solde.jsp?COMPTE_ACTIF=%s' % \ account._link_id = '/fr/prive/mes-comptes/%sconsulter-situation/consulter-solde.jsp?COMPTE_ACTIF=%s' % \
(compte_id_re.search(url_to_parse).groups()[0], compte_id_re.search(url_to_parse).groups()[1]) (compte_id_re.search(url_to_parse).groups()[0], compte_id_re.search(url_to_parse).groups()[1])
# account.label # account.label
tpl = cpt.xpath("./td[2]/a/text()")[0].split(' ') account.label = cpt.xpath("./span/text()")[0].replace(u"\xa0", "").replace(',', '.').replace("EUR", "").replace("\n", "").replace("\t", "").replace(" ", "").replace(u"\xb0", '').replace(" ", "").replace('N', '')
account.label = unicode(' '.join(tpl[:2]))
l.append(account) l.append(account)