home · contact · privacy
Improve accounting scripts.
[misc] / ledger.py
index 02e0273c74f26590e426e7860d72576e0721073f..6653af6e8e7f341cb80901f0aed83d9466c8c968 100755 (executable)
--- a/ledger.py
+++ b/ledger.py
@@ -1,16 +1,94 @@
-from http.server import BaseHTTPRequestHandler, HTTPServer
 import os
-import html
 import jinja2
 import decimal
-import datetime
+from datetime import datetime, timedelta
 from urllib.parse import parse_qs, urlparse
-hostName = "localhost"
-serverPort = 8082
+from plomlib import PlomDB, PlomException, run_server, PlomHandler 
 
+server_port = 8082
+db_path = '/home/plom/org/ledger2023.dat'
 
-class HandledException(Exception):
-    pass
+html_head = """
+<style>
+body { color: #000000; }
+table { margin-bottom: 2em; }
+th, td { text-align: left }
+input[type=number] { text-align: right; font-family: monospace; }
+.money { font-family: monospace; text-align: right; }
+.comment { font-style: italic; color: #777777; }
+.meta { font-size: 0.75em; color: #777777; }
+.full_line_comment { display: block; white-space: nowrap; width: 0; }
+</style>
+<body>
+<a href="{{prefix}}/ledger">ledger</a>
+<a href="{{prefix}}/balance">balance</a>
+<a href="{{prefix}}/add_free">add free</a>
+<a href="{{prefix}}/add_structured">add structured</a>
+<hr />
+"""
+booking_html = """
+<p id="{{nth}}"><a href="{{prefix}}#{{nth}}">{{date}}</a> {{desc}} <span class="comment">{{head_comment|e}}</span><br />
+<span class="meta">[edit: <a href="{{prefix}}/add_structured?start={{start}}&end={{end}}">structured</a>
+/ <a href="{{prefix}}/add_free?start={{start}}&end={{end}}">free</a>
+| copy:<a href="{{prefix}}/copy_structured?start={{start}}&end={{end}}">structured</a>
+/ <a href="{{prefix}}/copy_free?start={{start}}&end={{end}}">free</a>
+| move {% if move_up %}<a href="{{prefix}}/move_up?start={{start}}&end={{end}}">up</a>{% else %}up{% endif %}/{% if move_down %}<a href="{{prefix}}/move_down?start={{start}}&end={{end}}">down</a>{% else %}down{% endif %}
+| <a href="{{prefix}}/balance?stop={{nth+1}}">balance after</a>
+]</span>
+<table>
+{% for l in booking_lines %}
+{% if l.acc %}
+<tr><td>{{l.acc|e}}</td><td class="money">{{l.money|e}}</td><td class="comment">{{l.comment|e}}</td></tr>
+{% else %}
+<tr><td><div class="comment full_line_comment">{{l.comment|e}}</div></td></tr>
+{% endif %}
+{% endfor %}
+</table></p>
+"""
+add_form_header = """<form method="POST" action="{{action|e}}">
+<input type="submit" name="check" value="check" />
+<input type="submit" name="revert" value="revert" />
+"""
+add_form_footer = """
+<input type="hidden" name="start" value={{start}} />
+<input type="hidden" name="end" value={{end}} />
+<input type="submit" name="save" value="save!">
+</form>
+"""
+add_free_html = """<br />
+<textarea name="booking" rows=10 cols=80>
+{% for line in lines %}{{ line }}
+{% endfor %}
+</textarea>
+"""
+add_structured_html = """
+<input type="submit" name="add_taxes" value="add taxes" />
+<input type="submit" name="add_taxes2" value="add taxes2" />
+<input type="submit" name="add_sink" value="add sink" />
+<br />
+<input name="date" value="{{date|e}}" size=9 />
+<input name="description" value="{{desc|e}}" list="descriptions" />
+<textarea name="line_0_comment" rows=1 cols=20>{{head_comment|e}}</textarea>
+<input type="submit" name="line_0_add" value="[+]" />
+<br />
+{% for line in booking_lines %}
+<input name="line_{{line.i}}_account" value="{{line.acc|e}}" size=40 list="accounts" />
+<input type="number" name="line_{{line.i}}_amount" step=0.01 value="{{line.amt}}" size=10 />
+<input name="line_{{line.i}}_currency" value="{{line.curr|e}}" size=3 list="currencies" />
+<input type="submit" name="line_{{line.i}}_delete" value="[x]" />
+<input type="submit" name="line_{{line.i}}_delete_after" value="[XX]" />
+<input type="submit" name="line_{{line.i}}_add" value="[+]" />
+<textarea name="line_{{line.i}}_comment" rows=1 cols={% if line.comm_cols %}{{line.comm_cols}}{% else %}20{% endif %}>{{line.comment|e}}</textarea>
+<br />
+{% endfor %}
+{% for name, items in datalist_sets.items() %}
+<datalist id="{{name}}">
+{% for item in items %}
+  <option value="{{item|e}}">{{item|e}}</option>
+{% endfor %}
+</datalist>
+{% endfor %}
+"""
 
 
 def apply_booking_to_account_balances(account_sums, account, currency, amount):
