Add Jinja2 to ledger.py.

diff --git a/ledger.py b/ledger.py
index 80ca0f63a422b2b907add4c3e1d00f0b5970d8f5..2a9a89c3f494cedd2472d34dcd6a251e47740405 100755 (executable)
--- a/ledger.py
+++ b/ledger.py
@@ -2,6 +2,7 @@ from http.server import BaseHTTPRequestHandler, HTTPServer
 import sys
 import os
 import html
 import sys
 import os
 import html

+import jinja2 

 from urllib.parse import parse_qs, urlparse
 hostName = "localhost"
 serverPort = 8082
 from urllib.parse import parse_qs, urlparse
 hostName = "localhost"
 serverPort = 8082


@@ -244,6 +245,7 @@ def parse_lines(lines):
         raise HandledException(f"{prefix} last booking unfinished")
     return bookings, comments
 
         raise HandledException(f"{prefix} last booking unfinished")
     return bookings, comments
 

+

 class Booking:
 
     def __init__(self, date_string, description, booking_lines, start_line):
 class Booking:
 
     def __init__(self, date_string, description, booking_lines, start_line):


@@ -316,7 +318,7 @@ class Database:
         self.real_lines = []
         if os.path.exists(self.db_file):
             with open(self.db_file, "r") as f:
         self.real_lines = []
         if os.path.exists(self.db_file):
             with open(self.db_file, "r") as f:

-                self.real_lines += f.readlines()
+                self.real_lines += [l.rstrip() for l in f.readlines()]

         ret = parse_lines(self.real_lines)
         self.bookings += ret[0]
         self.comments += ret[1]
         ret = parse_lines(self.real_lines)
         self.bookings += ret[0]
         self.comments += ret[1]


@@ -332,7 +334,9 @@ class Database:
             shutil.copy(self.db_file, self.db_file + ".bak")
         f = open(self.lock_file, 'w+')
         f.close()
             shutil.copy(self.db_file, self.db_file + ".bak")
         f = open(self.lock_file, 'w+')
         f.close()

-        text = ''.join(self.real_lines[:start]) + '\n'.join(lines) + ''.join(self.real_lines[end:])
+        total_lines = self.real_lines[:start] + lines + self.real_lines[end:]
+        text = '\n'.join(total_lines)
+        # text = '\n'.join(self.real_lines[:start]) + '\n'.join(lines) + '\n'.join(self.real_lines[end:])

         with open(self.db_file, 'w') as f:
             f.write(text);
         os.remove(self.lock_file)
         with open(self.db_file, 'w') as f:
             f.write(text);
         os.remove(self.lock_file)


@@ -346,7 +350,7 @@ class Database:
         f = open(self.lock_file, 'w+')
         f.close()
         with open(self.db_file, 'a') as f:
         f = open(self.lock_file, 'w+')
         f.close()
         with open(self.db_file, 'a') as f:

-            f.write('\n' + '\n'.join(lines) + '\n');
+            f.write('\n\n' + '\n'.join(lines) + '\n\n');

         os.remove(self.lock_file)
 
 
         os.remove(self.lock_file)
 
 


@@ -446,7 +450,6 @@ input[type=number] { text-align: right; font-family: monospace; }
         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])

-        # bonus_lines = int(params.get('bonus_lines', ['0'])[0])

         if parsed_url.path == '/balance':
             page += self.balance_as_html(db)
         elif parsed_url.path == '/add_free':
         if parsed_url.path == '/balance':
             page += self.balance_as_html(db)
         elif parsed_url.path == '/add_free':


@@ -487,57 +490,100 @@ input[type=number] { text-align: right; font-family: monospace; }
         return f"<pre>{content}</pre>"
 
     def ledger_as_html(self, db):
         return f"<pre>{content}</pre>"
 
     def ledger_as_html(self, db):

-        lines = []
-        for comment in db.comments:
-            lines += [f'<span class="comment">{comment}</span>' if comment != '' else '']
+        single_c_tmpl = jinja2.Template('<span class="comment">{{c}}</span><br />')
+        booking_tmpl = jinja2.Template("""
+<p>{{date}} {{desc}} <span class="comment">{{head_comment}}</span>
+[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>]
+<table>
+{% for l in booking_lines %}
+{% if l.acc %}
+<tr><td>{{l.acc}}</td><td class="money">{{l.money}}</td><td class="comment">{{l.comment}}</td></tr>
+{% else %}
+<tr><td><div class="comment full_line_comment">{{l.comment}}</div></td></tr>
+{% endif %}
+{% endfor %}
+</table></p>
+""")
+        elements_to_write = []
+        last_i = i = 0

         for booking in db.bookings:
             i = booking.start_line
         for booking in db.bookings:
             i = booking.start_line

