home · contact · privacy
projects / misc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 957b289)
To ledger.py add structured next to free textarea editing of bookings.
authorChristian Heller <c.heller@plomlompom.de>
Mon, 16 Oct 2023 21:10:22 +0000 (23:10 +0200)
committerChristian Heller <c.heller@plomlompom.de>
Mon, 16 Oct 2023 21:10:22 +0000 (23:10 +0200)
ledger.py patch | blob | history

diff --git a/ledger.py b/ledger.py
index 9fa9f14a5ae7d1816175148d96b06de029d8346b..412c27d44b373e5aa9beeac82ec7e90b0d7b4a24 100755 (executable)
--- a/ledger.py
+++ b/ledger.py
@@ -1,7 +1,8 @@
 from http.server import BaseHTTPRequestHandler, HTTPServer
 import sys
 import os
 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
 
 hostName = "localhost"
 serverPort = 8082
 
@@ -75,6 +76,7 @@ def parse_lines(lines):
             except IndexError:
                 raise HandledException(f"{prefix} bad description: {description}")
             inside_booking = True
             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
             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
         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
             if line == '':
                 continue
             _, amount, currency = line
@@ -186,7 +188,7 @@ class Booking:
         account_changes = {}
         debt = {}
         sink_account = None
         account_changes = {}
         debt = {}
         sink_account = None
-        for line in self.lines:
+        for line in self.lines[1:]:
             if line == '':
                 continue
             account, amount, currency = line
             if line == '':
                 continue
             account, amount, currency = line
@@ -248,13 +250,31 @@ class Database:
 
 
 class MyServer(BaseHTTPRequestHandler):
 
 
 class MyServer(BaseHTTPRequestHandler):
-    header = '<html><meta charset="UTF-8"><body><a href="/ledger">ledger</a> <a href="/balance">balance</a> <a href="/add">add</a><hr />'
+    header = '<html><meta charset="UTF-8"><body><a href="/ledger">ledger</a> <a href="/balance">balance</a> <a href="/add_free">add free</a> <a href="/add_structured">add structured</a><hr />'
     footer = '</body><html>'
 
     def do_POST(self):
         length = int(self.headers['content-length'])
         postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1)
     footer = '</body><html>'
 
     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():
+                    continue
+                lines += [f'{new_main} ; {comment}'] 
+        elif '/add_free' == parsed_url.path:
+            lines = postvars['booking'][0].splitlines()
         start = int(postvars['start'][0])
         end = int(postvars['end'][0])
         try:
         start = int(postvars['start'][0])
         end = int(postvars['end'][0])
         try:
@@ -262,33 +282,37 @@ class MyServer(BaseHTTPRequestHandler):
             if start == end == 0:
                 db.append(lines)
             else:
             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.end_headers()
                 db.replace(start, end, lines)
             self.send_response(200)
             self.end_headers()
-            page = f"{self.header}Success!{self.footer}"
+            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()
             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}{e}{self.footer}'
             self.wfile.write(bytes(page, "utf-8"))
 
     def do_GET(self):
             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()
         self.send_response(200)
         self.send_header("Content-type", "text/html")
         self.end_headers()
         db = Database()
-        page = self.header + ''
         parsed_url = urlparse(self.path)
         parsed_url = urlparse(self.path)
+        page = self.header + ''
         if parsed_url.path == '/balance':
             page += self.balance_as_html(db)
         if parsed_url.path == '/balance':
             page += self.balance_as_html(db)
-        elif parsed_url.path == '/add':
+        elif parsed_url.path == '/add_free':
+            params = parse_qs(parsed_url.query)
+            start = int(params.get('start', ['0'])[0])
+            end = int(params.get('end', ['0'])[0])
+            page += self.add_free(db, start, end)
+        elif parsed_url.path == '/add_structured':
             params = parse_qs(parsed_url.query)
             start = int(params.get('start', ['0'])[0])
             end = int(params.get('end', ['0'])[0])
             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)
