From: Christian Heller Date: Sun, 29 Oct 2023 02:43:54 +0000 (+0100) Subject: Add Jinja2 to ledger.py. X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Btodo.comment%7D%7D?a=commitdiff_plain;h=01c660c082033cb534453bbd7d597e240c30610b;p=misc Add Jinja2 to ledger.py. --- diff --git a/ledger.py b/ledger.py index 80ca0f6..2a9a89c 100755 --- a/ledger.py +++ b/ledger.py @@ -2,6 +2,7 @@ from http.server import BaseHTTPRequestHandler, HTTPServer import sys import os import html +import jinja2 from urllib.parse import parse_qs, urlparse hostName = "localhost" serverPort = 8082 @@ -244,6 +245,7 @@ def parse_lines(lines): raise HandledException(f"{prefix} last booking unfinished") return bookings, comments + class Booking: def __init__(self, date_string, description, booking_lines, start_line): @@ -316,7 +318,7 @@ class Database: self.real_lines = [] if os.path.exists(self.db_file): with open(self.db_file, "r") as f: - self.real_lines += f.readlines() + self.real_lines += [l.rstrip() for l in f.readlines()] ret = parse_lines(self.real_lines) self.bookings += ret[0] self.comments += ret[1] @@ -332,7 +334,9 @@ class Database: shutil.copy(self.db_file, self.db_file + ".bak") f = open(self.lock_file, 'w+') f.close() - text = ''.join(self.real_lines[:start]) + '\n'.join(lines) + ''.join(self.real_lines[end:]) + total_lines = self.real_lines[:start] + lines + self.real_lines[end:] + text = '\n'.join(total_lines) + # text = '\n'.join(self.real_lines[:start]) + '\n'.join(lines) + '\n'.join(self.real_lines[end:]) with open(self.db_file, 'w') as f: f.write(text); os.remove(self.lock_file) @@ -346,7 +350,7 @@ class Database: f = open(self.lock_file, 'w+') f.close() with open(self.db_file, 'a') as f: - f.write('\n' + '\n'.join(lines) + '\n'); + f.write('\n\n' + '\n'.join(lines) + '\n\n'); os.remove(self.lock_file) @@ -446,7 +450,6 @@ input[type=number] { text-align: right; font-family: monospace; } params = parse_qs(parsed_url.query) start = int(params.get('start', ['0'])[0]) end = int(params.get('end', ['0'])[0]) - # bonus_lines = int(params.get('bonus_lines', ['0'])[0]) if parsed_url.path == '/balance': page += self.balance_as_html(db) elif parsed_url.path == '/add_free': @@ -487,57 +490,100 @@ input[type=number] { text-align: right; font-family: monospace; } return f"
{content}
" def ledger_as_html(self, db): - lines = [] - for comment in db.comments: - lines += [f'{comment}' if comment != '' else ''] + single_c_tmpl = jinja2.Template('{{c}}
') + booking_tmpl = jinja2.Template(""" +

{{date}} {{desc}} {{head_comment}} +[edit: structured +/ free +| copy:structured +/ free] + +{% for l in booking_lines %} +{% if l.acc %} + +{% else %} + +{% endif %} +{% endfor %} +
{{l.acc}}{{l.money}}{{l.comment}}
{{l.comment}}

+""") + elements_to_write = [] + last_i = i = 0 for booking in db.bookings: i = booking.start_line - booking_end = booking.start_line + len(booking.lines) - lines[i] = f"""