-            booking_end = booking.start_line + len(booking.lines)
-            lines[i] = f"""<p>{booking.date_string} {booking.description} {lines[i]}
-[edit: <a href="/add_structured?start={booking.start_line}&end={booking_end}">structured</a> 
-/ <a href="/add_free?start={booking.start_line}&end={booking_end}">free</a> 
-| copy:<a href="/copy_structured?start={booking.start_line}&end={booking_end}">structured</a>
-/ <a href="/copy_free?start={booking.start_line}&end={booking_end}">free</a>]
-<table>"""
+            elements_to_write += [single_c_tmpl.render(c=c) for c in db.comments[last_i:i] if c != '']
+            booking_end = last_i = booking.start_line + len(booking.lines)
+            booking_lines = []

             for booking_line in booking.lines[1:]:
                 i += 1
             for booking_line in booking.lines[1:]:
                 i += 1

+                comment = db.comments[i] 

                 if booking_line == '':
                 if booking_line == '':

-                    lines[i] = f'<tr><td><div class="full_line_comment">{lines[i]}</div></td></tr>'
+                    booking_lines += [{'acc': None, 'money': None, 'comment': comment}]

                     continue
                     continue

-                comment = f' {lines[i]}' if len(lines[i]) > 0 else ''

                 money = ''
                 if booking_line[1]:
                     money = f'{booking_line[1]} {booking_line[2]}'
                 account = booking_line[0] 
                 money = ''
                 if booking_line[1]:
                     money = f'{booking_line[1]} {booking_line[2]}'
                 account = booking_line[0] 

-                lines[i] = f'<tr><td>{booking_line[0]}</td><td class="money">{money}</td><td>{comment}</td></tr>'
-            lines[i] = lines[i] + "\n" + '</table></p>'
-        return '\n'.join(lines)
-
-    def header_add_form(self, action):
-        return f"<form method=\"POST\" action=\"/{action}\">\n"
-
-    def footer_add_form(self, start, end, copy):
-        if copy:
-            start = end = 0
-        return f"""
-<input type="hidden" name="start" value={start} />
-<input type="hidden" name="end" value={end} />
-<input type="submit" name="save" value="save!">
-</form>"""
-
-    def textarea(self, name, lines, min_rows=1, min_cols=20):
-        safe_content = html.escape(''.join(lines))
-        n_rows = max(min_rows, len(lines))
-        n_cols = min_cols
-        for line in lines:
-            n_cols = len(line) if len(line) > n_cols else n_cols 
-        return f'<textarea name="{name}" rows={n_rows} cols={n_cols}>{safe_content}</textarea>'
+                booking_lines += [{'acc': booking_line[0], 'money':money, 'comment':comment}] 
+            elements_to_write += [booking_tmpl.render(
+                start=booking.start_line,
+                end=booking_end,
+                date=booking.date_string,
+                desc=booking.description,
+                head_comment=db.comments[booking.start_line],
+                booking_lines = booking_lines)]
+        return '\n'.join(elements_to_write) 

 
     def add_free(self, db, start=0, end=0, copy=False):
 
     def add_free(self, db, start=0, end=0, copy=False):

+        tmpl = jinja2.Template("""
+<form method="POST" action="{{action}}">
+<textarea name="booking" rows=10 cols=80>
+{% for line in lines %}{{ line }}
+{% endfor %}
+</textarea>
+<input type="hidden" name="start" value={{start}} />
+<input type="hidden" name="end" value={{end}} />
+<input type="submit" name="save" value="save!">
+</form>
+""")

         lines = db.get_lines(start, end)
         lines = db.get_lines(start, end)

-        return f'{self.header_add_form("add_free")}{self.textarea("booking",lines,10,80)}{self.footer_add_form(start, end, copy)}'
+        if copy:
+            start = end = 0
+        return tmpl.render(start=start, end=end, lines=lines) 

 
     def add_structured(self, db, start=0, end=0, copy=False, temp_lines=[], add_empty_line=None):
 
     def add_structured(self, db, start=0, end=0, copy=False, temp_lines=[], add_empty_line=None):

+        tmpl = jinja2.Template("""
+<form method="POST" action="{{action}}">
+<input type="submit" name="check" value="check" />
+<input type="submit" name="revert" value="revert" />
+<input type="submit" name="add_taxes" value="add taxes" />
+<br />
+<input name="date" value="{{date}}" size=9 />
+<input name="description" value="{{desc}}" list="descriptions" />
+<textarea name="line_0_comment" rows=1 cols=20>{{head_comment}}</textarea>
+<input type="submit" name="line_0_add" value="[+]" />
+<br />
+{% for line in booking_lines %}
+<input name="line_{{line.i}}_account" value="{{line.acc}}" size=40 list="accounts" />
+<input type="number" name="line_{{line.i}}_amount" value="{{line.amt}}" size=10 />
+<input name="line_{{line.i}}_currency" value="{{line.curr}}" size=3 list="currencies" />
+<textarea name="line_{{line.i}}_comment" rows=1 cols={% if line.comm_cols %}{{line.comm_cols}}{% else %}20{% endif %}>{{line.comment}}</textarea>
+<input type="submit" name="line_{{line.i}}_delete" value="[x]" />
+<input type="submit" name="line_{{line.i}}_add" value="[+]" />
+<br />
+{% endfor %}
+{% for name, items in datalist_sets.items() %}
+<datalist id="{{name}}">
+{% for item in items %}
+  <option value="{{item}}">{{item}}</option>
+{% endfor %}
+</datalist>
+{% endfor %}
+<input type="hidden" name="start" value={{start}} />
+<input type="hidden" name="end" value={{end}} />
+<input type="submit" name="save" value="save!">
+</form>
+""")

         import datetime
         lines = temp_lines if len(''.join(temp_lines)) > 0 else db.get_lines(start, end)
         bookings, comments = parse_lines(lines)
         import datetime
         lines = temp_lines if len(''.join(temp_lines)) > 0 else db.get_lines(start, end)
         bookings, comments = parse_lines(lines)


