From: Christian Heller
Date: Sat, 4 Nov 2023 21:36:17 +0000 (+0100)
Subject: Improve ledger.py.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/task?a=commitdiff_plain;h=fb98793f5731cb56c3122ce813ea85158040abed;p=misc
Improve ledger.py.
---
diff --git a/ledger.py b/ledger.py
index b93b202..2b2a807 100755
--- a/ledger.py
+++ b/ledger.py
@@ -1,5 +1,4 @@
from http.server import BaseHTTPRequestHandler, HTTPServer
-import sys
import os
import html
import jinja2
@@ -14,11 +13,6 @@ class HandledException(Exception):
pass
-def handled_error_exit(msg):
- print(f"ERROR: {msg}")
- sys.exit(1)
-
-
def apply_booking_to_account_balances(account_sums, account, currency, amount):
if not account in account_sums:
account_sums[account] = {currency: amount}
@@ -321,11 +315,8 @@ class Database:
source = f'{bak_prefix}{i}'
target = f'{bak_prefix}{j}'
shutil.move(source, target)
- else:
- print("keeping", i)
j += 1
for i in range(j, len(backup_dates)):
- print("removing", i)
try:
os.remove(f'{bak_prefix}{i}')
except FileNotFoundError:
@@ -467,20 +458,19 @@ input[type=number] { text-align: right; font-family: monospace; }
.full_line_comment { display: block; white-space: nowrap; width: 0; }
-ledger1
-ledger2
+ledger
balance
add free
add structured
"""
booking_tmpl = jinja2.Template("""
-{{date}} {{desc}}
+
{{date}} {{desc}}
[edit: structured
/ free
| copy:structured
/ free
-| balance before or after
+| balance after
]
{% for l in booking_lines %}
@@ -492,18 +482,25 @@ input[type=number] { text-align: right; font-family: monospace; }
{% endfor %}
""")
+ add_form_footer = """
+
+
+
+
+"""
footer = "\n"
def do_POST(self):
try:
- db = Database()
+ parsed_url = urlparse(self.path)
length = int(self.headers['content-length'])
postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1)
- parsed_url = urlparse(self.path)
- lines = []
- add_empty_line = None
start = int(postvars['start'][0])
end = int(postvars['end'][0])
+
+ db = Database()
+ add_empty_line = None
+ lines = []
if '/add_structured' == parsed_url.path and not 'revert' in postvars.keys():
date = postvars['date'][0]
description = postvars['description'][0]
@@ -550,75 +547,72 @@ input[type=number] { text-align: right; font-family: monospace; }
lines += db.add_taxes(lines, finish=True)
elif '/add_free' == parsed_url.path:
lines = postvars['booking'][0].splitlines()
+
if ('save' in postvars.keys()) or ('check' in postvars.keys()):
_, _ = parse_lines(lines)
+
if 'save' in postvars.keys():
if start == end == 0:
db.append(lines)
redir_url = f'/#last'
else:
db.replace(start, end, lines)
- redir_url = f'/#{start}'
- self.send_response(301)
- self.send_header('Location', redir_url)
- self.end_headers()
- else:
+ nth = 0
+ for i, b in enumerate(db.bookings):
+ if b.start_line == start:
+ nth = i
+ break
+ redir_url = f'/#{nth}'
+ self.send_code_and_headers(301, [('Location', redir_url)])
+ else: # implicit assumption: this only happens on /add_structured flows
page = self.header + self.add_structured(db, start, end, temp_lines=lines, add_empty_line=add_empty_line) + self.footer
- self.send_response(200)
- self.send_header("Content-type", "text/html")
- self.end_headers()
- self.wfile.write(bytes(page, "utf-8"))
+ self.send_HTML(page)
except HandledException as e:
- self.send_response(400)
- self.send_header("Content-type", "text/html")
- self.end_headers()
- page = f'{self.header}ERROR: {e}{self.footer}'
- self.wfile.write(bytes(page, "utf-8"))
+ self.fail_400(e)
def do_GET(self):
- self.send_response(200)
- self.send_header("Content-type", "text/html")
+ try:
+ parsed_url = urlparse(self.path)
+ params = parse_qs(parsed_url.query)
+ start = int(params.get('start', ['0'])[0])
+ end = int(params.get('end', ['0'])[0])
+ db = Database()
+ page = self.header
+ if parsed_url.path == '/balance':
+ stop = params.get('stop', [None])[0]
+ page += self.balance_as_html(db, stop)
+ elif parsed_url.path == '/add_free':
+ page += self.add_free(db, start, end)
+ elif parsed_url.path == '/add_structured':
+ page += self.add_structured(db, start, end)
+ elif parsed_url.path == '/copy_free':
+ page += self.add_free(db, start, end, copy=True)
+ elif parsed_url.path == '/copy_structured':
+ page += self.add_structured(db, start, end, copy=True)
+ else:
+ page += self.ledger_as_html(db)
+ page += self.footer
+ self.send_HTML(page)
+ except HandledException as e:
+ self.fail_400(e)
+
+ def fail_400(self, e):
+ page = f'{self.header}ERROR: {e}{self.footer}'
+ self.send_HTML(page, 400)
+
+ def send_HTML(self, html, code=200):
+ self.send_code_and_headers(code, [('Content-type', 'text/html')])
+ self.wfile.write(bytes(html, "utf-8"))
+
+ def send_code_and_headers(self, code, headers=[]):
+ self.send_response(code)
+ for fieldname, content in headers:
+ self.send_header(fieldname, content)
self.end_headers()
- db = Database()
- parsed_url = urlparse(self.path)
- page = self.header + ''
- params = parse_qs(parsed_url.query)
- start = int(params.get('start', ['0'])[0])
- end = int(params.get('end', ['0'])[0])
- if parsed_url.path == '/balance':
- stop_date = params.get('stop', [None])[0]
- plus = int(params.get('plus', [0])[0])
- page += self.balance_as_html(db, stop_date, plus)
- elif parsed_url.path == '/add_free':
- page += self.add_free(db, start, end)
- elif parsed_url.path == '/add_structured':
- page += self.add_structured(db, start, end)
- elif parsed_url.path == '/copy_free':
- page += self.add_free(db, start, end, copy=True)
- elif parsed_url.path == '/copy_structured':
- page += self.add_structured(db, start, end, copy=True)
- elif parsed_url.path == '/ledger2':
- page += self.ledger2_as_html(db)
- else:
- page += self.ledger_as_html(db)
- page += self.footer
- self.wfile.write(bytes(page, "utf-8"))
- def balance_as_html(self, db, stop_date=None, plus=0):
+ def balance_as_html(self, db, until=None):
+ bookings = db.bookings[:until if until is None else int(until)]
lines = []
- bookings = db.bookings
- if stop_date:
- bookings = []
- i = -1
- for b in db.bookings:
- if b.date_string == stop_date:
- if -1 == i:
- i = 0
- if i >= plus:
- break
- if i > -1:
- i += 1
- bookings += [b]
account_tree, account_sums = bookings_to_account_tree(bookings)
def print_subtree(lines, indent, node, subtree, path):
line = f"{indent}{node}"
@@ -641,84 +635,20 @@ input[type=number] { text-align: right; font-family: monospace; }
content = "\n".join(lines)
return f"{content}
"
- def ledger2_as_html(self, db):
- elements_to_write = []
- account_sums = {} ##
- nth_of_same_date = 0
- same_date = ''
- for booking in db.bookings:
- if booking.date_string == same_date:
- nth_of_same_date += 1
- else:
- same_date = booking.date_string
- nth_of_same_date = 0
- booking_end = booking.start_line + len(booking.lines)
- booking_lines = []
- for booking_line in booking.lines[1:]:
- if booking_line == '':
- continue
- account = booking_line[0] ##
- account_toks = account.split(':') ##
- path = '' ##
- for tok in account_toks: ##
- path += tok ##
- if not path in account_sums.keys(): ##
- account_sums[path] = {} ##
- path += ':' ##
- moneys = [] ##
- money = ''
- if booking_line[1] is not None:
- moneys += [(booking_line[1], booking_line[2])] ##
- money = f'{moneys[0][0]} {moneys[0][1]}'
- else: ##
- for currency, amount in booking.sink.items(): ##
- moneys += {(amount, currency)} ##
- money = '[' ##
- for m in moneys: ##
- money += f'{m[0]} {m[1]} ' ##
- money += ']' ##
- balance = '' ##
- for amount, currency in moneys: ##
- path = '' ##
- for tok in account_toks: ##
- path += tok ##
- if not currency in account_sums[path].keys(): ##
- account_sums[path][currency] = 0 ##
- account_sums[path][currency] += amount ##
- path += ':' ##
- balance += f'{account_sums[account][currency]} {currency}' ##
- booking_lines += [{'acc': booking_line[0], 'money':money, 'comment':balance}] ##
- elements_to_write += [self.booking_tmpl.render(
- start=booking.start_line,
- end=booking_end,
- date=booking.date_string,
- desc=booking.description,
- head_comment=db.comments[booking.start_line],
- steps_after_date=nth_of_same_date,
- booking_lines = booking_lines)]
- return '\n'.join(elements_to_write)
-
def ledger_as_html(self, db):
- single_c_tmpl = jinja2.Template('
')
+ single_c_tmpl = jinja2.Template('
') ##
elements_to_write = []
last_i = i = 0 ##
- nth_of_same_date = 0
- same_date = ''
- for booking in db.bookings:
- if booking.date_string == same_date:
- nth_of_same_date += 1
- else:
- same_date = booking.date_string
- nth_of_same_date = 0
- i = booking.start_line ##
- elements_to_write += [single_c_tmpl.render(c=c) for c in db.comments[last_i:i] if c != ''] ##
+ for nth, booking in enumerate(db.bookings):
booking_end = last_i = booking.start_line + len(booking.lines)
booking_lines = []
+ i = booking.start_line ##
+ elements_to_write += [single_c_tmpl.render(c=c) for c in db.comments[last_i:i] if c != ''] ##
for booking_line in booking.lines[1:]:
- i += 1
- comment = db.comments[i]
+ i += 1 ##
+ comment = db.comments[i] ##
if booking_line == '':
- booking_lines += [{'acc': None, 'money': None, 'comment': comment}]
+ booking_lines += [{'acc': None, 'money': None, 'comment': comment}] ##
continue
account = booking_line[0]
money = ''
@@ -726,14 +656,14 @@ input[type=number] { text-align: right; font-family: monospace; }
money = f'{booking_line[1]} {booking_line[2]}'
booking_lines += [{'acc': booking_line[0], 'money':money, 'comment':comment}] ##
elements_to_write += [self.booking_tmpl.render(
+ nth=nth,
start=booking.start_line,
end=booking_end,
date=booking.date_string,
desc=booking.description,
head_comment=db.comments[booking.start_line],
- steps_after_date=nth_of_same_date,
booking_lines = booking_lines)]
- elements_to_write += [single_c_tmpl.render(c=c) for c in db.comments[last_i:] if c != '']
+ elements_to_write += [single_c_tmpl.render(c=c) for c in db.comments[last_i:] if c != ''] #
return '\n'.join(elements_to_write)
def add_free(self, db, start=0, end=0, copy=False):
@@ -743,11 +673,7 @@ input[type=number] { text-align: right; font-family: monospace; }
{% for line in lines %}{{ line }}
{% endfor %}
-
-
-
-
-""")
+""" + self.add_form_footer)
lines = db.get_lines(start, end)
if copy:
start = end = 0
@@ -784,11 +710,7 @@ input[type=number] { text-align: right; font-family: monospace; }
{% endfor %}
{% endfor %}
-
-
-
-
-""")
+""" + self.add_form_footer)
lines = temp_lines if len(''.join(temp_lines)) > 0 else db.get_lines(start, end)
bookings, comments = parse_lines(lines, validate_bookings=False)
if len(bookings) > 1: