X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=0af96e7538c2cefd9febd1ac55dedc6fd95f4f90;hb=736d41c2813776569a37805e4637a380290a1656;hp=8106d13c3c9f5c65b16dd1df12705543e183d46e;hpb=ab5a23f86261ef74b00fd77ff198275bac6b82fd;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 8106d13..0af96e7 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -4,18 +4,20 @@ from http.server import HTTPServer 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.days import Day, todays_date 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): @@ -29,7 +31,7 @@ class TaskHandler(BaseHTTPRequestHandler): if 'calendar' == site: html = self.do_GET_calendar(conn) elif 'day' == site: - date = params.get('date', ['2024-01-01'])[0] + date = params.get('date', [todays_date()])[0] html = self.do_GET_day(conn, date) else: raise HandledException('Test!') @@ -46,7 +48,7 @@ class TaskHandler(BaseHTTPRequestHandler): def do_GET_day(self, conn: DatabaseConnection, date: str): """Show single Day.""" - day = Day.by_date(conn, date) + day = Day.by_date(conn, date, create=True) return self.server.jinja.get_template('day.html').render(day=day) def do_POST(self): @@ -57,7 +59,7 @@ class TaskHandler(BaseHTTPRequestHandler): postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1) if 'day' == site: - date = params.get('date', ['2024-01-01'])[0] + date = params.get('date', [None])[0] self.do_POST_day(conn, date, postvars) conn.commit() conn.close()