@@ -547,51 +593,53 @@ input[type=number] { text-align: right; font-family: monospace; }
             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:] 
             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:] 

-        def inpu(name, val="", datalist="", input_type='text', size=-1):
-            val = val if val is not None else ""
-            safe_val = html.escape(str(val))
-            datalist_string = '' if datalist == '' else f'list="{datalist}"'
-            number_step = '' if input_type != 'number' else ' step=0.01'
-            size_string = '' if size < 0 else f' size={size}' 
-            return f'<input type="{input_type}"{number_step} name="{name}"{size_string} value="{safe_val}" {datalist_string}/>'
-        input_lines = inpu('check', 'check', '', 'submit') +\
-                inpu('revert', 'revert', '', 'submit') +\
-                inpu('add_taxes', 'add taxes', '', 'submit') +\
-                '<br />'
+        action = 'add_structured'
+        datalist_sets = {'descriptions': set(), 'accounts': set(), 'currencies': set()}
+        for b in db.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.datetime.now())[:10]

+        booking_lines = []
+        if copy:
+            start = end = 0
+        desc = head_comment = ''

         if len(bookings) == 0:
         if len(bookings) == 0:

-            input_lines += f'{inpu("date", today, size=9)} {inpu("description", "", "descriptions")} ; {inpu("line_0_comment")} {inpu(f"line_0_add", "[+]", "", "submit")}<br />'

             for i in range(1, 3):
             for i in range(1, 3):

-                input_lines += f'{inpu(f"line_{i}_account", "", "accounts", size=40)} {inpu(f"line_{i}_amount", "", "", "number", size=10)} {inpu(f"line_{i}_currency", "", "currencies", size=3)} ; {self.textarea(f"line_{i}_comment", "")} {inpu(f"line_{i}_delete", "[x]", "", "submit")} {inpu(f"line_{i}_add", "[+]", "", "submit")}<br />'
+                booking_lines += [{'i': i, 'acc': '', 'amt': '', 'curr': '', 'comment': ''}]
+            date=today 

         else:
             booking = bookings[0]
         else:
             booking = bookings[0]

+            desc = booking.description
+            date = today if copy else booking.date_string
+            head_comment=comments[0]

             last_line = len(comments)
             last_line = len(comments)

-            date_string = today if copy else booking.date_string
-            input_lines += f'{inpu("date", date_string, size=9)} {inpu("description", booking.description, "descriptions")} ; {self.textarea("line_0_comment", [comments[0]])} {inpu(f"line_0_add", "[+]", "", "submit")}<br />'

             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]
             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, "accounts", size=40)} {inpu(f"line_{i}_amount", amount, "", "number", size=10)} {inpu(f"line_{i}_currency", currency, "currencies", size=3)} ; {self.textarea(f"line_{i}_comment", [comments[i]])} {inpu(f"line_{i}_delete", "[x]", "", "submit")} {inpu(f"line_{i}_add", "[+]", "", "submit")}<br />'
-        datalist_sets = {'descriptions': set(), 'accounts': set(), 'currencies': set()}
-        for b in db.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)
-        def build_datalist(name):
-            datalist = f'<datalist id="{name}">' + "\n"
-            for item in datalist_sets[name]:
-                safe_item = html.escape(item)
-                datalist += f'<option value="{safe_item}">{safe_item}</option>' + "\n"
-            return f"{datalist}</datalist>\n"
-        datalists = build_datalist('descriptions')
-        datalists += build_datalist('accounts')
-        datalists += build_datalist('currencies')
-        return f'{self.header_add_form("add_structured")}{input_lines}{datalists}{self.footer_add_form(start, end, copy)}'
+                booking_lines += [{
+                        'i': i, 
+                        'acc': account,
+                        'amt': amount, 
+                        'curr': currency if currency else '',
+                        'comment': comments[i],
+                        'comm_cols': len(comments[i])}]
+        content += tmpl.render(
+                action=action, 
+                date=date,
+                desc=desc,
+                head_comment=head_comment, 
+                booking_lines=booking_lines,
+                datalist_sets=datalist_sets,
+                start=start,
+                end=end) 
+        return content 

 
 
 if __name__ == "__main__":    
 
 
 if __name__ == "__main__":