+            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
         else:
             page += self.ledger_as_html(db)
         page += self.footer
@@ -365,24 +389,61 @@ class MyServer(BaseHTTPRequestHandler):
             lines += [line + line_sep]
         for booking in db.bookings:
             i = booking.start_line
             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'<p>{booking.date_string} {booking.description}{suffix}'
             lines[i] = f'<p>{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}'
                 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'</p><a href="/add?start={booking.start_line}&end={i+1}">edit</a><br />'
+            lines[i] = lines[i][:-len(line_sep)] + f'</p>edit: <a href="/add_structured?start={booking.start_line}&end={i+1}">structured</a> / <a href="/add_free?start={booking.start_line}&end={i+1}">free</a><br />'
         return '\n'.join(lines)
 
         return '\n'.join(lines)
 
-    def add(self, db, start=0, end=0):
+    def add_free(self, db, start=0, end=0):
         if start == end == 0:
             content = ''
         else:
         if start == end == 0:
             content = ''
         else:
-            content = ''.join(db.real_lines[start:end])
-        return f'<form method="POST" action="/"><textarea name="booking" rows="8" cols="80">{content}</textarea><input type="hidden" name="start" value={start} /><input type="hidden" name="end" value={end} /><input type="submit"></form>'
+            content = html.escape(''.join(db.real_lines[start:end]))
+        return f'<form method="POST" action="/add_free"><textarea name="booking" rows="8" cols="80">{content}</textarea><input type="hidden" name="start" value={start} /><input type="hidden" name="end" value={end} /><input type="submit"></form>'
+
+    def add_structured(self, db, start=0, end=0, bonus_lines=10):
+        if start == end == 0:
+            lines = []
+        else:
+            lines= db.real_lines[start:end]
+        bookings, comments = parse_lines(lines) 
+        if len(bookings) > 1:
+            raise HandledException('can only edit single Booking')
+        input_lines = ''
+        if len(bookings) == 0:
+            input_lines += f'<input name="date" /> <input name="description" /> ; <input name="line_0_comment" /><br />'
+            comments = [''] 
+        else:
+            booking = bookings[0]
+            if booking.start_line != 0:
+                raise HandledException('need to start on first Booking line')
+            for i, comment in enumerate(comments):
+                if i == 0:
+                    safe_date_string = html.escape(booking.date_string)
+                    safe_description = html.escape(booking.description)
+                    safe_comment = html.escape(comment)
+                    input_lines += f'<input name="date" value="{safe_date_string}" /> <input name="description" value="{safe_description}" /> ; <input name="line_{i}_comment" value="{safe_comment}" /><br />'
+                    continue
+                safe_account = safe_amount = safe_currency = ''
+                safe_comment = html.escape(comment)
+                if i < len(booking.lines):
+                    main = booking.lines[i]
+                    if main != '':
+                        safe_account = html.escape(main[0]) 
+                        safe_amount = '' if main[1] is None else html.escape(str(main[1]))
+                        safe_currency = '' if main[2] is None else html.escape(main[2]) 
+                input_lines += f'<input name="line_{i}_account" value="{safe_account}" /> <input name="line_{i}_amount" value="{safe_amount}" /> <input name="line_{i}_currency" value="{safe_currency}" /> ; <input name="line_{i}_comment" value="{safe_comment}" /><br />'
+        for j in range(bonus_lines):
+            i = j + len(comments)
+            input_lines += f'<input name="line_{i}_account"/> <input name="line_{i}_amount"/> <input name="line_{i}_currency"/> ; <input name="line_{i}_comment" /><br />'
+        return f'<form method="POST" action="/add_structured">{input_lines}<input type="hidden" name="start" value={start} /><input type="hidden" name="end" value={end} /><input type="submit"></form>'
 
 
 db = Database()
 
 
 db = Database()
Unnamed repository; edit this file 'description' to name the repository.