X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/%7B%7Bdb.prefix%7D%7D/day?a=blobdiff_plain;f=ledger.py;h=276b1cc87a07d5dd4b30323871736886405e217c;hb=a628dc4404bec729a4989c7d2198eac474d667c1;hp=9fa9f14a5ae7d1816175148d96b06de029d8346b;hpb=957b289c36c522e19916ef474f14a70caeab0c17;p=misc
diff --git a/ledger.py b/ledger.py
index 9fa9f14..276b1cc 100755
--- a/ledger.py
+++ b/ledger.py
@@ -1,7 +1,8 @@
from http.server import BaseHTTPRequestHandler, HTTPServer
import sys
import os
-from urllib.parse import parse_qs
+import html
+from urllib.parse import parse_qs, urlparse
hostName = "localhost"
serverPort = 8082
@@ -75,6 +76,7 @@ def parse_lines(lines):
except IndexError:
raise HandledException(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
@@ -158,7 +160,7 @@ class Booking:
prefix = f"booking at line {self.start_line}"
sums = {}
empty_values = 0
- for line in self.lines:
+ for line in self.lines[1:]:
if line == '':
continue
_, amount, currency = line
@@ -186,7 +188,7 @@ class Booking:
account_changes = {}
debt = {}
sink_account = None
- for line in self.lines:
+ for line in self.lines[1:]:
if line == '':
continue
account, amount, currency = line
@@ -221,6 +223,9 @@ class Database:
self.bookings += ret[0]
self.comments += ret[1]
+ def get_lines(self, start, end):
+ return db.real_lines[start:end]
+
def replace(self, start, end, lines):
import shutil
if os.path.exists(self.lock_file):
@@ -248,13 +253,41 @@ class Database:
class MyServer(BaseHTTPRequestHandler):
- header = '
ledger balance add '
- footer = ''
+ header = """
+
+
+ledger
+balance
+add free
+add structured
+
+"""
+ footer = "\n"
def do_POST(self):
length = int(self.headers['content-length'])
postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1)
- lines = postvars['booking'][0].splitlines()
+ parsed_url = urlparse(self.path)
+ if '/add_structured' == parsed_url.path:
+ n_lines = int(len(postvars) / 4)
+ date = postvars['date'][0]
+ description = postvars['description'][0]
+ start_comment = postvars['line_0_comment'][0]
+ lines = [f'{date} {description} ; {start_comment}']
+ for i in range(1, n_lines):
+ 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]
+ new_main = f'{account} {amount} {currency}'
+ if '' == new_main.rstrip() == comment.rstrip(): # don't write empty lines
+ continue
+ new_line = new_main
+ if comment.rstrip() != '':
+ new_line += f' ; {comment}'
+ lines += [new_line]
+ elif '/add_free' == parsed_url.path:
+ lines = postvars['booking'][0].splitlines()
start = int(postvars['start'][0])
end = int(postvars['end'][0])
try:
@@ -262,33 +295,33 @@ class MyServer(BaseHTTPRequestHandler):
if start == end == 0:
db.append(lines)
else:
- # raise HandledException(f'would write from {start} to {end}')
db.replace(start, end, lines)
- self.send_response(200)
+ self.send_response(301)
+ self.send_header('Location', '/')
self.end_headers()
- page = f"{self.header}Success!{self.footer}"
- self.wfile.write(bytes(page, "utf-8"))
except HandledException as e:
self.send_response(400)
self.end_headers()
- page = f"{self.header}{e}{self.footer}"
+ page = f'{self.header}ERROR: {e}{self.footer}'
self.wfile.write(bytes(page, "utf-8"))
def do_GET(self):
- from urllib.parse import urlparse
self.send_response(200)
self.send_header("Content-type", "text/html")
self.end_headers()
db = Database()
- page = self.header + ''
parsed_url = urlparse(self.path)
+ page = self.header + ''
+ params = parse_qs(parsed_url.query)
+ start = int(params.get('start', ['0'])[0])
+ end = int(params.get('end', ['0'])[0])
if parsed_url.path == '/balance':
page += self.balance_as_html(db)
- elif parsed_url.path == '/add':
- params = parse_qs(parsed_url.query)
- start = int(params.get('start', ['0'])[0])
- end = int(params.get('end', ['0'])[0])
- page += self.add(db, start, end)
+ elif parsed_url.path == '/add_free':
+ page += self.add_free(db, start, end)
+ elif parsed_url.path == '/add_structured':
+ bonus_lines = int(params.get('bonus_lines', ['0'])[0])
+ page += self.add_structured(db, start, end)
else:
page += self.ledger_as_html(db)
page += self.footer
@@ -361,28 +394,71 @@ class MyServer(BaseHTTPRequestHandler):
lines = []
line_sep = ' '
for comment in db.comments:
- line = f'; {comment}' if comment != '' else ''
+ line = f' ; {comment}' if comment != '' else ''
lines += [line + line_sep]
for booking in db.bookings:
i = booking.start_line
- suffix = lines[i] # f" {lines[i]}" if len(lines[i]) > 0 else ""
+ suffix = lines[i]
lines[i] = f'{booking.date_string} {booking.description}{suffix}'
- for booking_line in booking.lines:
+ for booking_line in booking.lines[1:]:
i += 1
if booking_line == '':
continue
suffix = f' {lines[i]}' if len(lines[i]) > 0 else ''
value = f' {booking_line[1]} {booking_line[2]}' if booking_line[1] else ''
lines[i] = f'{booking_line[0]}{value}{suffix}'
- lines[i] = lines[i][:-len(line_sep)] + f'
edit '
+ lines[i] = lines[i][:-len(line_sep)] + f"""
+edit:
+structured
+/ free
+ """
return '\n'.join(lines)
- def add(self, db, start=0, end=0):
- if start == end == 0:
- content = ''
+ def header_add_form(self, action):
+ return f""""
+
+ def add_free(self, db, start=0, end=0):
+ content = html.escape(''.join(db.get_lines(start, end)))
+ return f'{self.header_add_form("add_free")}{self.footer_add_form(start, end)}'
+
+ def add_structured(self, db, start=0, end=0, bonus_lines=10):
+ import datetime
+ lines = db.get_lines(start, end)
+ bookings, comments = parse_lines(lines)
+ if len(bookings) > 1:
+ raise HandledException('can only edit single Booking')
+ input_lines = ''
+ last_line = 0
+ def inpu(name, val=""):
+ val = val if val is not None else ""
+ safe_val = html.escape(str(val))
+ return f' '
+ if len(bookings) == 0:
+ today = str(datetime.datetime.now())[:10]
+ input_lines += f'{inpu("date", today)} {inpu("description")} ; {inpu("line_0_comment")} '
+ last_line = 1
else:
- content = ''.join(db.real_lines[start:end])
- return f''
+ booking = bookings[0]
+ last_line = len(comments)
+ input_lines += f'{inpu("date", booking.date_string)} {inpu("description", booking.description)} ; {inpu("line_0_comment", comments[0])} '
+ 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)} {inpu(f"line_{i}_amount", amount)} {inpu(f"line_{i}_currency", currency)} ; {inpu(f"line_{i}_comment", comments[i])} '
+ for j in range(bonus_lines):
+ i = j + last_line
+ input_lines += f'{inpu(f"line_{i}_account")} {inpu(f"line_{i}_amount")} {inpu(f"line_{i}_currency")} ; {inpu(f"line_{i}_comment")} '
+ return f'{self.header_add_form("add_structured")}{input_lines}{self.footer_add_form(start, end)}'
db = Database()