X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=plomtask%2Fhttp.py;h=d76ac052014c1b9f8d548ed24267561aead04892;hb=f59afccd32d45e60c48d451e6b8304a817627c62;hp=5d165ecf90f1ca6ebaed77e55b73a5d55ff428b8;hpb=12195a1fe2c15334c866036eaa171eb8e92f0408;p=plomtask
diff --git a/plomtask/http.py b/plomtask/http.py
index 5d165ec..d76ac05 100644
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -10,6 +10,7 @@ from plomtask.exceptions import HandledException, BadFormatException, \
NotFoundException
from plomtask.db import DatabaseConnection, DatabaseFile
from plomtask.processes import Process
+from plomtask.conditions import Condition
from plomtask.todos import Todo
TEMPLATES_DIR = 'templates'
@@ -25,81 +26,63 @@ class TaskServer(HTTPServer):
self.jinja = JinjaEnv(loader=JinjaFSLoader(TEMPLATES_DIR))
-class ParamsParser:
- """Wrapper for validating and retrieving GET params."""
+class InputsParser:
+ """Wrapper for validating and retrieving dict-like HTTP inputs."""
- def __init__(self, params: dict[str, list[str]]) -> None:
- self.params = params
+ def __init__(self, dict_: dict[str, list[str]],
+ strictness: bool = True) -> None:
+ self.inputs = dict_
+ self.strict = strictness
- def get_str(self, key: str, default: str = '') -> str:
- """Retrieve string value of key from self.params."""
- if key not in self.params or 0 == len(self.params[key]):
+ def get_str(self, key: str, default: str = '',
+ ignore_strict: bool = False) -> str:
+ """Retrieve single/first string value of key, or default."""
+ if key not in self.inputs.keys() or 0 == len(self.inputs[key]):
+ if self.strict and not ignore_strict:
+ raise BadFormatException(f'no value found for key {key}')
return default
- return self.params[key][0]
+ return self.inputs[key][0]
+
+ def get_int(self, key: str) -> int:
+ """Retrieve single/first value of key as int, error if empty."""
+ val = self.get_int_or_none(key)
+ if val is None:
+ raise BadFormatException(f'unexpected empty value for: {key}')
+ return val
def get_int_or_none(self, key: str) -> int | None:
- """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]))):
+ """Retrieve single/first value of key as int, return None if empty."""
+ val = self.get_str(key, ignore_strict=True)
+ if val == '':
return None
- val_str = self.params[key][0]
- try:
- return int(val_str)
- except ValueError as e:
- raise BadFormatException(f'Bad ?{key}= value: {val_str}') from e
-
-
-class PostvarsParser:
- """Postvars wrapper for validating and retrieving form data."""
-
- def __init__(self, postvars: dict[str, list[str]]) -> None:
- self.postvars = postvars
-
- def get_str(self, key: str) -> str:
- """Retrieve string value of key from self.postvars."""
- 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}'
+ msg = f'cannot int form field value for key {key}: {val}'
raise BadFormatException(msg) from e
- def get_int_or_none(self, key: str) -> int | None:
- """Retrieve int value of key from self.postvars, or None."""
- if key not in self.postvars or \
- 0 == len(''.join(list(self.postvars[key]))):
- return None
- return self.get_int(key)
-
def get_float(self, key: str) -> float:
"""Retrieve float value of key from self.postvars."""
val = self.get_str(key)
try:
return float(val)
except ValueError as e:
- msg = f'cannot float form field value: {val}'
+ msg = f'cannot float form field value for key {key}: {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:
+ """Retrieve list of string values at key."""
+ if key not in self.inputs.keys():
return []
- return self.postvars[key]
+ return self.inputs[key]
def get_all_int(self, key: str) -> list[int]:
- """Retrieve list of int values at key from self.postvars."""
+ """Retrieve list of int values at key."""
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}'
+ msg = f'cannot int a form field value for key {key} in: {all_str}'
raise BadFormatException(msg) from e
@@ -110,138 +93,279 @@ class TaskHandler(BaseHTTPRequestHandler):
def do_GET(self) -> None:
"""Handle any GET request."""
try:
- conn, site, params = self._init_handling()
- if site in {'calendar', 'day', 'process', 'processes', 'todo'}:
- html = getattr(self, f'do_GET_{site}')(conn, params)
- elif '' == site:
+ self._init_handling()
+ if hasattr(self, f'do_GET_{self.site}'):
+ template = f'{self.site}.html'
+ ctx = getattr(self, f'do_GET_{self.site}')()
+ html = self.server.jinja.get_template(template).render(**ctx)
+ self._send_html(html)
+ elif '' == self.site:
self._redirect('/day')
- return
else:
- raise NotFoundException(f'Unknown page: /{site}')
- self._send_html(html)
+ raise NotFoundException(f'Unknown page: /{self.site}')
except HandledException as error:
self._send_msg(error, code=error.http_code)
finally:
- conn.close()
+ self.conn.close()
- def do_GET_calendar(self, conn: DatabaseConnection,
- params: ParamsParser) -> str:
+ def do_GET_calendar(self) -> dict[str, object]:
"""Show Days from ?start= to ?end=."""
- start = params.get_str('start')
- end = params.get_str('end')
- days = Day.all(conn, date_range=(start, end), fill_gaps=True)
- return self.server.jinja.get_template('calendar.html').render(
- days=days, start=start, end=end)
-
- def do_GET_day(self, conn: DatabaseConnection,
- params: ParamsParser) -> str:
+ start = self.params.get_str('start')
+ end = self.params.get_str('end')
+ days = Day.all(self.conn, date_range=(start, end), fill_gaps=True)
+ return {'start': start, 'end': end, 'days': days}
+
+ def do_GET_day(self) -> dict[str, object]:
"""Show single Day of ?date=."""
- date = params.get_str('date', todays_date())
- day = Day.by_date(conn, date, create=True)
- todos = Todo.by_date(conn, date)
- return self.server.jinja.get_template('day.html').render(
- day=day, processes=Process.all(conn), todos=todos)
-
- def do_GET_todo(self, conn: DatabaseConnection, params:
- ParamsParser) -> str:
+ date = self.params.get_str('date', todays_date())
+ todays_todos = Todo.by_date(self.conn, date)
+ conditions_present = []
+ enablers_for = {}
+ for todo in todays_todos:
+ for condition in todo.conditions:
+ if condition not in conditions_present:
+ conditions_present += [condition]
+ enablers_for[condition.id_] = [p for p in
+ Process.all(self.conn)
+ if condition in p.enables]
+ seen_todos: set[int] = set()
+ top_nodes = [t.get_step_tree(seen_todos)
+ for t in todays_todos if not t.parents]
+ return {'day': Day.by_id(self.conn, date, create=True),
+ 'top_nodes': top_nodes,
+ 'enablers_for': enablers_for,
+ 'conditions_present': conditions_present,
+ 'processes': Process.all(self.conn)}
+
+ def do_GET_todo(self) -> dict[str, object]:
"""Show single Todo of ?id=."""
- id_ = params.get_int_or_none('id')
- todo = Todo.by_id(conn, id_)
- candidates = Todo.by_date(conn, todo.day.date)
- return self.server.jinja.get_template('todo.html').render(
- todo=todo, candidates=candidates)
-
- def do_GET_process(self, conn: DatabaseConnection,
- params: ParamsParser) -> str:
- """Show process of ?id=."""
- id_ = params.get_int_or_none('id')
- process = Process.by_id(conn, id_, create=True)
- owners = process.used_as_step_by(conn)
- return self.server.jinja.get_template('process.html').render(
- process=process, steps=process.get_steps(conn),
- owners=owners, candidates=Process.all(conn))
-
- def do_GET_processes(self, conn: DatabaseConnection,
- _: ParamsParser) -> str:
+ id_ = self.params.get_int('id')
+ todo = Todo.by_id(self.conn, id_)
+ return {'todo': todo,
+ 'todo_candidates': Todo.by_date(self.conn, todo.date),
+ 'condition_candidates': Condition.all(self.conn)}
+
+ def do_GET_conditions(self) -> dict[str, object]:
+ """Show all Conditions."""
+ conditions = Condition.all(self.conn)
+ sort_by = self.params.get_str('sort_by')
+ if sort_by == 'is_active':
+ conditions.sort(key=lambda c: c.is_active)
+ elif sort_by == '-is_active':
+ conditions.sort(key=lambda c: c.is_active, reverse=True)
+ elif sort_by == '-title':
+ conditions.sort(key=lambda c: c.title.newest, reverse=True)
+ else:
+ conditions.sort(key=lambda c: c.title.newest)
+ return {'conditions': conditions, 'sort_by': sort_by}
+
+ def do_GET_condition(self) -> dict[str, object]:
+ """Show Condition of ?id=."""
+ id_ = self.params.get_int_or_none('id')
+ return {'condition': Condition.by_id(self.conn, id_, create=True)}
+
+ def do_GET_condition_titles(self) -> dict[str, object]:
+ """Show title history of Condition of ?id=."""
+ id_ = self.params.get_int_or_none('id')
+ condition = Condition.by_id(self.conn, id_)
+ return {'condition': condition}
+
+ def do_GET_condition_descriptions(self) -> dict[str, object]:
+ """Show description historys of Condition of ?id=."""
+ id_ = self.params.get_int_or_none('id')
+ condition = Condition.by_id(self.conn, id_)
+ return {'condition': condition}
+
+ def do_GET_process(self) -> dict[str, object]:
+ """Show Process of ?id=."""
+ id_ = self.params.get_int_or_none('id')
+ process = Process.by_id(self.conn, id_, create=True)
+ return {'process': process,
+ 'steps': process.get_steps(self.conn),
+ 'owners': process.used_as_step_by(self.conn),
+ 'step_candidates': Process.all(self.conn),
+ 'condition_candidates': Condition.all(self.conn)}
+
+ def do_GET_process_titles(self) -> dict[str, object]:
+ """Show title history of Process of ?id=."""
+ id_ = self.params.get_int_or_none('id')
+ process = Process.by_id(self.conn, id_)
+ return {'process': process}
+
+ def do_GET_process_descriptions(self) -> dict[str, object]:
+ """Show description historys of Process of ?id=."""
+ id_ = self.params.get_int_or_none('id')
+ process = Process.by_id(self.conn, id_)
+ return {'process': process}
+
+ def do_GET_process_efforts(self) -> dict[str, object]:
+ """Show default effort history of Process of ?id=."""
+ id_ = self.params.get_int_or_none('id')
+ process = Process.by_id(self.conn, id_)
+ return {'process': process}
+
+ def do_GET_processes(self) -> dict[str, object]:
"""Show all Processes."""
- return self.server.jinja.get_template('processes.html').render(
- processes=Process.all(conn))
+ processes = Process.all(self.conn)
+ sort_by = self.params.get_str('sort_by')
+ if sort_by == 'steps':
+ processes.sort(key=lambda c: len(c.explicit_steps))
+ elif sort_by == '-steps':
+ processes.sort(key=lambda c: len(c.explicit_steps), reverse=True)
+ elif sort_by == '-title':
+ processes.sort(key=lambda c: c.title.newest, reverse=True)
+ else:
+ processes.sort(key=lambda c: c.title.newest)
+ return {'processes': processes, 'sort_by': sort_by}
def do_POST(self) -> None:
"""Handle any POST request."""
+ # pylint: disable=attribute-defined-outside-init
try:
- conn, site, params = self._init_handling()
+ self._init_handling()
length = int(self.headers['content-length'])
postvars = parse_qs(self.rfile.read(length).decode(),
keep_blank_values=True, strict_parsing=True)
- form_data = PostvarsParser(postvars)
- if site in ('day', 'process', 'todo'):
- getattr(self, f'do_POST_{site}')(conn, params, form_data)
- conn.commit()
+ self.form_data = InputsParser(postvars)
+ if hasattr(self, f'do_POST_{self.site}'):
+ redir_target = getattr(self, f'do_POST_{self.site}')()
+ self.conn.commit()
else:
- msg = f'Page not known as POST target: /{site}'
+ msg = f'Page not known as POST target: /{self.site}'
raise NotFoundException(msg)
- self._redirect('/')
+ self._redirect(redir_target)
except HandledException as error:
self._send_msg(error, code=error.http_code)
finally:
- conn.close()
+ self.conn.close()
- def do_POST_day(self, conn: DatabaseConnection, params: ParamsParser,
- form_data: PostvarsParser) -> None:
+ def do_POST_day(self) -> str:
"""Update or insert Day of date and Todos mapped to it."""
- date = params.get_str('date')
- day = Day.by_date(conn, date, create=True)
- day.comment = form_data.get_str('comment')
- day.save(conn)
- process_id = form_data.get_int_or_none('new_todo')
- if process_id is not None:
- process = Process.by_id(conn, process_id)
- todo = Todo(None, process, False, day)
- todo.save(conn)
-
- def do_POST_todo(self, conn: DatabaseConnection, params: ParamsParser,
- form_data: PostvarsParser) -> None:
+ date = self.params.get_str('date')
+ day = Day.by_id(self.conn, date, create=True)
+ day.comment = self.form_data.get_str('day_comment')
+ day.save(self.conn)
+ new_todos = []
+ for process_id in self.form_data.get_all_int('new_todo'):
+ process = Process.by_id(self.conn, process_id)
+ todo = Todo(None, process, False, day.date)
+ todo.save(self.conn)
+ new_todos += [todo]
+ adopted = True
+ while adopted:
+ adopted = False
+ existing_todos = Todo.by_date(self.conn, date)
+ for todo in new_todos:
+ if todo.adopt_from(existing_todos):
+ adopted = True
+ todo.make_missing_children(self.conn)
+ todo.save(self.conn)
+ done_ids = self.form_data.get_all_int('done')
+ comments = self.form_data.get_all_str('comment')
+ efforts = self.form_data.get_all_str('effort')
+ for i, todo_id in enumerate(self.form_data.get_all_int('todo_id')):
+ todo = Todo.by_id(self.conn, todo_id)
+ todo.is_done = todo_id in done_ids
+ if len(comments) > 0:
+ todo.comment = comments[i]
+ if len(efforts) > 0:
+ todo.effort = float(efforts[i]) if efforts[i] else None
+ todo.save(self.conn)
+ for condition in todo.enables:
+ condition.save(self.conn)
+ for condition in todo.disables:
+ condition.save(self.conn)
+ return f'/day?date={date}'
+
+ def do_POST_todo(self) -> str:
"""Update Todo and its children."""
- id_ = params.get_int_or_none('id')
- todo = Todo.by_id(conn, id_)
- child_id = form_data.get_int_or_none('adopt')
- if child_id is not None:
- child = Todo.by_id(conn, child_id)
+ id_ = self.params.get_int('id')
+ for _ in self.form_data.get_all_str('delete'):
+ todo = Todo .by_id(self.conn, id_)
+ todo.remove(self.conn)
+ return '/'
+ todo = Todo.by_id(self.conn, id_)
+ adopted_child_ids = self.form_data.get_all_int('adopt')
+ for child in todo.children:
+ if child.id_ not in adopted_child_ids:
+ assert isinstance(child.id_, int)
+ child = Todo.by_id(self.conn, child.id_)
+ todo.remove_child(child)
+ for child_id in adopted_child_ids:
+ if child_id in [c.id_ for c in todo.children]:
+ continue
+ child = Todo.by_id(self.conn, child_id)
todo.add_child(child)
- todo.is_done = len(form_data.get_all_str('done')) > 0
- todo.save(conn)
-
- def do_POST_process(self, conn: DatabaseConnection, params: ParamsParser,
- form_data: PostvarsParser) -> None:
+ effort = self.form_data.get_str('effort', ignore_strict=True)
+ todo.effort = float(effort) if effort else None
+ todo.set_conditions(self.conn, self.form_data.get_all_int('condition'))
+ todo.set_enables(self.conn, self.form_data.get_all_int('enables'))
+ todo.set_disables(self.conn, self.form_data.get_all_int('disables'))
+ todo.is_done = len(self.form_data.get_all_str('done')) > 0
+ todo.comment = self.form_data.get_str('comment', ignore_strict=True)
+ todo.save(self.conn)
+ for condition in todo.enables:
+ condition.save(self.conn)
+ for condition in todo.disables:
+ condition.save(self.conn)
+ return f'/todo?id={todo.id_}'
+
+ def do_POST_process(self) -> str:
"""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.save_without_steps(conn)
- assert process.id_ is not None # for mypy
+ id_ = self.params.get_int_or_none('id')
+ for _ in self.form_data.get_all_str('delete'):
+ process = Process.by_id(self.conn, id_)
+ process.remove(self.conn)
+ return '/processes'
+ process = Process.by_id(self.conn, id_, create=True)
+ process.title.set(self.form_data.get_str('title'))
+ process.description.set(self.form_data.get_str('description'))
+ process.effort.set(self.form_data.get_float('effort'))
+ process.set_conditions(self.conn,
+ self.form_data.get_all_int('condition'))
+ process.set_enables(self.conn, self.form_data.get_all_int('enables'))
+ process.set_disables(self.conn, self.form_data.get_all_int('disables'))
+ process.save(self.conn)
process.explicit_steps = []
- for step_id in form_data.get_all_int('steps'):
- for step_process_id in\
- form_data.get_all_int(f'new_step_to_{step_id}'):
- process.add_step(conn, None, step_process_id, step_id)
- if step_id not in form_data.get_all_int('keep_step'):
+ steps: list[tuple[int | None, int, int | None]] = []
+ for step_id in self.form_data.get_all_int('steps'):
+ for step_process_id in self.form_data.get_all_int(
+ f'new_step_to_{step_id}'):
+ steps += [(None, step_process_id, step_id)]
+ if step_id not in self.form_data.get_all_int('keep_step'):
continue
- step_process_id = form_data.get_int(f'step_{step_id}_process_id')
- parent_id = form_data.get_int_or_none(f'step_{step_id}_parent_id')
- process.add_step(conn, step_id, step_process_id, parent_id)
- for step_process_id in form_data.get_all_int('new_top_step'):
- process.add_step(conn, None, step_process_id, None)
- process.fix_steps(conn)
-
- def _init_handling(self) -> tuple[DatabaseConnection, str, ParamsParser]:
- conn = DatabaseConnection(self.server.db)
+ step_process_id = self.form_data.get_int(
+ f'step_{step_id}_process_id')
+ parent_id = self.form_data.get_int_or_none(
+ f'step_{step_id}_parent_id')
+ steps += [(step_id, step_process_id, parent_id)]
+ for step_process_id in self.form_data.get_all_int('new_top_step'):
+ steps += [(None, step_process_id, None)]
+ process.set_steps(self.conn, steps)
+ process.save(self.conn)
+ return f'/process?id={process.id_}'
+
+ def do_POST_condition(self) -> str:
+ """Update/insert Condition of ?id= and fields defined in postvars."""
+ id_ = self.params.get_int_or_none('id')
+ for _ in self.form_data.get_all_str('delete'):
+ condition = Condition.by_id(self.conn, id_)
+ condition.remove(self.conn)
+ return '/conditions'
+ condition = Condition.by_id(self.conn, id_, create=True)
+ condition.is_active = self.form_data.get_all_str('is_active') != []
+ condition.title.set(self.form_data.get_str('title'))
+ condition.description.set(self.form_data.get_str('description'))
+ condition.save(self.conn)
+ return f'/condition?id={condition.id_}'
+
+ def _init_handling(self) -> None:
+ # pylint: disable=attribute-defined-outside-init
+ self.conn = DatabaseConnection(self.server.db)
parsed_url = urlparse(self.path)
- site = path_split(parsed_url.path)[1]
- params = ParamsParser(parse_qs(parsed_url.query, strict_parsing=True))
- return conn, site, params
+ self.site = path_split(parsed_url.path)[1]
+ params = parse_qs(parsed_url.query, strict_parsing=True)
+ self.params = InputsParser(params, False)
def _redirect(self, target: str) -> None:
self.send_response(302)