@@ -67,7 +145,6 @@ def bookings_to_account_tree(bookings):
 
 
 def parse_lines(lines, validate_bookings=True):
-    import datetime
     inside_booking = False
     date_string, description = None, None
     booking_lines = []
@@ -85,7 +162,7 @@ def parse_lines(lines, validate_bookings=True):
             if inside_booking:
                 # assume we finished a booking, finalize, and commit to DB
                 if len(booking_lines) < 2:
-                    raise HandledException(f"{prefix} booking ends to early")
+                    raise PlomException(f"{prefix} booking ends to early")
                 booking = Booking(date_string, description, booking_lines, start_line, validate_bookings)
                 bookings += [booking]
             # expect new booking to follow so re-zeroall booking data
@@ -109,23 +186,23 @@ def parse_lines(lines, validate_bookings=True):
             toks = non_comment.split(maxsplit=1)
             date_string = toks[0]
             try:
-                datetime.datetime.strptime(date_string, '%Y-%m-%d')
+                datetime.strptime(date_string, '%Y-%m-%d')
             except ValueError:
-                raise HandledException(f"{prefix} bad date string: {date_string}")
+                raise PlomException(f"{prefix} bad date string: {date_string}")
             if last_date > date_string:
-                raise HandledException(f"{prefix} out-of-order-date")
+                raise PlomException(f"{prefix} out-of-order-date")
             last_date = date_string
             try:
                 description = toks[1]
             except IndexError:
-                raise HandledException(f"{prefix} bad description: {description}")
+                raise PlomException(f"{prefix} bad description: {description}")
             inside_booking = True
             booking_lines += [non_comment]
             continue
         # otherwise, read as transfer data
         toks = non_comment.split()  # ignore specification's allowance of single spaces in names
         if len(toks) > 3:
-            raise HandledException(f"{prefix} too many booking line tokens: {toks}")
+            raise PlomException(f"{prefix} too many booking line tokens: {toks}")
         amount, currency = None, None
         account_name = toks[0]
         if account_name[0] == '[' and account_name[-1] == ']':
@@ -141,10 +218,10 @@ def parse_lines(lines, validate_bookings=True):
                 try:
                     amount = decimal.Decimal(toks[2])
                 except decimal.InvalidOperation:
-                    raise HandledException(f"{prefix} no decimal number in: {toks[1:]}")
+                    raise PlomException(f"{prefix} no decimal number in: {toks[1:]}")
             currency = toks[i_currency]
             if currency[0] in decimal_chars:
-                raise HandledException(f"{prefix} currency starts with int, dot, or minus: {currency}")
+                raise PlomException(f"{prefix} currency starts with int, dot, or minus: {currency}")
         elif len(toks) == 2:
             value = toks[1]
             inside_amount = False
@@ -168,25 +245,25 @@ def parse_lines(lines, validate_bookings=True):
                 if inside_amount:
                     if c not in decimal_chars:
                         if len(currency) > 0:
-                            raise HandledException(f"{prefix} amount has non-decimal chars: {value}")
+                            raise PlomException(f"{prefix} amount has non-decimal chars: {value}")
                         inside_currency = True
                         inside_amount = False
                         currency += c
                         continue
                     if c == '-' and len(amount_string) > 1:
-                        raise HandledException(f"{prefix} amount has non-start '-': {value}")
+                        raise PlomException(f"{prefix} amount has non-start '-': {value}")
                     if c == '.':
                         if dots_counted > 1:
-                            raise HandledException(f"{prefix} amount has multiple dots: {value}")
+                            raise PlomException(f"{prefix} amount has multiple dots: {value}")
                         dots_counted += 1
                     amount_string += c
             if len(currency) == 0:
-                raise HandledException(f"{prefix} currency missing: {value}")
+                raise PlomException(f"{prefix} currency missing: {value}")
             if len(amount_string) > 0:
                 amount = decimal.Decimal(amount_string)
         booking_lines += [(account_name, amount, currency)]
     if inside_booking:
