X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=e812471a9c8eb5bd0d0dccb6df1f5546ee16a20d;hb=5a1e4ec7d9671dd9aa40d05e2af0d7ab25ea8911;hp=afcaa116173145bb2ab5b2547937d5458d3e2666;hpb=9e32ae00d4435932d55695be4e757ff109c76f26;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index afcaa11..e812471 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): @@ -25,14 +27,13 @@ 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) + start = params.get('start', [''])[0] + end = params.get('end', [''])[0] + html = self.do_GET_calendar(conn, start, end) 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!') @@ -42,16 +43,51 @@ class TaskHandler(BaseHTTPRequestHandler): except HandledException as error: self._send_msg(error) - def do_GET_calendar(self, conn: DatabaseConnection): + def do_GET_calendar(self, conn: DatabaseConnection, start: str, end: str): """Show Days.""" return self.server.jinja.get_template('calendar.html').render( - days=Day.all(conn)) + days=Day.all(conn, date_range=(start, end)), + start=start, end=end) 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): + """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.""" + day = Day.by_date(conn, date, create=True) + day.comment = postvars['comment'][0] + 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)