X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=ledger.py;h=c004d22126846415a916e02a6bc4aad6052df9bf;hb=75169bb51854ec32d147976ac4381c6011c5320d;hp=2b2a80764104057ccf3e03ef62a29ecd291c15b1;hpb=fb98793f5731cb56c3122ce813ea85158040abed;p=misc diff --git a/ledger.py b/ledger.py index 2b2a807..c004d22 100755 --- a/ledger.py +++ b/ledger.py @@ -3,7 +3,7 @@ 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 @@ -67,7 +67,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 = [] @@ -109,7 +108,7 @@ 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}") if last_date > date_string: @@ -280,37 +279,34 @@ class Database: 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}.' + 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.datetime.fromtimestamp(mod_time))] + backup_dates += [str(datetime.fromtimestamp(mod_time))] i += 1 bak_as = f'{bak_prefix}{i}' - # collect what numbered .bak files to save + # 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 = [] - datetime_len = 19 - now = str(datetime.datetime.now())[:datetime_len] - while datetime_len > 2: - for i, date in reversed(list(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] + 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 reversed(to_save): + for i in to_save: if i != j: source = f'{bak_prefix}{i}' target = f'{bak_prefix}{j}' @@ -322,20 +318,54 @@ class Database: 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) - def replace(self, start, end, lines): - total_lines = self.real_lines[:start] + lines + self.real_lines[end:] + 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 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) + return start_at - def append(self, lines): - text = '\n\n' + '\n'.join(lines) + '\n\n' - self.write_db(text, 'a') + def get_nth_for_booking_of_start_line(self, start_line): + nth = 0 + for b in self.bookings: + if b.start_line >= start_line: + break + nth += 1 + return nth def add_taxes(self, lines, finish=False): ret = [] @@ -374,11 +404,11 @@ class Database: last_monthbreak_est = b.account_changes[acc_est]['€'] last_monthbreak_kk_minimum = b.account_changes[acc_kk_minimum]['€'] last_monthbreak_assets = b.account_changes[acc_buffer]['€'] - old_needed_income = last_monthbreak_assets + last_monthbreak_kk_add + last_monthbreak_kk_minimum + last_monthbreak_est + old_needed_income_before_anything = - last_monthbreak_assets - last_monthbreak_kk_add - last_monthbreak_kk_minimum - last_monthbreak_est if finish: - ret += [f' {acc_est} {-last_monthbreak_est}€ ; for old assumption of needed income: {old_needed_income}€'] + ret += [f' {acc_est} {-last_monthbreak_est}€ ; for old assumption of needed income: {old_needed_income_before_anything}€'] _, account_sums = bookings_to_account_tree(bookings) - expenses_so_far = -1 * account_sums[acc_assets]['€'] - old_needed_income + expenses_so_far = -1 * account_sums[acc_assets]['€'] + old_needed_income_before_anything needed_income_before_kk = expenses_so_far ESt_this_month = 0 left_over = needed_income_before_kk - ESt_this_month @@ -426,21 +456,33 @@ class Database: else: kk_factor = decimal.Decimal(0.197) kk_minimum_tax = decimal.Decimal(222.94).quantize(decimal.Decimal('0.00')) - kk_add = max(0, kk_factor * needed_income_before_kk - kk_minimum_tax) + kk_add_so_far = account_sums[acc_kk_add]['€'] if acc_kk_add in account_sums.keys() else 0 + kk_add = needed_income_before_kk / (1 - kk_factor) - needed_income_before_kk - kk_minimum_tax + hit_kk_minimum_income_limit = False + if kk_add_so_far + kk_add < 0: + hit_kk_minimum_income_limit = True + kk_add_uncorrect = kk_add + kk_add = -(kk_add + kk_add_so_far) kk_add = decimal.Decimal(kk_add).quantize(decimal.Decimal('0.00')) if finish: - ret += [f' {acc_kk_add} {-last_monthbreak_kk_add}€ ; max(0, {kk_factor:.3f} * {-(old_needed_income - last_monthbreak_est):.2f}€ - {kk_minimum_tax}€)'] + ret += [f' {acc_kk_add} {-last_monthbreak_kk_add}€ ; for old assumption of needed income'] else: ret += [f' {acc_kk_minimum} {kk_minimum_tax}€ ; assumed minimum income {kk_minimum_income:.2f}€ * {kk_factor:.3f}'] - ret += [f' {acc_kk_add} {kk_add}€ ; max(0, {kk_factor:.3f} * {needed_income_before_kk:.2f}€ - {kk_minimum_tax}€)'] + if hit_kk_minimum_income_limit: + ret += [f' {acc_kk_add} {kk_add}€ ; {needed_income_before_kk:.2f}€ / (1 - {kk_factor:.3f}) - {needed_income_before_kk:.2f}€ - {kk_minimum_tax}€ = {kk_add_uncorrect:.2f}€ would reduce current {acc_kk_dd} ({kk_add_so_far:.2f}€) below 0'] + else: + ret += [f' {acc_kk_add} {kk_add}€ ; {needed_income_before_kk:.2f}€ / (1 - {kk_factor:.3f}) - {needed_income_before_kk:.2f}€ - {kk_minimum_tax}€'] diff = - last_monthbreak_est + ESt_this_month - last_monthbreak_kk_add + kk_add if not finish: diff += kk_minimum_tax - final_minus = expenses_so_far + old_needed_income + diff + final_minus = expenses_so_far - old_needed_income_before_anything + diff ret += [f' {acc_assets} {-diff} €'] ret += [f' {acc_assets} {final_minus} €'] year_needed = buffer_expenses + final_minus + (12 - months_passed - 1) * final_minus - ret += [f' {acc_buffer} {-final_minus} € ; assume as to earn in year: {acc_buffer} + {12 - months_passed - 1} * this = {-year_needed}'] + if finish: + ret += [f' {acc_buffer} {-final_minus} €'] + else: + ret += [f' {acc_buffer} {-final_minus} € ; assume as to earn in year: {acc_buffer} + {12 - months_passed - 1} * this = {year_needed}'] return ret @@ -470,6 +512,7 @@ input[type=number] { text-align: right; font-family: monospace; } / free | copy:structured / free +| move {% if move_up %}up{% else %}up{% endif %}/{% if move_down %}down{% else %}down{% endif %} | balance after ] @@ -482,6 +525,10 @@ input[type=number] { text-align: right; font-family: monospace; } {% endfor %}

