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

go on the savings page to get more accounts (patch from Xavier Guerrin)

Browse source
This commit is contained in:
Romain Bignon 2013-03-21 10:48:39 +01:00
commit 5c718184c6
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/cragr/web/browser.py
View file

@ -24,7 +24,7 @@ import re
from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword
from weboob.tools.date import LinearDateGuesser from weboob.tools.date import LinearDateGuesser
from .pages import HomePage, LoginPage, LoginErrorPage, AccountsPage, TransactionsPage from .pages import HomePage, LoginPage, LoginErrorPage, AccountsPage, SavingsPage, TransactionsPage
__all__ = ['Cragr'] __all__ = ['Cragr']
@ -37,6 +37,7 @@ class Cragr(BaseBrowser):
PAGES = {'https?://[^/]+/': HomePage, PAGES = {'https?://[^/]+/': HomePage,
'https?://[^/]+/stb/entreeBam': LoginPage, 'https?://[^/]+/stb/entreeBam': LoginPage,
'https?://[^/]+/stb/entreeBam\?.*act=Synthcomptes': AccountsPage, 'https?://[^/]+/stb/entreeBam\?.*act=Synthcomptes': AccountsPage,
'https?://[^/]+/stb/entreeBam\?.*act=Synthepargnes': SavingsPage,
'https?://[^/]+/stb/collecteNI\?.*act=Releves.*': TransactionsPage, 'https?://[^/]+/stb/collecteNI\?.*act=Releves.*': TransactionsPage,
'https?://[^/]+/stb/collecteNI\?.*sessionAPP=Releves.*': TransactionsPage, 'https?://[^/]+/stb/collecteNI\?.*sessionAPP=Releves.*': TransactionsPage,
'https?://[^/]+/stb/.*/erreur/.*': LoginErrorPage, 'https?://[^/]+/stb/.*/erreur/.*': LoginErrorPage,
@ -111,10 +112,22 @@ class Cragr(BaseBrowser):
# Store the current url to go back when requesting accounts list. # Store the current url to go back when requesting accounts list.
self.accounts_url = self.page.url self.accounts_url = self.page.url
# we can deduce the URL to "savings" accounts from the regular accounts one
self.savings_url = re.sub('act=([^&=]+)', 'act=Synthepargnes', self.accounts_url, 1)
def get_accounts_list(self): def get_accounts_list(self):
accounts_list = []
# regular accounts
if not self.is_on_page(AccountsPage): if not self.is_on_page(AccountsPage):
self.location(self.accounts_url) self.location(self.accounts_url)
return self.page.get_list() accounts_list.extend(self.page.get_list())
# savings accounts
self.location(self.savings_url)
if self.is_on_page(SavingsPage):
for account in self.page.get_list():
if account not in accounts_list:
accounts_list.append(account)
return accounts_list
def get_account(self, id): def get_account(self, id):
assert isinstance(id, basestring) assert isinstance(id, basestring)

4
modules/cragr/web/pages.py
View file

@ -77,6 +77,8 @@ class AccountsPage(BasePage):
continue continue
cols = tr.findall('td') cols = tr.findall('td')
if not cols:
continue
account = Account() account = Account()
account.id = self.parser.tocleanstring(cols[self.COL_ID]) account.id = self.parser.tocleanstring(cols[self.COL_ID])
@ -91,6 +93,8 @@ class AccountsPage(BasePage):
yield account yield account
class SavingsPage(AccountsPage):
COL_ID = 1
class TransactionsPage(BasePage): class TransactionsPage(BasePage):
def get_next_url(self): def get_next_url(self):