X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=todo.py;h=478a41e106e23c525eb7af7d172d4e518165cf63;hb=942c977e0052d09300625e7a5c1b5fc2eede9098;hp=d4ca1e77f208dc74a8642f2ccb3d9bfd8691ffdf;hpb=cf116472e137d4fcbcf6ce909de05ef75fb984f8;p=misc diff --git a/todo.py b/todo.py index d4ca1e7..478a41e 100644 --- a/todo.py +++ b/todo.py @@ -1,186 +1,24 @@ -from plomlib import PlomDB, run_server, PlomHandler, PlomException +from plomlib import PlomDB, run_server, PlomHandler, PlomException import json from uuid import uuid4 from datetime import datetime, timedelta from urllib.parse import parse_qs from jinja2 import Template +from jinja2 import Environment as JinjaEnv, FileSystemLoader as JinjaFSLoader from urllib.parse import urlparse db_path = '/home/plom/org/todo_new.json' -# db_path = '/home/plom/public_repos/misc/todo_new.json' server_port = 8082 - -html_head = """ - - -tasks: list add | day: -choose tasks -do tasks -| calendar -
-""" -form_footer = '\n' - -form_header_tmpl = """ -
-""" -calendar_tmpl = """ - -{% for date, day in days.items() | sort(reverse=True) %} - -{% for task, todo in day.todos.items() | sort(attribute='1.title', reverse=True) %} -{% if todo.visible %} - -{% endif %} -{% endfor %} -{% endfor %} -
{{ date }} {{ day.weekday }} ({{ day.todos_sum|round(2) }}) {{ day.comment|e }}
{% if todo.done %}✓{% else %}  {% endif %}{{ todo.title }}{{ todo.comment|e }}
-""" -todo_tmpl = """ - - - - - - - - - -
task{{ todo.task.title|e }}
default weight{{ todo.default_weight }}
day{{ todo.day.date }}
day weight
comment
done
- -""" -task_tmpl = """ - - - - - -
title
history
    {% for k,v in task.title_history.items() | sort(attribute='0', reverse=True) %}
  • {{ k }}: {{ v|e }}{% endfor %}
default weight
history
    {% for k,v in task.default_weight_history.items() | sort(attribute='0', reverse=True) %}
  • {{ k }}: {{ v|e }}{% endfor %}
tags
history
    {% for k,v in task.tags_history.items() | sort(attribute='0', reverse=True) %}
  • {{ k }}: {{ v|e }}{% endfor %}
- -""" -# archived_days_tmpl = """ -# -# {% for date, day in days.items() | sort(reverse=True) %} -# {% if day.archived %} -# -# {% for task, todo in day.todos.items() | sort(attribute='1.title', reverse=True) %} -# -# {% endfor %} -# {% endif %} -# {% endfor %} -#
{{ date }} {{ day.weekday }} ({{ day.todos_sum|round(2) }}) {{ day.comment|e }}
{{ todo.title }}{% if todo.done %}✓{% endif %}{{ todo.weight }}
-# """ -day_tmpl = """ - -hide unchosen:
-mandatory tags: {% for t_tag in db.t_tags | sort %} -{{ t_tag }} -{% endfor %} -
-forbidden tags: {% for t_tag in db.t_tags | sort %} -{{ t_tag }} -{% endfor %} -

- -

- -prev next date: {{ db.selected_day.todos_sum|round(2) }} ({{ db.selected_day.todos_sum2|round(2)}}) comment: -

- - - -{% for uuid, t in db.tasks.items() | sort(attribute='1.title', reverse=True) %} -{% if t.visible %} - - - - - - - - -{% endif %} -{% endfor %} -
taskchoose?done?weightcomment
] {{ t.current_title|e }}tags: {% for tag in t.tags | sort %}{{ tag }} {% endfor %}
- -""" -tasks_tmpl = """ -

- mandatory tags: {% for t_tag in db.t_tags | sort %} -{{ t_tag }} -{% endfor %} -
-forbidden tags: {% for t_tag in db.t_tags | sort %} -{{ t_tag }} -{% endfor %} -

- - -{% for uuid, t in db.tasks.items() | sort(attribute='1.title', reverse=True) %} -{% if t.visible %} - - - - -{% endif %} -{% endfor %} -
default
weight		tasktags
{{ t.default_weight }}{{ t.title|e }}{% for tag in t.tags | sort %}{{ tag }} {% endfor %}
-""" -# selected_day_tmpl = """ -#

-# hide unchosen:
-# mandatory tags: {% for t_tag in db.t_tags | sort %} -# {{ t_tag }} -# {% endfor %} -#
-# forbidden tags: {% for t_tag in db.t_tags | sort %} -# {{ t_tag }} -# {% endfor %} -#

