Move TEMPLATES_DIR constant into web server module.

[plomtask] / plomtask / http.py

diff --git a/plomtask/http.py b/plomtask/http.py
index d9fa6a03194d1838fcf36f8cc860a4eab0baf6ac..01a949e019eddbf9919f333d252a05aeb7dcd4e7 100644 (file)
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -8,14 +8,16 @@ 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):
@@ -25,10 +27,7 @@ class TaskHandler(BaseHTTPRequestHandler):
     def do_GET(self):
         """Handle any GET request."""
         try:
-            conn = DatabaseConnection(self.server.db)
-            parsed_url = urlparse(self.path)
-            site = path_split(parsed_url.path)[1]
-            params = parse_qs(parsed_url.query)
+            conn, site, params = self._init_handling()
             if 'calendar' == site:
                 html = self.do_GET_calendar(conn)
             elif 'day' == site:
@@ -55,10 +54,7 @@ class TaskHandler(BaseHTTPRequestHandler):
     def do_POST(self):
         """Handle any POST request."""
         try:
-            conn = DatabaseConnection(self.server.db)
-            parsed_url = urlparse(self.path)
-            site = path_split(parsed_url.path)[1]
-            params = parse_qs(parsed_url.query)
+            conn, site, params = self._init_handling()
             length = int(self.headers['content-length'])
             postvars = parse_qs(self.rfile.read(length).decode(),
                                 keep_blank_values=1)
@@ -74,13 +70,17 @@ class TaskHandler(BaseHTTPRequestHandler):
     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)
-        if day:
-            day.comment = comment
-        else:
-            day = Day(date, comment)
+        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)