X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=f368232acd33dcc268ca296e69e0d34748f6fa2a;hb=b96a5c72c2decc56ca1706e4929e2e58e4b7b156;hp=86db94d34ee5ea13630a3d550e9b9116cbfb1e48;hpb=2d743a08bdfa5c89831752a109a7afec3d44872d;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 86db94d..f368232 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -24,7 +24,7 @@ class TaskServer(HTTPServer): self.jinja = JinjaEnv(loader=JinjaFSLoader(TEMPLATES_DIR)) -class ParamsParser: # pylint: disable=too-few-public-methods +class ParamsParser: """Wrapper for validating and retrieving GET params.""" def __init__(self, params: dict[str, list[str]]) -> None: @@ -32,19 +32,20 @@ class ParamsParser: # pylint: disable=too-few-public-methods def get_str(self, key: str, default: str = '') -> str: """Retrieve string value of key from self.params.""" - if key not in self.params: + if key not in self.params or 0 == len(self.params[key]): return default return self.params[key][0] def get_int_or_none(self, key: str) -> int | None: - """Retrieve int value of key yfrom self.params, on fail return None.""" - if key not in self.params or not self.params[key]: + """Retrieve int value of key from self.params, on empty return None.""" + if key not in self.params or \ + 0 == len(''.join(list(self.params[key]))): return None - val = self.params[key][0] + val_str = self.params[key][0] try: - return int(val) + return int(val_str) except ValueError as e: - raise BadFormatException(f'Bad ?{key}= value: {val}') from e + raise BadFormatException(f'Bad ?{key}= value: {val_str}') from e class PostvarsParser: @@ -55,9 +56,19 @@ class PostvarsParser: def get_str(self, key: str) -> str: """Retrieve string value of key from self.postvars.""" - if key not in self.postvars: - raise BadFormatException(f'missing value for form field: {key}') - return self.postvars[key][0] + all_str = self.get_all_str(key) + if 0 == len(all_str): + raise BadFormatException(f'missing value for key: {key}') + return all_str[0] + + def get_int(self, key: str) -> int: + """Retrieve int value of key from self.postvars.""" + val = self.get_str(key) + try: + return int(val) + except ValueError as e: + msg = f'cannot int form field value: {val}' + raise BadFormatException(msg) from e def get_float(self, key: str) -> float: """Retrieve float value of key from self.postvars.""" @@ -68,6 +79,21 @@ class PostvarsParser: msg = f'cannot float form field value: {val}' raise BadFormatException(msg) from e + def get_all_str(self, key: str) -> list[str]: + """Retrieve list of string values at key from self.postvars.""" + if key not in self.postvars: + return [] + return self.postvars[key] + + def get_all_int(self, key: str) -> list[int]: + """Retrieve list of int values at key from self.postvars.""" + all_str = self.get_all_str(key) + try: + return [int(s) for s in all_str if len(s) > 0] + except ValueError as e: + msg = f'cannot int a form field value: {all_str}' + raise BadFormatException(msg) from e + class TaskHandler(BaseHTTPRequestHandler): """Handles single HTTP request.""" @@ -84,10 +110,11 @@ class TaskHandler(BaseHTTPRequestHandler): return else: raise NotFoundException(f'Unknown page: /{site}') - conn.close() self._send_html(html) except HandledException as error: self._send_msg(error, code=error.http_code) + finally: + conn.close() def do_GET_calendar(self, conn: DatabaseConnection, params: ParamsParser) -> str: @@ -109,8 +136,10 @@ class TaskHandler(BaseHTTPRequestHandler): params: ParamsParser) -> str: """Show process of ?id=.""" id_ = params.get_int_or_none('id') + process = Process.by_id(conn, id_, create=True) return self.server.jinja.get_template('process.html').render( - process=Process.by_id(conn, id_, create=True)) + process=process, children=process.get_descendants(conn), + candidates=Process.all(conn)) def do_GET_processes(self, conn: DatabaseConnection, _: ParamsParser) -> str: @@ -124,15 +153,19 @@ class TaskHandler(BaseHTTPRequestHandler): conn, site, params = self._init_handling() length = int(self.headers['content-length']) postvars = parse_qs(self.rfile.read(length).decode(), - keep_blank_values=True) + keep_blank_values=True, strict_parsing=True) form_data = PostvarsParser(postvars) if site in ('day', 'process'): getattr(self, f'do_POST_{site}')(conn, params, form_data) - conn.commit() - conn.close() + conn.commit() + else: + msg = f'Page not known as POST target: /{site}' + raise NotFoundException(msg) self._redirect('/') except HandledException as error: self._send_msg(error, code=error.http_code) + finally: + conn.close() def do_POST_day(self, conn: DatabaseConnection, params: ParamsParser, form_data: PostvarsParser) -> None: @@ -144,19 +177,20 @@ class TaskHandler(BaseHTTPRequestHandler): def do_POST_process(self, conn: DatabaseConnection, params: ParamsParser, form_data: PostvarsParser) -> None: - """Update or insert Process of id_ and fields defined in postvars.""" + """Update or insert Process of ?id= and fields defined in postvars.""" id_ = params.get_int_or_none('id') process = Process.by_id(conn, id_, create=True) process.title.set(form_data.get_str('title')) process.description.set(form_data.get_str('description')) process.effort.set(form_data.get_float('effort')) + process.child_ids = form_data.get_all_int('children') process.save(conn) def _init_handling(self) -> tuple[DatabaseConnection, str, ParamsParser]: conn = DatabaseConnection(self.server.db) parsed_url = urlparse(self.path) site = path_split(parsed_url.path)[1] - params = ParamsParser(parse_qs(parsed_url.query)) + params = ParamsParser(parse_qs(parsed_url.query, strict_parsing=True)) return conn, site, params def _redirect(self, target: str) -> None: