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

fix selection of accounts when there are both personal and enterprise ones

Browse source
This commit is contained in:
Romain Bignon 2013-08-23 11:10:53 +02:00
commit ca018c7cb1
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/bred/pages.py
View file

@ -24,6 +24,7 @@ import re
from weboob.tools.browser import BasePage from weboob.tools.browser import BasePage
from weboob.tools.misc import to_unicode from weboob.tools.misc import to_unicode
from weboob.tools.ordereddict import OrderedDict
from weboob.capabilities.bank import Account from weboob.capabilities.bank import Account
from weboob.tools.capabilities.bank.transactions import FrenchTransaction from weboob.tools.capabilities.bank.transactions import FrenchTransaction
@ -55,14 +56,19 @@ class LoginResultPage(BasePage):
pass pass
else: else:
self.browser.set_all_readonly(False) self.browser.set_all_readonly(False)
accounts = {} accounts = OrderedDict()
for tr in self.document.getroot().cssselect('table.compteTable tbody tr'): for tr in self.document.getroot().cssselect('table.compteTable > tbody > tr'):
if len(tr.findall('td')) == 0:
continue
attr = tr.xpath('.//a')[0].attrib.get('onclick', '') attr = tr.xpath('.//a')[0].attrib.get('onclick', '')
m = re.search("value = '(\w+)';checkAndSubmit\('\w+','(\w+)','(\w+)'\)", attr) m = re.search("value = '(\w+)';(checkAndSubmit\('\w+','(\w+)','(\w+)'\))?", attr)
if m: if m:
typeCompte = m.group(1) typeCompte = m.group(1)
tagName = m.group(2) tagName = m.group(3)
value = self.document.xpath('//input[@id="%s%s"]' % (m.group(2), m.group(3)))[0].attrib['value'] if tagName is not None:
value = self.document.xpath('//input[@id="%s%s"]' % (m.group(3), m.group(4)))[0].attrib['value']
else:
value = typeCompte
accounts[value] = (typeCompte, tagName) accounts[value] = (typeCompte, tagName)
try: try:
@ -73,8 +79,9 @@ class LoginResultPage(BasePage):
self.logger.warning(u'Unable to find account "%s". Available ones: %s' % (self.browser.accnum, ', '.join(accounts.keys()))) self.logger.warning(u'Unable to find account "%s". Available ones: %s' % (self.browser.accnum, ', '.join(accounts.keys())))
elif len(accounts) > 1: elif len(accounts) > 1:
self.logger.warning('There are several accounts, please use "accnum" backend parameter to force the one to use') self.logger.warning('There are several accounts, please use "accnum" backend parameter to force the one to use')
value, (typeCompte, tagName) = accounts.popitem() value, (typeCompte, tagName) = accounts.popitem(last=False)
self.browser['typeCompte'] = typeCompte self.browser['typeCompte'] = typeCompte
if tagName is not None:
self.browser[tagName] = [value] self.browser[tagName] = [value]
self.browser.submit() self.browser.submit()