X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/edit?a=blobdiff_plain;ds=sidebyside;f=ledger.py;h=0ef3d441a8714c36e910b92f1c8e0fcfcd2ea7ce;hb=fde1097e391b9ec0c261f1e91bd203232b3fbcb3;hp=c004d22126846415a916e02a6bc4aad6052df9bf;hpb=75169bb51854ec32d147976ac4381c6011c5320d;p=misc
diff --git a/ledger.py b/ledger.py
index c004d22..0ef3d44 100755
--- a/ledger.py
+++ b/ledger.py
@@ -1,16 +1,96 @@
-from http.server import BaseHTTPRequestHandler, HTTPServer
import os
-import html
import jinja2
import decimal
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/ledger2024.dat'
-class HandledException(Exception):
- pass
+html_head = """
+
+
+ledger
+balance
+add free
+add structured
+
+"""
+booking_html = """
+{{date}} {{desc}}
+[edit: structured
+/ free
+| copy:structured
+/ free
+| move {% if move_up %}up{% else %}up{% endif %}/{% if move_down %}down{% else %}down{% endif %}
+| balance after
+]
+
+{% for l in booking_lines %}
+{% if l.acc %}
+{{l.acc|e}} | {{l.money|e}} |
+{% else %}
+ |
+{% endif %}
+{% endfor %}
+
+"""
+add_form_header = """
+"""
+add_free_html = """
+
+"""
+add_structured_html = """
+
+
+
+
+
+
+
+
+
+
+
+
+
+{% for line in booking_lines %}
+
+
+
+
+
+
+
+
+{% endfor %}
+{% for name, items in datalist_sets.items() %}
+
+{% endfor %}
+"""
def apply_booking_to_account_balances(account_sums, account, currency, amount):
@@ -84,7 +164,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
@@ -110,21 +190,21 @@ def parse_lines(lines, validate_bookings=True):
try:
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] == ']':
@@ -140,10 +220,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
@@ -167,25 +247,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
@@ -211,7 +291,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:
@@ -220,14 +300,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 = {}
@@ -253,107 +333,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()
-
- # collect modification times of numbered .bak files
- bak_prefix = f'{self.db_file}.bak.'
- 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.fromtimestamp(mod_time))]
- i += 1
- bak_as = f'{bak_prefix}{i}'
-
- # collect what numbered .bak files to save: the older, the fewer; for each
- # timedelta, keep the newest file that's older
- ages_to_keep = [timedelta(minutes=4**i) for i in range(0, 8)]
- now = datetime.now()
- to_save = []
- for age in ages_to_keep:
- limit = now - age
- for i, date in enumerate(reversed(backup_dates)):
- if datetime.strptime(date, '%Y-%m-%d %H:%M:%S.%f') < limit:
- unreversed_i = len(backup_dates) - i - 1
- if unreversed_i not in to_save:
- to_save += [unreversed_i]
- break
-
- # 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
-
- # put 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)
+ if text[-1] != '\n':
+ text += '\n'
+ self.write_text_to_db(text)
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
+ start_at = 0
+ if len(self.bookings) > 0:
+ if date >= self.bookings[-1].date_string:
+ start_at = len(self.real_lines)
+ lines = [''] + lines
+ else:
+ for b in self.bookings:
+ if b.date_string == date:
+ start_at = b.start_line
+ elif b.date_string > date:
+ start_at = b.start_line
+ break
+ lines += [''] # DEBUG is new
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:]
+ remaining_lines = self.real_lines[:start] + self.real_lines[end:]
n_original_lines = end - start
- start_at = len(total_lines)
+ start_at = len(remaining_lines)
for b in self.bookings:
if b.date_string == date:
- if start_at == len(total_lines) or b.start_line == start:
+ if start_at == len(remaining_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):
+ # print("DEBUG update start_at", start_at, "len(remaining_lines)", len(remaining_lines), "len(self.real_lines)", len(self.real_lines), "end", end)
+ if start_at != 0 and end != len(self.real_lines) and start_at == len(remaining_lines):
+ # Add empty predecessor line if appending.
lines = [''] + lines
- return self.write_lines_in_total_lines_at(total_lines, start_at, lines)
+ return self.write_lines_in_total_lines_at(remaining_lines, start_at, lines)
def write_lines_in_total_lines_at(self, total_lines, start_at, lines):
- total_lines = total_lines[:start_at] + lines + [''] + total_lines[start_at:]
+ # total_lines = total_lines[:start_at] + lines + [''] + total_lines[start_at:]
+ total_lines = total_lines[:start_at] + lines + total_lines[start_at:]
_, _ = parse_lines(lines)
text = '\n'.join(total_lines)
self.write_db(text)
@@ -485,246 +524,29 @@ 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
+ def add_mirror(self, lines):
+ ret = []
+ bookings, _ = parse_lines(lines)
+ booking = bookings[0]
+ for line in booking.lines[1:]:
+ ret += [f'? {-line[1]} {line[2]}']
+ return ret
-class MyServer(BaseHTTPRequestHandler):
- header = """
-
-
-
-ledger
-balance
-add free
-add structured
-
-"""
- booking_tmpl = jinja2.Template("""
-{{date}} {{desc}}
-[edit: structured
-/ free
-| copy:structured
-/ free
-| move {% if move_up %}up{% else %}up{% endif %}/{% if move_down %}down{% else %}down{% endif %}
-| balance after
-]
-
-{% for l in booking_lines %}
-{% if l.acc %}
-{{l.acc|e}} | {{l.money|e}} |
-{% else %}
- |
-{% endif %}
-{% endfor %}
-
-""")
- add_form_header = """
-"""
- footer = "\n"
-
- 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():
- 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
- redir_url = f'/#{nth}'
- self.send_code_and_headers(302, [('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)
- elif parsed_url.path == '/move_up':
- nth = self.move_up(db, start, end)
- self.send_code_and_headers(302, [('Location', f'/#{nth}')])
- return
- elif parsed_url.path == '/move_down':
- nth = self.move_down(db, start, end)
- self.send_code_and_headers(302, [('Location', f'/#{nth}')])
- return
- 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"{content}
"
-
- def ledger_as_html(self, db):
+ def ledger_as_html(self):
+ booking_tmpl = jinja2.Template(booking_html)
single_c_tmpl = jinja2.Template('
') ##
elements_to_write = []
last_i = i = 0 ##
- for nth, booking in enumerate(db.bookings):
- move_up = nth > 0 and db.bookings[nth - 1].date_string == booking.date_string
- move_down = nth < len(db.bookings) - 1 and db.bookings[nth + 1].date_string == booking.date_string
+ 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
@@ -733,71 +555,65 @@ 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 + """
-
-""" + 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"{content}
"
+
+ 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 + """
-
-
-
-
-
-
-
-
-
-{% for line in booking_lines %}
-
-
-
-
-
-
-
-
-{% endfor %}
-{% for name, items in datalist_sets.items() %}
-
-{% 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)
@@ -810,15 +626,12 @@ input[type=number] { text-align: right; font-family: monospace; }
start = end = 0
desc = head_comment = ''
if len(bookings) == 0:
- for i in range(1, 3):
- 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)
for i in range(1, len(comments)):
account = amount = currency = ''
if i < len(booking.lines) and booking.lines[i] != '':
@@ -832,6 +645,8 @@ input[type=number] { text-align: right; font-family: monospace; }
'curr': currency if currency else 'â¬',
'comment': comments[i],
'comm_cols': len(comments[i])}]
+ for i in range(len(comments), len(comments) + 8):
+ booking_lines += [{'i': i, 'acc': '', 'amt': '', 'curr': 'â¬', 'comment': ''}]
content += tmpl.render(
action=action,
date=date,
@@ -843,38 +658,196 @@ input[type=number] { text-align: right; font-family: monospace; }
end=end)
return content
- def move_up(self, db, start, end):
+ def move_up(self, start, end):
prev_booking = None
- for redir_nth, b in enumerate(db.bookings):
+ 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(db, start, end, start_at)
+ self.make_move(start, end, start_at)
return redir_nth - 1
- def move_down(self, db, start, end):
+ def move_down(self, start, end):
next_booking = None
- for redir_nth, b in enumerate(db.bookings):
+ 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(db, start, end, start_at)
+ # start_at = next_booking.start_line + len(next_booking.lines) - (end - start) + 1
+ # self.make_move(start, end, start_at-1)
+ start_at = next_booking.start_line + len(next_booking.lines) - (end - start)
+ print("DEBUG", start, end, start_at)
+ self.make_move(start, end, start_at)
return redir_nth
- def make_move(self, db, start, end, start_at):
- lines = db.get_lines(start, end)
- total_lines = db.real_lines[:start] + db.real_lines[end:]
- db.write_lines_in_total_lines_at(total_lines, start_at, lines)
+ def make_move(self, start, end, start_at):
+ # FIXME currently broken due to changed self.write_lines_in_total_lines_at, easy fix would be lines += [""] maybe?
+ lines = self.get_lines(start, end)
+ if start == 0:
+ total_lines = self.real_lines[end+1:]
+ lines = [''] + lines
+ start_at += 1
+ else:
+ total_lines = self.real_lines[:start-1] + self.real_lines[end:] # -1 because we reduce the original position's two empty limit lines to one in-between line
+ lines += ['']
+ 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}']
+ lines += [f'Assets {amount} {currency}']
+ except PlomException:
+ pass
+ elif '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)
+ elif 'replace' in postvars.keys():
+ for i, line in enumerate(lines):
+ lines[i] = line.replace(postvars['replace_from'][0], postvars['replace_to'][0])
+ elif 'add_mirror' in postvars.keys():
+ lines += self.add_mirror(lines)
+ 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)
+ start = int(postvars['start'][0])
+ end = int(postvars['end'][0])
+ print("DEBUG start, end", start, end)
+ 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)
+ print("DEBUG save", new_start, start, end, lines)
+ 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)