""") + add_form_header = """
+ + +""" add_form_footer = """ @@ -497,76 +544,47 @@ input[type=number] { text-align: right; font-family: monospace; } 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(): - date = postvars['date'][0] - description = postvars['description'][0] - start_comment = postvars['line_0_comment'][0] - lines = [f'{date} {description} ; {start_comment}'] - 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) - elif '/add_free' == parsed_url.path: + 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: - db.append(lines) - redir_url = f'/#last' + start = db.insert_at_date(lines, target_date) + nth = db.get_nth_for_booking_of_start_line(start) else: - db.replace(start, end, lines) - 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_HTML(page) + 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) @@ -589,6 +607,14 @@ input[type=number] { text-align: right; font-family: monospace; } 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 @@ -610,6 +636,56 @@ input[type=number] { text-align: right; font-family: monospace; } 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 = [] @@ -640,6 +716,8 @@ input[type=number] { text-align: right; font-family: monospace; } 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 booking_end = last_i = booking.start_line + len(booking.lines) booking_lines = [] i = booking.start_line ## @@ -662,13 +740,14 @@ input[type=number] { text-align: right; font-family: monospace; } date=booking.date_string, desc=booking.description, head_comment=db.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 != ''] # return '\n'.join(elements_to_write) def add_free(self, db, start=0, end=0, copy=False): - tmpl = jinja2.Template(""" - + tmpl = jinja2.Template(self.add_form_header + """