For POST /day, do not default to a valid date if none provided.

[plomtask] / plomtask / http.py

diff --git a/plomtask/http.py b/plomtask/http.py
index 1af49d16b197bc607310f0f7c710b407b93e905b..794ce1f7139c85512b37238defba243d18f42c35 100644 (file)
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -1,59 +1,98 @@
-"""plom's task manager"""
+"""Web server stuff."""
 from http.server import BaseHTTPRequestHandler
 from http.server import HTTPServer
-from urllib.parse import urlparse
+from urllib.parse import urlparse, parse_qs
 from os.path import split as path_split
 from jinja2 import Environment as JinjaEnv, FileSystemLoader as JinjaFSLoader
 from plomtask.days import Day
 from plomtask.misc import HandledException
 from plomtask.db import DatabaseConnection
 
+TEMPLATES_DIR = 'templates'
+
 
 class TaskServer(HTTPServer):
     """Variant of HTTPServer that knows .jinja as Jinja Environment."""
 
-    def __init__(self, templates_dir, db_file, *args, **kwargs):
+    def __init__(self, db_file, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.db = db_file
-        self.jinja = JinjaEnv(loader=JinjaFSLoader(templates_dir))
+        self.jinja = JinjaEnv(loader=JinjaFSLoader(TEMPLATES_DIR))
 
 
 class TaskHandler(BaseHTTPRequestHandler):
     """Handles single HTTP request."""
     server: TaskServer
 
-    def send_html(self, html: str, code: int = 200):
-        """Send HTML as proper HTTP response."""
-        self.send_response(code)
-        self.end_headers()
-        self.wfile.write(bytes(html, 'utf-8'))
-
-    def send_msg(self, msg: str, code: int = 400):
-        """Send message in HTML formatting as HTTP response."""
-        html = self.server.jinja.get_template('msg.html').render(msg=msg)
-        self.send_html(html, code)
-
     def do_GET(self):
         """Handle any GET request."""
         try:
-            parsed_url = urlparse(self.path)
-            site = path_split(parsed_url.path)[1]
+            conn, site, params = self._init_handling()
             if 'calendar' == site:
-                html = self.do_GET_calendar()
+                html = self.do_GET_calendar(conn)
+            elif 'day' == site:
+                date = params.get('date', ['2024-01-01'])[0]
+                html = self.do_GET_day(conn, date)
             else:
                 raise HandledException('Test!')
-            self.send_html(html)
+            conn.commit()
+            conn.close()
+            self._send_html(html)
         except HandledException as error:
-            self.send_msg(error)
+            self._send_msg(error)
 
-    def do_GET_calendar(self):
-        """Show sorted Days."""
-        conn = DatabaseConnection(self.server.db)
-        Day('2024-01-03').save(conn)
-        Day('2024-01-01').save(conn)
-        Day('2024-01-02').save(conn)
-        days = Day.all(conn)
-        conn.commit()
-        conn.close()
+    def do_GET_calendar(self, conn: DatabaseConnection):
+        """Show Days."""
         return self.server.jinja.get_template('calendar.html').render(
-                days=days)
+                days=Day.all(conn))
+
+    def do_GET_day(self, conn: DatabaseConnection, date: str):
+        """Show single Day."""
+        day = Day.by_date(conn, date, create=True)
+        return self.server.jinja.get_template('day.html').render(day=day)
+
+    def do_POST(self):
+        """Handle any POST request."""
+        try:
+            conn, site, params = self._init_handling()
+            length = int(self.headers['content-length'])
+            postvars = parse_qs(self.rfile.read(length).decode(),
+                                keep_blank_values=1)
+            if 'day' == site:
+                date = params.get('date', [None])[0]
+                self.do_POST_day(conn, date, postvars)
+            conn.commit()
+            conn.close()
+            self._redirect('/')
+        except HandledException as error:
+            self._send_msg(error)
+
+    def do_POST_day(self, conn: DatabaseConnection, date: str, postvars: dict):
+        """Update or insert Day of date and fields defined in postvars."""
+        comment = postvars['comment'][0]
+        day = Day.by_date(conn, date, create=True)
+        day.comment = comment
+        day.save(conn)
+
+    def _init_handling(self):
+        conn = DatabaseConnection(self.server.db)
+        parsed_url = urlparse(self.path)
+        site = path_split(parsed_url.path)[1]
+        params = parse_qs(parsed_url.query)
+        return conn, site, params
+
+    def _redirect(self, target: str):
+        self.send_response(302)
+        self.send_header('Location', target)
+        self.end_headers()
+
+    def _send_html(self, html: str, code: int = 200):
+        """Send HTML as proper HTTP response."""
+        self.send_response(code)
+        self.end_headers()
+        self.wfile.write(bytes(html, 'utf-8'))
+
+    def _send_msg(self, msg: str, code: int = 400):
+        """Send message in HTML formatting as HTTP response."""
+        html = self.server.jinja.get_template('msg.html').render(msg=msg)
+        self._send_html(html, code)