-        raise HandledException(f"{prefix} last booking unfinished")
+        raise PlomException(f"{prefix} last booking unfinished")
     return bookings, comments
 
 
@@ -212,7 +289,7 @@ class Booking:
             _, amount, currency = line
             if amount is None:
                 if empty_values > 0:
-                    raise HandledException(f"{prefix} relates more than one empty value of same currency {currency}")
+                    raise PlomException(f"{prefix} relates more than one empty value of same currency {currency}")
                 empty_values += 1
                 continue
             if currency not in sums:
@@ -221,14 +298,14 @@ class Booking:
         if empty_values == 0:
             for k, v in sums.items():
                 if v != 0:
-                    raise HandledException(f"{prefix} does not add up to zero / {k} {v}")
+                    raise PlomException(f"{prefix} does not add up to zero / {k} {v}")
         else:
             sinkable = False
             for k, v in sums.items():
                 if v != 0:
                     sinkable = True
             if not sinkable:
-                raise HandledException(f"{prefix} has empty value that cannot be filled")
+                raise PlomException(f"{prefix} has empty value that cannot be filled")
 
     def parse_booking_lines_to_account_changes(self):
         account_changes = {}
@@ -254,97 +331,66 @@ class Booking:
 
 
 
-class Database:
+class LedgerDB(PlomDB):
 
-    def __init__(self):
-        db_name = "_ledger"
-        self.db_file = db_name + ".json"
-        self.lock_file = db_name+ ".lock"
+    def __init__(self, prefix):
+        self.prefix = prefix 
         self.bookings = []
         self.comments = []
         self.real_lines = []
-        if os.path.exists(self.db_file):
-            with open(self.db_file, "r") as f:
-                self.real_lines += [l.rstrip() for l in f.readlines()]
+        super().__init__(db_path)
         ret = parse_lines(self.real_lines)
         self.bookings += ret[0]
         self.comments += ret[1]
 
+    def read_db_file(self, f):
+        self.real_lines += [l.rstrip() for l in f.readlines()]
+
     def get_lines(self, start, end):
         return self.real_lines[start:end]
 
     def write_db(self, text, mode='w'):
-        import shutil
-        if os.path.exists(self.lock_file):
-            raise HandledException('Sorry, lock file!')
-        f = open(self.lock_file, 'w+')
-        f.close()
-
-        # always back up most recent to .bak
-        bakpath = f'{self.db_file}.bak'
-        shutil.copy(self.db_file, bakpath)
-
-        # collect modification times of numbered .bak files
-        bak_prefix = f'{bakpath}.'
-        backup_dates = []
-        i = 0
-        bak_as = f'{bak_prefix}{i}'
-        while os.path.exists(bak_as):
-            mod_time = os.path.getmtime(bak_as)
-            backup_dates += [str(datetime.datetime.fromtimestamp(mod_time))]
-            i += 1
-            bak_as = f'{bak_prefix}{i}'
-
-        # collect what numbered .bak files to save:
-        # shrink datetime string right to left character by character,
-        # on each step add the oldest file whose mtime still fits the pattern
-        # (privilege older files to keep existing longer)
-        to_save = []
-        datetime_len = 19
-        now = str(datetime.datetime.now())[:datetime_len]
-        while datetime_len > 2:
-            # assume backup_dates starts with oldest dates
-            for i, date in enumerate(backup_dates):
-                if date[:datetime_len] == now:
-                    if i not in to_save:
-                        to_save += [i] 
-                        break
-            datetime_len -= 1 
-            now = now[:datetime_len]
-
-        # remove redundant backup files 
-        j = 0
-        for i in to_save:
-            if i != j:
-                source = f'{bak_prefix}{i}'
-                target = f'{bak_prefix}{j}'
-                shutil.move(source, target)
-            j += 1
-        for i in range(j, len(backup_dates)):
-            try:
-                os.remove(f'{bak_prefix}{i}')
-            except FileNotFoundError:
-                pass
+        self.write_text_to_db(text)
 