{booking.date_string} {booking.description} {lines[i]} -[edit: structured -/ free -| copy:structured -/ free] -""" + elements_to_write += [single_c_tmpl.render(c=c) for c in db.comments[last_i:i] if c != ''] + booking_end = last_i = booking.start_line + len(booking.lines) + booking_lines = [] for booking_line in booking.lines[1:]: i += 1 + comment = db.comments[i] if booking_line == '': - lines[i] = f'' + booking_lines += [{'acc': None, 'money': None, 'comment': comment}] continue - comment = f' {lines[i]}' if len(lines[i]) > 0 else '' money = '' if booking_line[1]: money = f'{booking_line[1]} {booking_line[2]}' account = booking_line[0] - lines[i] = f'' - lines[i] = lines[i] + "\n" + '
{lines[i]}
{booking_line[0]}{money}{comment}

' - return '\n'.join(lines) - - def header_add_form(self, action): - return f"
\n" - - def footer_add_form(self, start, end, copy): - if copy: - start = end = 0 - return f""" - - - -
""" - - def textarea(self, name, lines, min_rows=1, min_cols=20): - safe_content = html.escape(''.join(lines)) - n_rows = max(min_rows, len(lines)) - n_cols = min_cols - for line in lines: - n_cols = len(line) if len(line) > n_cols else n_cols - return f'' + booking_lines += [{'acc': booking_line[0], 'money':money, 'comment':comment}] + elements_to_write += [booking_tmpl.render( + start=booking.start_line, + end=booking_end, + date=booking.date_string, + desc=booking.description, + head_comment=db.comments[booking.start_line], + booking_lines = booking_lines)] + return '\n'.join(elements_to_write) def add_free(self, db, start=0, end=0, copy=False): + tmpl = jinja2.Template(""" +
+ + + + +
+""") lines = db.get_lines(start, end) - return f'{self.header_add_form("add_free")}{self.textarea("booking",lines,10,80)}{self.footer_add_form(start, end, copy)}' + if copy: + start = end = 0 + return tmpl.render(start=start, end=end, lines=lines) def add_structured(self, db, start=0, end=0, copy=False, temp_lines=[], add_empty_line=None): + tmpl = jinja2.Template(""" +
+ + + +
+ + + + +
+{% for line in booking_lines %} + + + + + + +
+{% endfor %} +{% for name, items in datalist_sets.items() %} + +{% for item in items %} + +{% endfor %} + +{% endfor %} + + + +
+""") import datetime lines = temp_lines if len(''.join(temp_lines)) > 0 else db.get_lines(start, end) bookings, comments = parse_lines(lines) @@ -547,51 +593,53 @@ input[type=number] { text-align: right; font-family: monospace; } comments = comments[:add_empty_line+1] + [''] + comments[add_empty_line+1:] booking = bookings[0] booking.lines = booking.lines[:add_empty_line+1] + [''] + booking.lines[add_empty_line+1:] - def inpu(name, val="", datalist="", input_type='text', size=-1): - val = val if val is not None else "" - safe_val = html.escape(str(val)) - datalist_string = '' if datalist == '' else f'list="{datalist}"' - number_step = '' if input_type != 'number' else ' step=0.01' - size_string = '' if size < 0 else f' size={size}' - return f'' - input_lines = inpu('check', 'check', '', 'submit') +\ - inpu('revert', 'revert', '', 'submit') +\ - inpu('add_taxes', 'add taxes', '', 'submit') +\ - '
' + action = 'add_structured' + datalist_sets = {'descriptions': set(), 'accounts': set(), 'currencies': set()} + for b in db.bookings: + datalist_sets['descriptions'].add(b.description) + for account, moneys in b.account_changes.items(): + datalist_sets['accounts'].add(account) + for currency in moneys.keys(): + datalist_sets['currencies'].add(currency) + content = '' today = str(datetime.datetime.now())[:10] + booking_lines = [] + if copy: + start = end = 0 + desc = head_comment = '' if len(bookings) == 0: - input_lines += f'{inpu("date", today, size=9)} {inpu("description", "", "descriptions")} ; {inpu("line_0_comment")} {inpu(f"line_0_add", "[+]", "", "submit")}
' for i in range(1, 3): - input_lines += f'{inpu(f"line_{i}_account", "", "accounts", size=40)} {inpu(f"line_{i}_amount", "", "", "number", size=10)} {inpu(f"line_{i}_currency", "", "currencies", size=3)} ; {self.textarea(f"line_{i}_comment", "")} {inpu(f"line_{i}_delete", "[x]", "", "submit")} {inpu(f"line_{i}_add", "[+]", "", "submit")}
' + booking_lines += [{'i': i, 'acc': '', 'amt': '', 'curr': '', 'comment': ''}] + date=today else: booking = bookings[0] + desc = booking.description + date = today if copy else booking.date_string + head_comment=comments[0] last_line = len(comments) - date_string = today if copy else booking.date_string - input_lines += f'{inpu("date", date_string, size=9)} {inpu("description", booking.description, "descriptions")} ; {self.textarea("line_0_comment", [comments[0]])} {inpu(f"line_0_add", "[+]", "", "submit")}
' for i in range(1, len(comments)): account = amount = currency = '' if i < len(booking.lines) and booking.lines[i] != '': account = booking.lines[i][0] amount = booking.lines[i][1] currency = booking.lines[i][2] - input_lines += f'{inpu(f"line_{i}_account", account, "accounts", size=40)} {inpu(f"line_{i}_amount", amount, "", "number", size=10)} {inpu(f"line_{i}_currency", currency, "currencies", size=3)} ; {self.textarea(f"line_{i}_comment", [comments[i]])} {inpu(f"line_{i}_delete", "[x]", "", "submit")} {inpu(f"line_{i}_add", "[+]", "", "submit")}
' - datalist_sets = {'descriptions': set(), 'accounts': set(), 'currencies': set()} - for b in db.bookings: - datalist_sets['descriptions'].add(b.description) - for account, moneys in b.account_changes.items(): - datalist_sets['accounts'].add(account) - for currency in moneys.keys(): - datalist_sets['currencies'].add(currency) - def build_datalist(name): - datalist = f'' + "\n" - for item in datalist_sets[name]: - safe_item = html.escape(item) - datalist += f'' + "\n" - return f"{datalist}\n" - datalists = build_datalist('descriptions') - datalists += build_datalist('accounts') - datalists += build_datalist('currencies') - return f'{self.header_add_form("add_structured")}{input_lines}{datalists}{self.footer_add_form(start, end, copy)}' + booking_lines += [{ + 'i': i, + 'acc': account, + 'amt': amount, + 'curr': currency if currency else '', + 'comment': comments[i], + 'comm_cols': len(comments[i])}] + content += tmpl.render( + action=action, + date=date, + desc=desc, + head_comment=head_comment, + booking_lines=booking_lines, + datalist_sets=datalist_sets, + start=start, + end=end) + return content if __name__ == "__main__":