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

first page of history correctly parsed

Browse source
This commit is contained in:
Kevin Pouget 2012-11-16 13:49:11 +01:00 • committed by Romain Bignon
commit 1e9e4541cb
3 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/creditcooperatif/backend.py
View file

@ -36,15 +36,14 @@ class CreditCooperatifBackend(BaseBackend, ICapBank):
VERSION = '0.d' VERSION = '0.d'
DESCRIPTION = u'Credit Cooperatif French bank website' DESCRIPTION = u'Credit Cooperatif French bank website'
LICENSE = 'AGPLv3+' LICENSE = 'AGPLv3+'
CONFIG = BackendConfig(ValueBackendPassword('login', label='Account ID', masked=False)) CONFIG = BackendConfig(ValueBackendPassword('login', label='Account ID', masked=False),
ValueBackendPassword('pin', label='One time pin'))
BROWSER = CreditCooperatif BROWSER = CreditCooperatif
def create_default_browser(self): def create_default_browser(self):
print "One time PIN please: ",
pin = raw_input()
return self.create_browser(self.config['login'].get(), return self.create_browser(self.config['login'].get(),
pin) self.config['pin'].get())
def iter_accounts(self): def iter_accounts(self):
with self.browser: with self.browser:

3
modules/creditcooperatif/browser.py
View file

@ -34,7 +34,7 @@ class CreditCooperatif(BaseBrowser):
DOMAIN = "www.coopanet.com" DOMAIN = "www.coopanet.com"
PAGES = {'https://www.coopanet.com/banque/sso/.*': LoginPage, PAGES = {'https://www.coopanet.com/banque/sso/.*': LoginPage,
'https://www.coopanet.com/banque/cpt/incoopanetj2ee.do.*': AccountsPage, 'https://www.coopanet.com/banque/cpt/incoopanetj2ee.do.*': AccountsPage,
'https://www.coopanet.com/banque/cpt/cpt/situationcomptes.do?lnkReleveAction=X&numeroExterne=.*': TransactionsPage # not recognized 'https://www.coopanet.com/banque/cpt/cpt/situationcomptes.do\?lnkReleveAction=X&numeroExterne=(.*)': TransactionsPage
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@ -87,7 +87,6 @@ class CreditCooperatif(BaseBrowser):
return None return None
def get_history(self, account): def get_history(self, account):
import pdb;pdb.set_trace()
self.location('/banque/cpt/cpt/situationcomptes.do?lnkReleveAction=X&numeroExterne='+ account.id) self.location('/banque/cpt/cpt/situationcomptes.do?lnkReleveAction=X&numeroExterne='+ account.id)
while 1: while 1:

48
modules/creditcooperatif/pages.py
View file

@ -55,23 +55,22 @@ class AccountsPage(BasePage):
return False return False
def get_list(self): def get_list(self):
for tbCompte in self.document.xpath('//table[@id="compte"]'): for trCompte in self.document.xpath('//table[@id="compte"]/tbody/tr'):
for trCompte in tbCompte.xpath('.//tbody/tr'): tds = trCompte.findall('td')
tds = trCompte.findall('td')
account = Account()
account = Account()
account.id = tds[self.CPT_ROW_ID].text.strip()
account.label = tds[self.CPT_ROW_NAME].text.strip()
account_type_str = "".join([td.text for td in tds[self.CPT_ROW_NATURE].xpath('.//td[@class="txt"]')]).strip()
account.type = self.ACCOUNT_TYPES.get(account_type_str, Account.TYPE_UNKNOWN)
account.id = tds[self.CPT_ROW_ID].text.strip() account.balance = Decimal(FrenchTransaction.clean_amount(tds[self.CPT_ROW_BALANCE].find("a").text))
account.label = tds[self.CPT_ROW_NAME].text.strip() account.coming = Decimal(FrenchTransaction.clean_amount( tds[self.CPT_ROW_ENCOURS].find("a").text))
yield account
account_type_str = "".join([td.text for td in tds[self.CPT_ROW_NATURE].xpath('.//td[@class="txt"]')]).strip()
account.type = self.ACCOUNT_TYPES.get(account_type_str, Account.TYPE_UNKNOWN)
account.balance = Decimal(FrenchTransaction.clean_amount(tds[self.CPT_ROW_BALANCE].find("a").text))
account.coming = Decimal(FrenchTransaction.clean_amount( tds[self.CPT_ROW_ENCOURS].find("a").text))
yield account
return return
class Transaction(FrenchTransaction): class Transaction(FrenchTransaction):
@ -119,19 +118,22 @@ class TransactionsPage(BasePage):
TRA_ROW_CREDIT = 5 TRA_ROW_CREDIT = 5
def get_history(self): def get_history(self):
import pdb;pdb.set_trace()
for tr in self.document.xpath('//table[@id="operation"]/tbody/tr'): for tr in self.document.xpath('//table[@id="operation"]/tbody/tr'):
import pdb;pdb.set_trace()
tds = tr.findall('td') tds = tr.findall('td')
def get_content(td): def get_content(td):
ret = "".join([ttd.text for ttd in td.xpath(".//td")]) ret = "".join([ttd.text for ttd in td.xpath(".//td")])
return ret.replace(" ", " ").strip() return ret.replace(u"\xa0", " ").strip()
t = Transaction(tr.attrib['id'].split('_', 1)[1]) date = get_content(tds[0])
date = u''.join([txt.strip() for txt in tds[4].itertext()]) raw = get_content(tds[2])
raw = u' '.join([txt.strip() for txt in tds[1].itertext()])
debit = u''.join([txt.strip() for txt in tds[-2].itertext()]) debit = get_content(tds[3])
credit = u''.join([txt.strip() for txt in tds[-1].itertext()]) credit = get_content(tds[4])
t = Transaction(date+""+raw)
t.parse(date, re.sub(r'[ ]+', ' ', raw)) t.parse(date, re.sub(r'[ ]+', ' ', raw))
t.set_amount(credit, debit) t.set_amount(credit, debit)
yield t yield t