-        # put second backup copy of current state at end of bak list 
-        shutil.copy(self.db_file, f'{bak_prefix}{j}')
-        with open(self.db_file, mode) as f:
-            f.write(text);
-        os.remove(self.lock_file)
+    def insert_at_date(self, lines, date):
+        start_at = len(self.real_lines)
+        for b in self.bookings:
+            if b.date_string >= date:
+                start_at = b.start_line 
+                break
+            elif b.date_string > date:
+                break
+        if start_at == len(self.real_lines):
+            lines = [''] + lines
+        return self.write_lines_in_total_lines_at(self.real_lines, start_at, lines)
+
+    def update(self, start, end, lines, date):
+        total_lines = self.real_lines[:start] + self.real_lines[end:]
+        n_original_lines = end - start
+        start_at = len(total_lines)
+        for b in self.bookings:
+            if b.date_string == date:
+                if start_at == len(total_lines) or b.start_line == start:
+                    start_at = b.start_line 
+                    if b.start_line > start:
+                        start_at -= n_original_lines
+            elif b.date_string > date:
+                break
+        if start_at == len(total_lines):
+            lines = [''] + lines
+        return self.write_lines_in_total_lines_at(total_lines, start_at, lines)
 
-    def replace(self, start, end, lines):
-        total_lines = self.real_lines[:start] + lines + self.real_lines[end:]
+    def write_lines_in_total_lines_at(self, total_lines, start_at, lines):
+        total_lines = total_lines[:start_at] + lines + [''] + total_lines[start_at:]
+        _, _ = parse_lines(lines)
         text = '\n'.join(total_lines)
         self.write_db(text)
-
-    def append(self, lines):
-        text = '\n\n' + '\n'.join(lines) + '\n\n'
-        self.write_db(text, 'a')
+        return start_at
 
     def get_nth_for_booking_of_start_line(self, start_line):
         nth = 0
         for b in self.bookings:
-            if b.start_line == start_line:
+            if b.start_line >= start_line:
                 break
             nth += 1
         return nth
@@ -467,222 +513,21 @@ class Database:
             ret += [f'  {acc_buffer}  {-final_minus} € ; assume as to earn in year: {acc_buffer} + {12 - months_passed - 1} * this = {year_needed}']
         return ret
 