-# -#

-# -# date: {{ db.selected_day.todos_sum|round(2) }} ({{ db.selected_day.todos_sum2|round(2)}}) comment: -#

-# -# -# -# {% for uuid, t in db.tasks.items() | sort(attribute='1.title', reverse=True) %} -# {% if t.visible %} -# -# -# -# -# -# -# -# -# {% endif %} -# {% endfor %} -#
default
weight		titletagschoose?done?day
weight
-#
-# -# """ +DATE_FORMAT = '%Y-%m-%d' +j2env = JinjaEnv(loader=JinjaFSLoader('todo_templates')) class Task: - def __init__(self, db, title_history=None, tags_history=None, default_weight_history=None): + def __init__(self, db, title_history=None, tags_history=None, default_effort_history=None, links_history=None): self.db = db self.title_history = title_history if title_history else {} self.tags_history = tags_history if tags_history else {} - self.default_weight_history = default_weight_history if default_weight_history else {} + self.default_effort_history = default_effort_history if default_effort_history else {} + self.links_history = links_history if links_history else {} self.visible = True def _set_with_history(self, history, value): @@ -190,35 +28,44 @@ class Task: def _last_of_history(self, history, default): keys = sorted(history.keys()) - return default if 0 == len(history) else history[keys[-1]] + return default if 0 == len(history) else history[keys[-1]] @classmethod def from_dict(cls, db, d): return cls( - db, - d['title_history'], - {k: set(v) for k, v in d['tags_history'].items()}, - d['default_weight_history']) + db, + d['title_history'], + {k: set(v) for k, v in d['tags_history'].items()}, + d['default_effort_history'], + {k: set(v) for k, v in d['links_history'].items()}) + + def to_dict(self): + return { + 'title_history': self.title_history, + 'default_effort_history': self.default_effort_history, + 'tags_history': {k: list(v) for k,v in self.tags_history.items()}, + 'links_history': {k: list(v) for k,v in self.links_history.items()}, + } @property - def default_weight(self): - return self._last_of_history(self.default_weight_history, 1) + def default_effort(self): + return self._last_of_history(self.default_effort_history, 1) - @default_weight.setter - def default_weight(self, default_weight): - self._set_with_history(self.default_weight_history, default_weight) + @default_effort.setter + def default_effort(self, default_effort): + self._set_with_history(self.default_effort_history, default_effort) - def default_weight_at(self, queried_date): - ret = self.default_weight_history[sorted(self.default_weight_history.keys())[0]] - for date_key, default_weight in self.default_weight_history.items(): + def default_effort_at(self, queried_date): + ret = self.default_effort_history[sorted(self.default_effort_history.keys())[0]] + for date_key, default_effort in self.default_effort_history.items(): if date_key > f'{queried_date} 23:59:59': break - ret = default_weight + ret = default_effort return ret @property - def current_default_weight(self): - return self.default_weight_at(self.db.selected_date) + def current_default_effort(self): + return self.default_effort_at(self.db.selected_date) @property def title(self): @@ -229,7 +76,7 @@ class Task: self._set_with_history(self.title_history, title) def title_at(self, queried_date): - ret = self.title_history[sorted(self.title_history.keys())[0]] + ret = self.title_history[sorted(self.title_history.keys())[0]] for date_key, title in self.title_history.items(): if date_key > f'{queried_date} 23:59:59': break @@ -249,21 +96,12 @@ class Task: self._set_with_history(self.tags_history, set(tags)) @property - def tags_joined(self): - return ';'.join(sorted(list(self.tags))) - - @tags_joined.setter - def tags_joined(self, tags_string): - tags = set() - for tag in [tag.strip() for tag in tags_string.split(';') if tag.strip() != '']: - tags.add(tag) - self.tags = tags + def links(self): + return self._last_of_history(self.links_history, set()) - def to_dict(self): - return { - 'title_history': self.title_history, - 'tags_history': {k: list(v) for k,v in self.tags_history.items()}, - 'default_weight_history': self.default_weight_history} + @links.setter + def links(self, links): + self._set_with_history(self.links_history, set(links)) @property def id_(self): @@ -276,9 +114,9 @@ class Day: def __init__(self, db, todos=None, comment=''): self.db = db - self.todos = todos if todos else {} + self.todos = todos if todos else {} self.comment = comment - self.archived = True + self.archived = True @classmethod def from_dict(cls, db, d): @@ -302,10 +140,10 @@ class Day: def _todos_sum(self, include_undone=False): s = 0 for todo in [todo for todo in self.todos.values() if todo.done]: - s += todo.weight + s += todo.effort if include_undone: for todo in [todo for todo in self.todos.values() if not todo.done]: - s += todo.day_weight if todo.day_weight else 0 + s += todo.day_effort if todo.day_effort else 0 return s @property @@ -324,29 +162,31 @@ class Day: class Todo: - def __init__(self, day, done=False, day_weight=None, comment=''): - self.day = day + def __init__(self, day, done=False, day_effort=None, comment='', day_tags=None, importance=1.0): + self.day = day self.done = done - self.day_weight = day_weight + self.day_effort = day_effort self.comment = comment + self.day_tags = day_tags if day_tags else set() + self.importance = importance @classmethod def from_dict(cls, day, d): - return cls(day, d['done'], d['day_weight'], d['comment']) + return cls(day, d['done'], d['day_effort'], d['comment'], set(d['day_tags']), d['importance']) def to_dict(self): - return {'done': self.done, 'day_weight': self.day_weight, 'comment': self.comment} + return {'done': self.done, 'day_effort': self.day_effort, 'comment': self.comment, 'day_tags': list(self.day_tags), 'importance': self.importance} @property - def default_weight(self): - return self.task.default_weight_at(self.day.date) + def default_effort(self): + return self.task.default_effort_at(self.day.date) @property - def weight(self): - if self.day_weight: - return self.day_weight + def effort(self): + if self.day_effort: + return self.day_effort else: - return self.day_weight if self.day_weight else self.default_weight + return self.day_effort if self.day_effort else self.default_effort @property def task(self): @@ -358,40 +198,55 @@ class Todo: def title(self): return self.task.title_at(self.day.date) + @property + def tags(self): + return self.day_tags | self.task.tags + + def is_empty(self): + return self.done or (self.day_effort is not None) or len(self.comment) > 0 or len(self.day_tags) > 0 + class TodoDB(PlomDB): - def __init__(self, prefix, selected_date=None, t_filter_and = None, t_filter_not = None, hide_unchosen=False): + def __init__(self, prefix, selected_date=None, t_filter_and = None, t_filter_not = None, hide_unchosen=False, hide_done=False): self.prefix = prefix - self.selected_date = selected_date if selected_date else str(datetime.now())[:10] - self.t_filter_and = t_filter_and if t_filter_and else set() - self.t_filter_not = t_filter_not if t_filter_not else set() - self.hide_unchosen = hide_unchosen + self.selected_date = selected_date if selected_date else str(datetime.now())[:10] + self.t_filter_and = t_filter_and if t_filter_and else [] + self.t_filter_not = t_filter_not if t_filter_not else [] + self.hide_unchosen = hide_unchosen + self.hide_done = hide_done self.days = {} self.tasks = {} - self.t_tags = set() + self.t_tags = set() super().__init__(db_path) - self.switch_to_day() def read_db_file(self, f): d = json.load(f) for date, day_dict in d['days'].items(): self.days[date] = self.add_day(dict_source=day_dict) + for day in self.days.values(): + for todo in day.todos.values(): + for tag in todo.day_tags: + self.t_tags.add(tag) for uuid, t_dict in d['tasks'].items(): t = self.add_task(id_=uuid, dict_source=t_dict) - t.visible = len([tag for tag in self.t_filter_and if not tag in t.tags]) == 0\ - and len([tag for tag in self.t_filter_not if tag in t.tags]) == 0\ - and ((not self.hide_unchosen) or uuid in self.selected_day.todos) for tag in t.tags: self.t_tags.add(tag) + self.set_visibilities() + + def set_visibilities(self): + for uuid, t in self.tasks.items(): + t.visible = len([tag for tag in self.t_filter_and if not tag in t.tags]) == 0\ + and len([tag for tag in self.t_filter_not if tag in t.tags]) == 0\ + and ((not self.hide_unchosen) or uuid in self.selected_day.todos.keys()) + for day in self.days.values(): + for todo in day.todos.values(): + todo.visible = len([tag for tag in self.t_filter_and if not tag in todo.day_tags | todo.task.tags ]) == 0\ + and len([tag for tag in self.t_filter_not if tag in todo.day_tags | todo.task.tags ]) == 0\ + and ((not self.hide_done) or (not todo.done)) def to_dict(self): - d = { - 't_filter_and': list(self.t_filter_and), - 't_filter_not': list(self.t_filter_not), - 'tasks': {}, - 'days': {} - } + d = {'tasks': {}, 'days': {}} for uuid, t in self.tasks.items(): d['tasks'][uuid] = t.to_dict() for date, day in self.days.items(): @@ -400,272 +255,289 @@ class TodoDB(PlomDB): @property def selected_day(self): + if not self.selected_date in self.days.keys(): + self.days[self.selected_date] = self.add_day() return self.days[self.selected_date] def write(self): + dates_to_purge = [] + for date, day in self.days.items(): + if len(day.todos) == 0 and len(day.comment) == 0: + dates_to_purge += [date] + for date in dates_to_purge: + del self.days[date] self.write_text_to_db(json.dumps(self.to_dict())) - def switch_to_day(self, date=None): - if date: - self.selected_date = date - # if self.selected_date in self.days.keys(): - # self.selected_day.archived = True - if not self.selected_date in self.days.keys(): - self.days[self.selected_date] = self.add_day() - # self.selected_day.archived = False - def add_task(self, id_=None, dict_source=None, return_id=False): t = Task.from_dict(self, dict_source) if dict_source else Task(self) id_ = id_ if id_ else str(uuid4()) self.tasks[id_] = t if return_id: return id_, t - else: + else: return t def add_day(self, dict_source=None): return Day.from_dict(self, dict_source) if dict_source else Day(self) - # def show_all(self): - # for i in range(10): - # self.add_task(id_=f'new{i}') - # return Template(form_header_tmpl + selected_day_tmpl + archived_days_tmpl + form_footer).render(db=self, action=self.prefix+'/all', days=self.days) - - #def show_selected_day(self): - # return Template(form_header_tmpl + selected_day_tmpl + form_footer).render(db=self, action=self.prefix+'/day') - - def show_day(self): - current_date = datetime.strptime(self.selected_date, '%Y-%m-%d') - prev_date = current_date - timedelta(days=1) - prev_date_str = prev_date.strftime('%Y-%m-%d') - next_date = current_date + timedelta(days=1) - next_date_str = next_date.strftime('%Y-%m-%d') - return Template(form_header_tmpl + day_tmpl + form_footer).render(db=self, action=self.prefix+'/day', prev_date=prev_date_str, next_date=next_date_str) + def show_day(self, task_sort=None): + task_sort = task_sort if task_sort else 'title' + current_date = datetime.strptime(self.selected_date, DATE_FORMAT) + prev_date = current_date - timedelta(days=1) + prev_date_str = prev_date.strftime(DATE_FORMAT) + next_date = current_date + timedelta(days=1) + next_date_str = next_date.strftime(DATE_FORMAT) + task_rows = [] + for uuid, task in self.tasks.items(): + if not task.visible: + continue + todo = None + if uuid in self.selected_day.todos.keys(): + todo = self.selected_day.todos[uuid] + if not todo.visible: + continue + task_rows += [{'uuid': uuid, 'task': task, 'todo': todo}] + if task_sort == 'title': + task_rows.sort(key=lambda r: r['task'].title) + elif task_sort == 'default_effort': + task_rows.sort(key=lambda r: r['task'].default_effort, reverse=True) + elif task_sort == 'done': + task_rows.sort(key=lambda r: 0 if not r['todo'] else r['todo'].day_effort if r['todo'].day_effort else r['task'].default_effort if r['todo'].done else 0, reverse=True) + elif task_sort == 'importance': + task_rows.sort(key=lambda r: 0.0 if not r['todo'] else r['todo'].importance, reverse=True) + elif task_sort == 'chosen': + task_rows.sort(key=lambda r: False if not r['todo'] else True, reverse=True) + elif task_sort == 'comment': + task_rows.sort(key=lambda r: '' if not r['todo'] else r['todo'].comment, reverse=True) + return j2env.get_template('day.html').render(db=self, action=self.prefix+'/day', prev_date=prev_date_str, next_date=next_date_str, task_rows=task_rows) def show_calendar(self, start_date_str, end_date_str): + self.t_filter_and = ['calendar'] + self.t_filter_not = ['deleted'] + self.set_visibilities() days_to_show = {} - target_start = start_date_str if start_date_str else sorted(self.days.keys())[0] - target_start = str(datetime.now())[:10] if 'today' == target_start else target_start - target_end = end_date_str if end_date_str else sorted(self.days.keys())[-1] todays_date = str(datetime.now())[:10] - start_date = datetime.strptime(target_start, '%Y-%m-%d') - end_date = datetime.strptime(target_end, '%Y-%m-%d') + target_start_str = start_date_str if start_date_str else sorted(self.days.keys())[0] + target_start = todays_date if target_start_str == 'today' else target_start_str + target_end_str = end_date_str if end_date_str else sorted(self.days.keys())[-1] + target_end = todays_date if target_end_str == 'today' else target_end_str + start_date = datetime.strptime(target_start, DATE_FORMAT) + end_date = datetime.strptime(target_end, DATE_FORMAT) for n in range(int((end_date - start_date).days) + 1): current_date_obj = start_date + timedelta(n) - current_date = current_date_obj.strftime('%Y-%m-%d') + current_date = current_date_obj.strftime(DATE_FORMAT) if current_date not in self.days.keys(): days_to_show[current_date] = self.add_day() else: - days_to_show[current_date] = self.days[current_date] - days_to_show[current_date].weekday = datetime.strptime(current_date, '%Y-%m-%d').strftime('%A') - for task_uuid, todo in days_to_show[current_date].todos.items(): - todo.visible = self.tasks[task_uuid].visible - return Template(calendar_tmpl).render(db=self, days=days_to_show) + days_to_show[current_date] = self.days[current_date] + days_to_show[current_date].weekday = datetime.strptime(current_date, DATE_FORMAT).strftime('%A')[:2] + return j2env.get_template('calendar.html').render(db=self, days=days_to_show, action=self.prefix+'/calendar', today=str(datetime.now())[:10], start_date=start_date_str, end_date=end_date_str) def show_todo(self, task_uuid, selected_date): - todo = self.days[selected_date].todos[task_uuid] - return Template(form_header_tmpl + todo_tmpl + form_footer).render(db=self, todo=todo, action=self.prefix+'/todo') + if task_uuid in self.days[selected_date].todos: + todo = self.days[selected_date].todos[task_uuid] + else: + todo = self.days[selected_date].add_todo(task_uuid) + return j2env.get_template('todo.html').render(db=self, todo=todo, action=self.prefix+'/todo') - def update_todo(self, task_uuid, date, day_weight, done, comment): + def update_todo_mini(self, task_uuid, date, day_effort, done, importance): if task_uuid in self.days[date].todos.keys(): todo = self.days[date].todos[task_uuid] else: todo = self.days[date].add_todo(task_uuid) - # todo = self.days[date].todos[task_uuid] - todo.day_weight = float(day_weight) if len(day_weight) > 0 else None - todo.done = done - todo.comment = comment + todo.day_effort = float(day_effort) if len(day_effort) > 0 else None + todo.done = done + todo.importance = float(importance) + return todo + + def collect_tags(self, tags_joined, tags_checked): + tags = set() + for tag in [tag.strip() for tag in tags_joined.split(';') if tag.strip() != '']: + tags.add(tag) + for tag in tags_checked: + tags.add(tag) + return tags + + def update_todo(self, task_uuid, date, day_effort, done, comment, day_tags_joined, day_tags_checked, importance): + todo = self.update_todo_mini(task_uuid, date, day_effort, done, importance) + todo.comment = comment + todo.day_tags = self.collect_tags(day_tags_joined, day_tags_checked) def show_task(self, id_): task = self.tasks[id_] if id_ else self.add_task() - return Template(form_header_tmpl + task_tmpl + form_footer).render(db=self, task=task, action=self.prefix+'/task') + return j2env.get_template('task.html').render(db=self, task=task, action=self.prefix+'/task') - def update_task(self, id_, title, default_weight, tags_joined): + def update_task(self, id_, title, default_effort, tags_joined, tags_checked, links): task = self.tasks[id_] if id_ in self.tasks.keys() else self.add_task(id_) task.title = title - task.default_weight = float(default_weight) if len(default_weight) > 0 else None - task.tags_joined = tags_joined + task.default_effort = float(default_effort) if len(default_effort) > 0 else None + task.tags = self.collect_tags(tags_joined, tags_checked) + task.links = links + for link in links: + borrowed_links = self.tasks[link].links + borrowed_links.add(id_) + self.tasks[link].links = borrowed_links def show_tasks(self): - return Template(form_header_tmpl + tasks_tmpl + form_footer).render(db=self, action=self.prefix+'/tasks') + return j2env.get_template('tasks.html').render(db=self, action=self.prefix+'/tasks') class TodoHandler(PlomHandler): - + + def config_init(self): + return { + 'cookie_name': 'todo_cookie', + 'prefix': '', + 'cookie_path': '/' + } + def app_init(self, handler): default_path = '/todo' - handler.add_route('GET', default_path, self.show_db) - handler.add_route('POST', default_path, self.write_db) - return 'todo', default_path + handler.add_route('GET', default_path, self.show_db) + handler.add_route('POST', default_path, self.write_db) + return 'todo', {'cookie_name': 'todo_cookie', 'prefix': default_path, 'cookie_path': default_path} def do_POST(self): + self.try_do(self.config_init) self.try_do(self.write_db) def write_db(self): from urllib.parse import urlencode - prefix = self.apps['todo'] if hasattr(self, 'apps') else '' + app_config = self.apps['todo'] if hasattr(self, 'apps') else self.config() length = int(self.headers['content-length']) postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1) parsed_url = urlparse(self.path) - db = TodoDB(prefix=prefix) - if parsed_url.path == prefix + '/todo': + db = TodoDB(prefix=app_config['prefix']) + params_to_encode = [] + for param_name, filter_db_name in {('t_and', 't_filter_and'), ('t_not', 't_filter_not')}: + filter_db = getattr(db, filter_db_name) + if param_name in postvars.keys(): + for target in postvars[param_name]: + if len(target) > 0 and not target in filter_db: + filter_db += [target] + if len(filter_db) == 0: + params_to_encode += [(param_name, '-')] + params_to_encode += [(param_name, f) for f in filter_db] + + def collect_checked(prefix, postvars): + tags_checked = [] + for k in postvars.keys(): + if k.startswith(prefix): + tags_checked += [k[len(prefix):]] + return tags_checked + + if parsed_url.path == app_config['prefix'] + '/calendar': + params_to_encode += [('start', postvars['start'][0] if len(postvars['start'][0]) > 0 else '-')] + params_to_encode += [('end', postvars['end'][0] if len(postvars['end'][0]) > 0 else '-')] + + elif parsed_url.path == app_config['prefix'] + '/todo': task_uuid = postvars['task_uuid'][0] date = postvars['date'][0] - db.update_todo(task_uuid, date, postvars['day_weight'][0], 'done' in postvars.keys(), postvars['comment'][0]) - homepage = f'{prefix}/todo?task={task_uuid}&date={date}' - elif parsed_url.path == prefix + '/task': + params_to_encode += [('task', task_uuid), ('date', date)] + db.update_todo(task_uuid, date, postvars['day_effort'][0], 'done' in postvars.keys(), postvars['comment'][0], postvars['joined_day_tags'][0], collect_checked('day_tag_', postvars), postvars['importance'][0]) + + elif parsed_url.path == app_config['prefix'] + '/task': id_ = postvars['id'][0] - db.update_task(id_, postvars['title'][0], postvars['default_weight'][0], postvars['tags'][0]) - homepage = f'{prefix}/task?id={id_}' - elif parsed_url.path in {prefix + '/tasks', prefix + '/day'}: - if 't_filter_and' in postvars.keys(): - for target in postvars['t_filter_and']: - db.t_filter_and.add(target) - if 't_filter_not' in postvars.keys(): - for target in postvars['t_filter_not']: - db.t_filter_not.add(target) - if 'hide_unchosen' in postvars.keys(): - db.hide_unchosen = True - data = [('t_and', f) for f in db.t_filter_and] + [('t_not', f) for f in db.t_filter_not] + [('hide_unchosen', int(db.hide_unchosen))] - if parsed_url.path == prefix + '/tasks': - encoded_params = urlencode(data) - homepage = f'{prefix}/tasks?{encoded_params}' - elif parsed_url.path == prefix + '/day': - db.switch_to_day(postvars['original_selected_date'][0]) - new_selected_date = postvars['new_selected_date'][0] - try: - datetime.strptime(new_selected_date, '%Y-%m-%d') - except ValueError: - raise PlomException(f"{prefix} bad date string: {new_selected_date}") - if new_selected_date != db.selected_date: - if new_selected_date in db.days.keys(): - raise PlomException('cannot use same date twice') - else: - db.days[new_selected_date] = db.selected_day - del db.days[db.selected_date] - db.selected_date = new_selected_date - for i, uuid in enumerate(postvars['t_uuid']): - t = db.tasks[uuid] - if uuid in db.selected_day.todos.keys() and ((not 'choose' in postvars) or uuid not in postvars['choose']): - del db.selected_day.todos[uuid] - if 'choose' in postvars.keys(): - for i, uuid in enumerate(postvars['t_uuid']): - if uuid in postvars['choose']: - done = 'done' in postvars and uuid in postvars['done'] - db.update_todo(uuid, db.selected_date, postvars['day_weight'][i], done, postvars['todo_comment'][i]) - if 'comment' in postvars.keys(): - db.selected_day.comment = postvars['comment'][0] - data += [('date', db.selected_date)] - encoded_params = urlencode(data) - homepage = f'{prefix}/day?{encoded_params}' + params_to_encode += [('id', id_)] + if 'title' in postvars.keys(): + db.update_task(id_, postvars['title'][0], postvars['default_effort'][0], postvars['joined_tags'][0], collect_checked('tag_', postvars), collect_checked('link_', postvars)) + + elif parsed_url.path == app_config['prefix'] + '/day': + if 'expect_unchosen_done' in postvars.keys(): + params_to_encode += [('hide_unchosen', int('hide_unchosen' in postvars.keys()))] + [('hide_done', int('hide_done' in postvars.keys()))] + if 'selected_date' in postvars.keys(): + db.selected_date = postvars['selected_date'][0] + if 't_uuid' in postvars.keys(): + for i, uuid in enumerate(postvars['t_uuid']): + t = db.tasks[uuid] + if uuid in db.selected_day.todos.keys() and ((not 'choose' in postvars) or uuid not in postvars['choose']) and not db.selected_day.todos[uuid].is_empty(): + del db.selected_day.todos[uuid] + if 'choose' in postvars.keys(): + for i, uuid in enumerate(postvars['t_uuid']): + uuids = postvars['choose'] + postvars['done'] if 'done' in postvars.keys() else [] + if uuid in uuids or postvars['day_effort'][i] != '' or postvars['importance'][i] != '1.0': + done = 'done' in postvars and uuid in postvars['done'] + db.update_todo_mini(uuid, db.selected_date, postvars['day_effort'][i], done, postvars['importance'][i]) + if 'day_comment' in postvars.keys(): + db.selected_day.comment = postvars['day_comment'][0] + params_to_encode += [('selected_date', db.selected_date)] + + encoded_params = urlencode(params_to_encode) + homepage = f'{parsed_url.path}?{encoded_params}' db.write() self.redirect(homepage) - # db = TodoDB(prefix=prefix, selected_date=postvars['original_selected_date'][0]) - # # import pprint - # # pp = pprint.PrettyPrinter(indent=4) - # # pp.pprint(postvars) - # db.t_filter_and = set() - # db.t_filter_not = set() - # if 't_filter_and' in postvars.keys(): - # for target in postvars['t_filter_and']: - # db.t_filter_and.add(target) - # if 't_filter_not' in postvars.keys(): - # for target in postvars['t_filter_not']: - # db.t_filter_not.add(target) - # if 'hide_unchosen' in postvars.keys(): - # db.hide_unchosen = True - # if 't_uuid' in postvars.keys(): - # new_postvars_t_uuid = postvars['t_uuid'].copy() - # for i, uuid in enumerate(postvars['t_uuid']): - # if len(uuid) < 36 and len(postvars['t_title'][i]) > 0: - # new_uuid, t = db.add_task(return_id=True) - # new_postvars_t_uuid[i] = new_uuid - # for key in [k for k in postvars.keys() if not k == 't_uuid']: - # if uuid in postvars[key]: - # uuid_index = postvars[key].index(uuid) - # postvars[key][uuid_index] = new_uuid - # postvars['t_uuid'] = new_postvars_t_uuid - # for i, uuid in enumerate(postvars['t_uuid']): - # if len(uuid) < 36: - # continue - # t = db.tasks[uuid] - # t.set_title(postvars['t_title'][i]) - # t.tags_from_joined_string(postvars['t_tags'][i]) - # t.set_default_weight(float(postvars['t_default_weight'][i])) - # if uuid in db.selected_day.todos.keys() and ((not 'choose' in postvars) or uuid not in postvars['choose']): - # del db.selected_day.todos[uuid] - # if 'choose' in postvars.keys(): - # for i, uuid in enumerate(postvars['t_uuid']): - # if uuid in postvars['choose']: - # done = 'done' in postvars and uuid in postvars['done'] - # day_weight = float(postvars['day_weight'][i]) if postvars['day_weight'][i] else None - # db.selected_day.add_todo(uuid, {'done': done, 'day_weight': day_weight}) - - # if 'comment' in postvars.keys(): - # db.selected_day.comment = postvars['comment'][0] - # if 'new_selected_date' in postvars.keys(): - # new_selected_date = postvars['new_selected_date'][0] - # try: - # datetime.strptime(new_selected_date, '%Y-%m-%d') - # except ValueError: - # raise PlomException(f"{prefix} bad date string: {new_selected_date}") - # if new_selected_date != db.selected_date: - # if new_selected_date in db.days.keys(): - # raise PlomException('cannot use same date twice') - # else: - # db.days[new_selected_date] = db.selected_day - # del db.days[db.selected_date] - # db.selected_date = new_selected_date - - # switch_edited_day = None - # day_edit_prefix = 'edit_' - # for k in postvars.keys(): - # if k.startswith(day_edit_prefix): - # switch_edited_day = k[len(day_edit_prefix):] - # db.switch_to_day(switch_edited_day) - # break - # db.write() - # data = [('t_and', f) for f in db.t_filter_and] + [('t_not', f) for f in db.t_filter_not] + [('hide_unchosen', int(db.hide_unchosen))] + [('date', db.selected_date)] - # encoded_params = urlencode(data) - # if prefix + '/day' == parsed_url.path: - # homepage = f'{prefix}/day?{encoded_params}' - # else: - # homepage = f'{prefix}/all?{encoded_params}' - # self.redirect(homepage) def do_GET(self): + self.try_do(self.config_init) self.try_do(self.show_db) def show_db(self): - prefix = self.apps['todo'] if hasattr(self, 'apps') else '' + app_config = self.apps['todo'] if hasattr(self, 'apps') else self.config() + cookie_db = self.get_cookie_db(app_config['cookie_name']) parsed_url = urlparse(self.path) params = parse_qs(parsed_url.query) - selected_date = params.get('date', [None])[0] - t_filter_and = set(params.get('t_and', [])) - t_filter_not = set(params.get('t_not', ['deleted'])) - hide_unchosen_params = params.get('hide_unchosen', []) - hide_unchosen = len(hide_unchosen_params) > 0 and hide_unchosen_params[0] != '0' - db = TodoDB(prefix, selected_date, t_filter_and, t_filter_not, hide_unchosen) - if parsed_url.path == prefix + '/day': - page = db.show_day() - elif parsed_url.path == prefix + '/todo': + + def get_param(param_name, boolean=False, chained=False): + if chained: + param = params.get(param_name, None) + else: + param = params.get(param_name, [None])[0] + if (not chained and param == '-') or (chained and param == ['-']): + param = None + if param_name in cookie_db.keys(): + del cookie_db[param_name] + if param is None and param_name in cookie_db.keys(): + param = cookie_db[param_name] + if param is not None: + if boolean: + param = param != '0' + cookie_db[param_name] = str(int(param)) + else: + cookie_db[param_name] = param + elif param is boolean: + param = False + return param + + selected_date = t_filter_and = t_filter_not = None + hide_unchosen = hide_done = False + if parsed_url.path in {app_config['prefix'] + '/day', app_config['prefix'] + '/tasks'}: + selected_date = get_param('selected_date') + if parsed_url.path in {app_config['prefix'] + '/day', app_config['prefix'] + '/tasks', app_config['prefix'] + '/task'}: + t_filter_and = get_param('t_and', chained=True) + t_filter_not = get_param('t_not', chained=True) + if parsed_url.path == app_config['prefix'] + '/day': + hide_unchosen = get_param('hide_unchosen', boolean=True) + hide_done = get_param('hide_done', boolean=True) + db = TodoDB(app_config['prefix'], selected_date, t_filter_and, t_filter_not, hide_unchosen, hide_done) + if parsed_url.path == app_config['prefix'] + '/day': + task_sort = get_param('sort') + page = db.show_day(task_sort) + elif parsed_url.path == app_config['prefix'] + '/todo': + todo_date = params.get('date', [None])[0] task_uuid = params.get('task', [None])[0] - page = db.show_todo(task_uuid, selected_date) - elif parsed_url.path == prefix + '/task': + page = db.show_todo(task_uuid, todo_date) + elif parsed_url.path == app_config['prefix'] + '/task': id_ = params.get('id', [None])[0] page = db.show_task(id_) - elif parsed_url.path == prefix + '/tasks': + elif parsed_url.path == app_config['prefix'] + '/tasks': page = db.show_tasks() - elif parsed_url.path == prefix + '/add_task': + elif parsed_url.path == app_config['prefix'] + '/add_task': page = db.show_task(None) - else: - start_date = params.get('start', [None])[0] - end_date = params.get('end', [None])[0] + elif parsed_url.path == app_config['prefix'] + '/unset_cookie': + page = 'no cookie to unset.' + if len(cookie_db) > 0: + self.unset_cookie(app_config['cookie_name'], app_config['cookie_path']) + page = 'cookie unset!' + else: + start_date = get_param('start') + start_date = start_date if start_date else 'today' + end_date = get_param('end') page = db.show_calendar(start_date, end_date) - header = Template(html_head).render(db=db, prefix=prefix, date=selected_date) - self.send_HTML(header + page) + if parsed_url.path != app_config['prefix'] + '/unset_cookie': + self.set_cookie(app_config['cookie_name'], app_config['cookie_path'], cookie_db) + self.send_HTML(page) -if __name__ == "__main__": +if __name__ == "__main__": run_server(server_port, TodoHandler)