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'
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
"""Handle any GET request."""
try:
conn, site, params = self._init_handling()
- if site in {'calendar', 'day', 'process', 'processes', 'todo'}:
+ if site in {'calendar', 'day', 'process', 'processes', 'todo',
+ 'condition', 'conditions'}:
html = getattr(self, f'do_GET_{site}')(conn, params)
elif '' == site:
self._redirect('/day')
conn.close()
def do_GET_calendar(self, conn: DatabaseConnection,
- params: ParamsParser) -> str:
+ params: InputsParser) -> str:
"""Show Days from ?start= to ?end=."""
start = params.get_str('start')
end = params.get_str('end')
days=days, start=start, end=end)
def do_GET_day(self, conn: DatabaseConnection,
- params: ParamsParser) -> str:
+ params: InputsParser) -> str:
"""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)
+ conditions_listing = []
+ for condition in Condition.all(conn):
+ enablers = Todo.enablers_for_at(conn, condition, date)
+ disablers = Todo.disablers_for_at(conn, condition, date)
+ conditions_listing += [{
+ 'condition': condition,
+ 'enablers': enablers,
+ 'disablers': disablers}]
return self.server.jinja.get_template('day.html').render(
- day=day, processes=Process.all(conn), todos=todos)
+ day=day, processes=Process.all(conn), todos=todos,
+ conditions_listing=conditions_listing)
def do_GET_todo(self, conn: DatabaseConnection, params:
- ParamsParser) -> str:
+ InputsParser) -> str:
"""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)
+ todo_candidates = Todo.by_date(conn, todo.day.date)
return self.server.jinja.get_template('todo.html').render(
- todo=todo, candidates=candidates)
+ todo=todo, todo_candidates=todo_candidates,
+ condition_candidates=Condition.all(conn))
+
+ def do_GET_conditions(self, conn: DatabaseConnection,
+ _: InputsParser) -> str:
+ """Show all Conditions."""
+ return self.server.jinja.get_template('conditions.html').render(
+ conditions=Condition.all(conn))
+
+ def do_GET_condition(self, conn: DatabaseConnection,
+ params: InputsParser) -> str:
+ """Show Condition of ?id=."""
+ id_ = params.get_int_or_none('id')
+ condition = Condition.by_id(conn, id_, create=True)
+ return self.server.jinja.get_template('condition.html').render(
+ condition=condition)
def do_GET_process(self, conn: DatabaseConnection,
- params: ParamsParser) -> str:
+ params: InputsParser) -> 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))
+ owners=owners, process_candidates=Process.all(conn),
+ condition_candidates=Condition.all(conn))
def do_GET_processes(self, conn: DatabaseConnection,
- _: ParamsParser) -> str:
+ _: InputsParser) -> str:
"""Show all Processes."""
return self.server.jinja.get_template('processes.html').render(
processes=Process.all(conn))
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'):
+ # form_data = PostvarsParser(postvars)
+ form_data = InputsParser(postvars)
+ if site in ('day', 'process', 'todo', 'condition'):
getattr(self, f'do_POST_{site}')(conn, params, form_data)
conn.commit()
else:
finally:
conn.close()
- def do_POST_day(self, conn: DatabaseConnection, params: ParamsParser,
- form_data: PostvarsParser) -> None:
+ def do_POST_day(self, conn: DatabaseConnection, params: InputsParser,
+ form_data: InputsParser) -> None:
"""Update or insert Day of date and Todos mapped to it."""
date = params.get_str('date')
day = Day.by_date(conn, date, create=True)
todo = Todo(None, process, False, day)
todo.save(conn)
- def do_POST_todo(self, conn: DatabaseConnection, params: ParamsParser,
- form_data: PostvarsParser) -> None:
+ def do_POST_todo(self, conn: DatabaseConnection, params: InputsParser,
+ form_data: InputsParser) -> None:
"""Update Todo and its children."""
id_ = params.get_int_or_none('id')
todo = Todo.by_id(conn, id_)
if child_id is not None:
child = Todo.by_id(conn, child_id)
todo.add_child(child)
+ todo.set_conditions(conn, form_data.get_all_int('condition'))
+ todo.set_fulfills(conn, form_data.get_all_int('fulfills'))
+ todo.set_undoes(conn, form_data.get_all_int('undoes'))
todo.is_done = len(form_data.get_all_str('done')) > 0
todo.save(conn)
+ for condition in todo.fulfills:
+ condition.save(conn)
+ for condition in todo.undoes:
+ condition.save(conn)
- def do_POST_process(self, conn: DatabaseConnection, params: ParamsParser,
- form_data: PostvarsParser) -> None:
+ def do_POST_process(self, conn: DatabaseConnection, params: InputsParser,
+ form_data: InputsParser) -> None:
"""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.set_conditions(conn, form_data.get_all_int('condition'))
+ process.set_fulfills(conn, form_data.get_all_int('fulfills'))
+ process.set_undoes(conn, form_data.get_all_int('undoes'))
process.save_without_steps(conn)
assert process.id_ is not None # for mypy
process.explicit_steps = []
process.add_step(conn, None, step_process_id, None)
process.fix_steps(conn)
- def _init_handling(self) -> tuple[DatabaseConnection, str, ParamsParser]:
+ def do_POST_condition(self, conn: DatabaseConnection, params: InputsParser,
+ form_data: InputsParser) -> None:
+ """Update/insert Condition of ?id= and fields defined in postvars."""
+ id_ = params.get_int_or_none('id')
+ condition = Condition.by_id(conn, id_, create=True)
+ condition.title.set(form_data.get_str('title'))
+ condition.description.set(form_data.get_str('description'))
+ condition.save(conn)
+
+ def _init_handling(self) -> tuple[DatabaseConnection, str, InputsParser]:
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))
+ params = InputsParser(parse_qs(parsed_url.query, strict_parsing=True),
+ False)
return conn, site, params
def _redirect(self, target: str) -> None:
projects / plomtask / blobdiff