-
-class MyServer(BaseHTTPRequestHandler):
-    header = """<html>
-<meta charset="UTF-8">
-<style>
-body { color: #000000; }
-table { margin-bottom: 2em; }
-th, td { text-align: left }
-input[type=number] { text-align: right; font-family: monospace; }
-.money { font-family: monospace; text-align: right; }
-.comment { font-style: italic; color: #777777; }
-.meta { font-size: 0.75em; color: #777777; }
-.full_line_comment { display: block; white-space: nowrap; width: 0; }
-</style>
-<body>
-<a href="/">ledger</a>
-<a href="/balance">balance</a>
-<a href="/add_free">add free</a>
-<a href="/add_structured">add structured</a>
-<hr />
-"""
-    booking_tmpl = jinja2.Template("""
-<p id="{{nth}}"><a href="#{{nth}}">{{date}}</a> {{desc}} <span class="comment">{{head_comment|e}}</span><br />
-<span class="meta">[edit: <a href="/add_structured?start={{start}}&end={{end}}">structured</a>
-/ <a href="/add_free?start={{start}}&end={{end}}">free</a>
-| copy:<a href="/copy_structured?start={{start}}&end={{end}}">structured</a>
-/ <a href="/copy_free?start={{start}}&end={{end}}">free</a>
-| <a href="/balance?stop={{nth+1}}">balance after</a>
-]</span>
-<table>
-{% for l in booking_lines %}
-{% if l.acc %}
-<tr><td>{{l.acc|e}}</td><td class="money">{{l.money|e}}</td><td class="comment">{{l.comment|e}}</td></tr>
-{% else %}
-<tr><td><div class="comment full_line_comment">{{l.comment|e}}</div></td></tr>
-{% endif %}
-{% endfor %}
-</table></p>
-""")
-    add_form_header = """<form method="POST" action="{{action|e}}">
-<input type="submit" name="check" value="check" />
-<input type="submit" name="revert" value="revert" />
-"""
-    add_form_footer = """
-<input type="hidden" name="start" value={{start}} />
-<input type="hidden" name="end" value={{end}} />
-<input type="submit" name="save" value="save!">
-</form>
-"""
-    footer = "</body>\n<html>"
-
-    def do_POST(self):
-        try:
-            parsed_url = urlparse(self.path)
-            length = int(self.headers['content-length'])
-            postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1)
-            start = int(postvars['start'][0])
-            end = int(postvars['end'][0])
-            db = Database()
-            add_empty_line = None
-            lines = []
-            # get inputs
-            if '/add_structured' == parsed_url.path and not 'revert' in postvars.keys():
-                lines, add_empty_line = self.booking_lines_from_postvars(postvars, db) 
-            elif '/add_free' == parsed_url.path and not 'revert' in postvars.keys():
-                lines = postvars['booking'][0].splitlines()
-            # validate where appropriate
-            if ('save' in postvars.keys()) or ('check' in postvars.keys()):
-                _, _ = parse_lines(lines)
-            # if saving, process where to and where to redirect after
-            if 'save' in postvars.keys():
-                if start == end == 0:
-                    db.append(lines)
-                    redir_url = f'/#last'
-                else:
-                    db.replace(start, end, lines)
-                    nth = db.get_nth_for_booking_of_start_line(start) 
-                    redir_url = f'/#{nth}'
-                self.send_code_and_headers(301, [('Location', redir_url)])
-            # otherwise just re-build editing form
-            else:
-                if '/add_structured' == parsed_url.path: 
-                    edit_content = self.add_structured(db, start, end, temp_lines=lines, add_empty_line=add_empty_line)
-                else:
-                    edit_content = self.add_free(db, start, end)
-                self.send_HTML(self.header + edit_content + self.footer)
-        except HandledException as e:
-            self.fail_400(e)
-
-    def do_GET(self):
-        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()
-
-    def booking_lines_from_postvars(self, postvars, db):
-        add_empty_line = None
-        date = postvars['date'][0]
-        description = postvars['description'][0]
-        start_comment = postvars['line_0_comment'][0]
-        start_line = f'{date} {description}'
-        if start_comment.rstrip() != '':
-            start_line += f' ; {start_comment}' 
-        lines = [start_line]
-        if 'line_0_add' in postvars.keys():
-            add_empty_line = 0
-        i = j = 1
-        while f'line_{i}_comment' in postvars.keys():
-            if f'line_{i}_delete' in postvars.keys():
-                i += 1
-                continue
-            elif f'line_{i}_delete_after' in postvars.keys():
-                break 
-            elif f'line_{i}_add' in postvars.keys():
-                add_empty_line = j
-            account = postvars[f'line_{i}_account'][0]
-            amount = postvars[f'line_{i}_amount'][0]
-            currency = postvars[f'line_{i}_currency'][0]
-            comment = postvars[f'line_{i}_comment'][0]
-            i += 1
-            new_main = f'  {account}  {amount}'
-            if '' == new_main.rstrip() == comment.rstrip():  # don't write empty lines, ignore currency if nothing else set
-                continue
-            if len(amount.rstrip()) > 0:
-                new_main += f' {currency}'
-            j += 1
-            new_line = new_main
-            if comment.rstrip() != '':
-                new_line += f'  ; {comment}'
-            lines += [new_line]
-        if 'add_sink' in postvars.keys():
-            temp_lines = lines.copy() + ['_']
-            try:
-                temp_bookings, _ = parse_lines(temp_lines)
-                for currency in temp_bookings[0].sink:
-                    amount = temp_bookings[0].sink[currency]
-                    lines += [f'Assets  {amount:.2f} {currency}']
-            except HandledException:
-                pass
-        if 'add_taxes' in postvars.keys():
-            lines += db.add_taxes(lines, finish=False)
-        elif 'add_taxes2' in postvars.keys():
-            lines += db.add_taxes(lines, finish=True)
-        return lines, add_empty_line
-
-    def balance_as_html(self, db, until=None):
-        bookings = db.bookings[:until if until is None else int(until)]
-        lines = []
-        account_tree, account_sums = bookings_to_account_tree(bookings)
-        def print_subtree(lines, indent, node, subtree, path):
-            line = f"{indent}{node}"
-            n_tabs = 5 - (len(line) // 8)
-            line += n_tabs * "\t"
-            if "€" in account_sums[path + node].keys():
-                amount = account_sums[path + node]["€"]
-                line += f"{amount:9.2f} €\t"
-            else:
-                line += f"\t\t"
-            for currency, amount in account_sums[path + node].items():
-                if currency != '€' and amount > 0:
-                    line += f"{amount:5.2f} {currency}\t"
-            lines += [line]
-            indent += "  "
-            for k, v in sorted(subtree.items()):
-                print_subtree(lines, indent, k, v, path + node + ":")
-        for k, v in sorted(account_tree.items()):
-            print_subtree(lines, "", k, v, "")
-        content = "\n".join(lines)
-        return f"<pre>{content}</pre>"
-
-    def ledger_as_html(self, db):
+    def ledger_as_html(self):
+        booking_tmpl = jinja2.Template(booking_html)
         single_c_tmpl = jinja2.Template('<span class="comment">{{c|e}}</span><br />')  ##
         elements_to_write = []
         last_i = i = 0  ##
-        for nth, booking in enumerate(db.bookings):
+        for nth, booking in enumerate(self.bookings):
+            move_up = nth > 0 and self.bookings[nth - 1].date_string == booking.date_string
+            move_down = nth < len(self.bookings) - 1 and self.bookings[nth + 1].date_string == booking.date_string
             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 != '']  ##
