Skip to content

Refined API - from/to dates, extended output #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Refined API - from/to dates, extended output #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f47454
q[UPD] extended output, handling shared accounts, refined API to supp…
Dec 6, 2013
f225a7a
[UPD] readme to the new version
Dec 6, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,25 @@ Features
Usage
-----

import time
from mbank.mbank import mBank
from datetime import date


date_from=date(2011,1,1)
date_to=date(2013,11,30)

mbank = mBank("customer id", "password")
mbank.login()
result = mbank.get_transactions("full account number")
result = mbank.get_transactions("full account number", date_from, date_to)
accounts = mbank.get_accounts()


Content of result variable:

[
<.....>
{'ss': 0, 'price': 5961.0500000000002, 'ks': 0, 'vs': 20120040, 'date_realization': datetime.date(2012, 6, 20), 'date_accounting': datetime.date(2012, 6, 20), 'type': 'incoming'},
{'ss': 0, 'price': 3961.0500000000002, 'ks': 7618, 'vs': 70577193, 'date_realization': datetime.date(2012, 6, 20), 'date_accounting': datetime.date(2012, 6, 20), 'type': 'outcoming'},
{'ss': 0, 'balance': 5961.0500000000002, 'ks': 0, 'vs': 20120040, 'date_realization': datetime.date(2012, 6, 20), 'date_accounting': datetime.date(2012, 6, 20), 'type': 'incoming', 'amount': 123, 'account': '000012-3456789101/1213'},
{'ss': 0, 'balance': 3961.0500000000002, 'ks': 7618, 'vs': 70577193, 'date_realization': datetime.date(2012, 6, 20), 'date_accounting': datetime.date(2012, 6, 20), 'type': 'outcoming','amount':-2000, 'account': '000012-3456789101/1213'},
<.....>
]
72 changes: 41 additions & 31 deletions mbank/mbank.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-

"""
Copyright (c) Adam Strauch
Copyright (c) Adam Strauch, Petr Kremen
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down Expand Up @@ -131,7 +131,8 @@ def get_accounts(self):
cashs = re.findall(q, r_accounts.text)
q = "(670100-[0-9]{10}/6210)"
accounts = re.findall(q, r_accounts.text)
if len(accounts) != len(parms) or len(accounts) != len(cashs):

if len(accounts) > len(parms) or len(accounts) > len(cashs):
raise MbankException("Parse error")

data = {}
Expand All @@ -141,7 +142,7 @@ def get_accounts(self):
i+=1
return data

def get_transactions_csv(self, account):
def get_transactions_csv(self, account,date_from,date_to):
if not self.data:
raise MbankException("Login first!")

Expand All @@ -163,12 +164,12 @@ def get_transactions_csv(self, account):
"__STATE": self.data["state"],
"__EVENTVALIDATION": self.data["eventvalidation"],
'rangepanel_group': 'daterange_radio',
'daterange_from_day': 1,
'daterange_from_month': 5,
'daterange_from_year': 2012,
'daterange_to_day': 24,
'daterange_to_month': 6,
'daterange_to_year': 2012,
'daterange_from_day': date_from.day,
'daterange_from_month': date_from.month,
'daterange_from_year': date_from.year,
'daterange_to_day': date_to.day,
'daterange_to_month': date_to.month,
'daterange_to_year': date_to.year,
'accoperlist_typefilter_group': 'ALL',
'accoperlist_amountfilter_amountmin': '',
'accoperlist_amountfilter_amountmax': '',
Expand All @@ -178,8 +179,8 @@ def get_transactions_csv(self, account):
r_csv = self.load(self.transactions_csv_url, "post", form_data)
return r_csv.text

def get_transactions(self, account):
data = self.get_transactions_csv(account)
def get_transactions(self, account, date_from, date_to):
data = self.get_transactions_csv(account,date_from, date_to)
lines = []
write = False
for line in data.split("\n"):
Expand All @@ -197,40 +198,49 @@ def get_transactions(self, account):
o = {
"date_realization": datetime.date(date1[2], date1[1], date1[0]),
"date_accounting": datetime.date(date2[2], date2[1], date2[0]),
"type": "outcoming" if "ODCHOZ" in x[2].decode("iso-8859-2") else "incoming",
"price": float(x[-2].replace(" ", "").replace(",", ".")),
"type": "outcoming" if "ODCHOZ" in x[2] else "incoming",
"balance": float(x[-2].replace(" ", "").replace(",", ".")),
"amount": float(x[-3].replace(" ", "").replace(",", ".")),
"ss": int(x[-4]) if x[-4] else 0,
"vs": int(x[-5]) if x[-5] else 0,
"ks": int(x[-6]) if x[-6] else 0,
"account": x[-7],
}
result.append(o)
return result

def transactions_format(data):
print "Date".ljust(19),
print "Type".ljust(10),
print "SS".ljust(10),
print "VS".ljust(10),
print "KS".ljust(10),
print "Price".ljust(10)
print "-------------------------------------------------------------------------"
for trans in data:
print trans["date_realization"].strftime("%d.%m.%Y").ljust(19),
print trans["type"].ljust(10),
print ("%d" % trans["ss"]).ljust(10),
print ("%d" % trans["vs"]).ljust(10),
print ("%d" % trans["ks"]).ljust(10),
print ("%.2f" % trans["price"]).ljust(10)
def transactions_format(self,data):
print "Datum".ljust(19),
print "Typ".ljust(10),
print "Částka".ljust(12),
print "Účet".ljust(30),
print "Spec. s.".ljust(10),
print "Var. s.".ljust(10),
print "Konst. s.".ljust(10),
print "Zůstatek".ljust(10)
print "-"*115
for trans in data:
print trans["date_realization"].strftime("%d.%m.%Y").ljust(19),
print trans["type"].ljust(10),
print ("%.2f" % trans["amount"]).ljust(10),
print trans["account"].ljust(30),
print ("%d" % trans["ss"]).ljust(10),
print ("%d" % trans["vs"]).ljust(10),
print ("%d" % trans["ks"]).ljust(10),
print ("%.2f" % trans["balance"]).ljust(10)

def main():
customer = ""
password = ""
account = "670100-2206514444/6210"
account = ""

date_from=date(2010,1,1)
date_to=date(2013,10,31)

mbank = mBank(customer, password)
mbank.login()
result = mbank.get_transactions(account)
transactions_format(result)
result = mbank.get_transactions(account,date_from,date_to)
mbank.transactions_format(result)

if __name__ == "__main__":
main()