+            elements_to_write += [single_c_tmpl.render(c=c) for c in self.comments[last_i:i] if c != '']  ##
             for booking_line in booking.lines[1:]:
                  i += 1  ##
-                 comment = db.comments[i]  ##
+                 comment = self.comments[i]  ##
                  if booking_line == '':
                      booking_lines += [{'acc': None, 'money': None, 'comment': comment}]  ##
                      continue
@@ -691,82 +536,78 @@ input[type=number] { text-align: right; font-family: monospace; }
                  if booking_line[1] is not None:
                      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(
+            elements_to_write += [booking_tmpl.render(
+                prefix=self.prefix,
                 nth=nth,
                 start=booking.start_line,
                 end=booking_end,
                 date=booking.date_string,
                 desc=booking.description,
-                head_comment=db.comments[booking.start_line],
+                head_comment=self.comments[booking.start_line],
+                move_up=move_up,
+                move_down=move_down,
                 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 self.comments[last_i:] if c != '']  #
         return '\n'.join(elements_to_write)
 
-    def add_free(self, db, start=0, end=0, copy=False):
-        tmpl = jinja2.Template(self.add_form_header + """<br />
-<textarea name="booking" rows=10 cols=80>
-{% for line in lines %}{{ line }}
-{% endfor %}
-</textarea>
-""" + self.add_form_footer)
-        lines = db.get_lines(start, end)
+    def balance_as_html(self, until=None):
+        bookings = self.bookings[:until if until is None else int(until)]
+        lines = []
+        account_tree, account_sums = bookings_to_account_tree(bookings)
+        def print_subtree(lines, indent, node, subtree, path):
+            line = f"{indent}{node}"
+            n_tabs = 5 - (len(line) // 8)
+            line += n_tabs * "\t"
+            if "€" in account_sums[path + node].keys():
+                amount = account_sums[path + node]["€"]
+                line += f"{amount:9.2f} €\t"
+            else:
+                line += f"\t\t"
+            for currency, amount in account_sums[path + node].items():
+                if currency != '€' and amount > 0:
+                    line += f"{amount:5.2f} {currency}\t"
+            lines += [line]
+            indent += "  "
+            for k, v in sorted(subtree.items()):
+                print_subtree(lines, indent, k, v, path + node + ":")
+        for k, v in sorted(account_tree.items()):
+            print_subtree(lines, "", k, v, "")
+        content = "\n".join(lines)
+        return f"<pre>{content}</pre>"
+
+    def add_free(self, start=0, end=0, copy=False):
+        tmpl = jinja2.Template(add_form_header + add_free_html + add_form_footer) 
+        lines = self.get_lines(start, end)
         if copy:
             start = end = 0
-        return tmpl.render(action='add_free', start=start, end=end, lines=lines)
+        return tmpl.render(action=self.prefix + '/add_free', 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(self.add_form_header + """
-<input type="submit" name="add_taxes" value="add taxes" />
-<input type="submit" name="add_taxes2" value="add taxes2" />
-<input type="submit" name="add_sink" value="add sink" />
-<br />
-<input name="date" value="{{date|e}}" size=9 />
-<input name="description" value="{{desc|e}}" list="descriptions" />
-<textarea name="line_0_comment" rows=1 cols=20>{{head_comment|e}}</textarea>
-<input type="submit" name="line_0_add" value="[+]" />
-<br />
-{% for line in booking_lines %}
-<input name="line_{{line.i}}_account" value="{{line.acc|e}}" size=40 list="accounts" />
-<input type="number" name="line_{{line.i}}_amount" step=0.01 value="{{line.amt}}" size=10 />
-<input name="line_{{line.i}}_currency" value="{{line.curr|e}}" size=3 list="currencies" />
-<input type="submit" name="line_{{line.i}}_delete" value="[x]" />
-<input type="submit" name="line_{{line.i}}_delete_after" value="[XX]" />
-<input type="submit" name="line_{{line.i}}_add" value="[+]" />
-<textarea name="line_{{line.i}}_comment" rows=1 cols={% if line.comm_cols %}{{line.comm_cols}}{% else %}20{% endif %}>{{line.comment|e}}</textarea>
-<br />
-{% endfor %}
-{% for name, items in datalist_sets.items() %}
-<datalist id="{{name}}">
-{% for item in items %}
-  <option value="{{item|e}}">{{item|e}}</option>
-{% endfor %}
-</datalist>
-{% endfor %}
-""" + self.add_form_footer)
-        lines = temp_lines if len(''.join(temp_lines)) > 0 else db.get_lines(start, end)
+    def add_structured(self, start=0, end=0, copy=False, temp_lines=[], add_empty_line=None):
+        tmpl = jinja2.Template(add_form_header + add_structured_html + add_form_footer) 
+        lines = temp_lines if len(''.join(temp_lines)) > 0 else self.get_lines(start, end)
         bookings, comments = parse_lines(lines, validate_bookings=False)
         if len(bookings) > 1:
-            raise HandledException('can only structurally edit single Booking')
+            raise PlomException('can only structurally edit single Booking')
         if add_empty_line is not None:
             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:]
-        action = 'add_structured'
+        action = self.prefix + '/add_structured'
         datalist_sets = {'descriptions': set(), 'accounts': set(), 'currencies': set()}
-        for b in db.bookings:
+        for b in self.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]
+        today = str(datetime.now())[:10]
         booking_lines = []
         if copy:
             start = end = 0
         desc = head_comment = ''
         if len(bookings) == 0:
-            for i in range(1, 3):
+            for i in range(1, 8):
                 booking_lines += [{'i': i, 'acc': '', 'amt': '', 'curr': '€', 'comment': ''}]
             date=today
         else:
@@ -799,13 +640,179 @@ input[type=number] { text-align: right; font-family: monospace; }
                 end=end)
         return content
 
+    def move_up(self, start, end):
+        prev_booking = None
+        for redir_nth, b in enumerate(self.bookings):
+            if b.start_line >= start:
+                break
+            prev_booking = b
+        start_at = prev_booking.start_line 
+        self.make_move(start, end, start_at)
+        return redir_nth - 1
+
+    def move_down(self, start, end):
+        next_booking = None
+        for redir_nth, b in enumerate(self.bookings):
+            if b.start_line > start:
+                next_booking = b
+                break
+        start_at = next_booking.start_line + len(next_booking.lines) - (end - start) + 1 
+        self.make_move(start, end, start_at)
+        return redir_nth
+
+    def make_move(self, start, end, start_at):
+        lines = self.get_lines(start, end)
+        total_lines = self.real_lines[:start] + self.real_lines[end:]
+        self.write_lines_in_total_lines_at(total_lines, start_at, lines)
+
+    def booking_lines_from_postvars(self, postvars):
+        add_empty_line = None
+        date = postvars['date'][0]
+        description = postvars['description'][0]
+        start_comment = postvars['line_0_comment'][0]
+        start_line = f'{date} {description}'
+        if start_comment.rstrip() != '':
+            start_line += f' ; {start_comment}' 
+        lines = [start_line]
+        if 'line_0_add' in postvars.keys():
+            add_empty_line = 0
+        i = j = 1
+        while f'line_{i}_comment' in postvars.keys():
+            if f'line_{i}_delete' in postvars.keys():
+                i += 1
+                continue
+            elif f'line_{i}_delete_after' in postvars.keys():
+                break 
+            elif f'line_{i}_add' in postvars.keys():
+                add_empty_line = j
+            account = postvars[f'line_{i}_account'][0]
+            amount = postvars[f'line_{i}_amount'][0]
+            currency = postvars[f'line_{i}_currency'][0]
+            comment = postvars[f'line_{i}_comment'][0]
+            i += 1
+            new_main = f'  {account}  {amount}'
+            if '' == new_main.rstrip() == comment.rstrip():  # don't write empty lines, ignore currency if nothing else set
+                continue
+            if len(amount.rstrip()) > 0:
+                new_main += f' {currency}'
+            j += 1
+            new_line = new_main
+            if comment.rstrip() != '':
+                new_line += f'  ; {comment}'
+            lines += [new_line]
+        if 'add_sink' in postvars.keys():
+            temp_lines = lines.copy() + ['_']
+            try:
+                temp_bookings, _ = parse_lines(temp_lines)
+                for currency in temp_bookings[0].sink:
+                    amount = temp_bookings[0].sink[currency]
+                    lines += [f'Assets  {amount:.2f} {currency}']
+            except PlomException:
+                pass
+        if 'add_taxes' in postvars.keys():
+            lines += self.add_taxes(lines, finish=False)
+        elif 'add_taxes2' in postvars.keys():
+            lines += self.add_taxes(lines, finish=True)
+        return lines, add_empty_line
+
+
+
+class LedgerHandler(PlomHandler):
+    
+    def app_init(self, handler):
+        default_path = '/ledger'
+        handler.add_route('GET', default_path, self.forward_gets) 
+        handler.add_route('POST', default_path, self.forward_posts) 
+        return 'ledger', default_path 
+
+    def do_POST(self):
+        self.try_do(self.forward_posts)
+
+    def forward_posts(self):
+        prefix = self.apps['ledger'] if hasattr(self, 'apps') else '' 
+        parsed_url = urlparse(self.path)
+        length = int(self.headers['content-length'])
+        postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1)
+        print("DEBUG", postvars['start'], postvars['end'])
+        start = int(postvars['start'][0])
+        end = int(postvars['end'][0])
+        db = LedgerDB(prefix)
+        add_empty_line = None
+        lines = []
+        # get inputs
+        if prefix + '/add_structured' == parsed_url.path and not 'revert' in postvars.keys():
+            lines, add_empty_line = db.booking_lines_from_postvars(postvars) 
+        elif prefix + '/add_free' == parsed_url.path and not 'revert' in postvars.keys():
+            lines = postvars['booking'][0].splitlines()
+        # validate where appropriate
+        if ('save' in postvars.keys()) or ('check' in postvars.keys()):
+            _, _ = parse_lines(lines)
+        # if saving, process where to and where to redirect after
+        if 'save' in postvars.keys():
+            last_date = str(datetime.now())[:10]
+            if len(db.bookings) > 0:
+                last_date = db.bookings[-1].date_string
+            target_date = last_date[:] 
+            first_line_tokens = lines[0].split() if len(lines) > 0 else ''
+            first_token = first_line_tokens[0] if len(first_line_tokens) > 0 else ''
+            try:
+                datetime.strptime(first_token, '%Y-%m-%d')
+                target_date = first_token
+            except ValueError:
+                 pass
+            if start == end == 0:
+                start = db.insert_at_date(lines, target_date)
+                nth = db.get_nth_for_booking_of_start_line(start) 
+            else:
+                new_start = db.update(start, end, lines, target_date)
+                nth = db.get_nth_for_booking_of_start_line(new_start)
+                if new_start > start: 
+                    nth -= 1 
+            self.redirect(prefix + f'/#{nth}')
+        # otherwise just re-build editing form
+        else:
+            if prefix + '/add_structured' == parsed_url.path: 
+                edit_content = db.add_structured(start, end, temp_lines=lines, add_empty_line=add_empty_line)
+            else:
+                edit_content = db.add_free(start, end)
+            header = jinja2.Template(html_head).render(prefix=prefix)
+            self.send_HTML(header + edit_content)
+
+    def do_GET(self):
+        self.try_do(self.forward_gets)
+
+    def forward_gets(self):
+        prefix = self.apps['ledger'] if hasattr(self, 'apps') else '' 
+        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 = LedgerDB(prefix=prefix)
+        if parsed_url.path == prefix + '/balance':
+            stop = params.get('stop', [None])[0]
+            page = db.balance_as_html(stop)
+        elif parsed_url.path == prefix + '/add_free':
+            page = db.add_free(start, end)
+        elif parsed_url.path == prefix + '/add_structured':
+            page = db.add_structured(start, end)
+        elif parsed_url.path == prefix + '/copy_free':
+            page = db.add_free(start, end, copy=True)
+        elif parsed_url.path == prefix + '/copy_structured':
+            page = db.add_structured(start, end, copy=True)
+        elif parsed_url.path == prefix + '/move_up':
+            nth = db.move_up(start, end)
+            self.redirect(prefix + f'/#{nth}')
+            return
+        elif parsed_url.path == prefix + '/move_down':
+            nth = db.move_down(start, end)
+            self.redirect(prefix + f'/#{nth}')
+            return
+        else:
+            page = db.ledger_as_html()
+        header = jinja2.Template(html_head).render(prefix=prefix)
+        self.send_HTML(header + page)
+
+
 
 if __name__ == "__main__":  
-    webServer = HTTPServer((hostName, serverPort), MyServer)
-    print(f"Server started http://{hostName}:{serverPort}")
-    try:
-        webServer.serve_forever()
-    except KeyboardInterrupt:
-        pass
-    webServer.server_close()
-    print("Server stopped.")
+    run_server(server_port, LedgerHandler)