X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=todo.py;h=42639a11c9f28fdfbe34991af191e3bd8dc122ee;hb=472874343c229fc77136e1cc3bae5a1d8bc543f9;hp=08fb8b82f6e3921ce6d75c3e86428d31c6398902;hpb=2960beb644986049fd975eac8e348ca61ab122b8;p=misc diff --git a/todo.py b/todo.py index 08fb8b8..42639a1 100644 --- a/todo.py +++ b/todo.py @@ -1,62 +1,172 @@ from plomlib import PlomDB, run_server, PlomHandler, PlomException import json from uuid import uuid4 -from datetime import datetime +from datetime import datetime, timedelta from urllib.parse import parse_qs +from jinja2 import Template +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 +DATE_FORMAT = '%Y-%m-%d' -tmpl = """ +html_head = """ -' +form_header_tmpl = """ +

+""" +calendar_tmpl = """ +

+from: +to: + +

+ +{% for date, day in days.items() | sort() %} +{% if day.weekday == "Mo" %}{% endif %} + +{% for task, todo in day.todos.items() | sort(attribute='1.title', reverse=True) %} +{% if todo.visible %} + +{% endif %} {% endfor %} -
-forbidden tags: {% for t_tag in db.t_tags | sort %} -{{ t_tag }} {% endfor %} +


{{ day.weekday }} {{ date }} \|{{ '%04.1f' % 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 = """ + - - -{% for uuid, t in db.tasks.items() | sort(attribute='1.title', reverse=True) %} + + + +

weight	title	tags	day weight
		date	archive?	{{ db.today.todos_sum\|round(2) }}	comment:
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 %}

+ +""" +day_tmpl = """ +

+ hide unchosen hide done | +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') %} {% if t.visible %} - - - - - - + + + + + + {% endif %} {% endfor %}

task	choose?	done?	weight	comment
		-					] {{ t.current_title\|e }} tags: {% for tag in t.tags \| sort %}{{ tag }} {% endfor %}

- - -{% for date, day in db.old_days.items() | sort(reverse=True) %} - -{% for task, todo in day.todos.items() | sort(attribute='1.title', reverse=True) %} - +""" +tag_filters_tmpl = """ +

+ +

+mandatory tags: +{% for and_filter in db.t_filter_and %} + +{% endfor %} + +
+forbidden tags: +{% for not_filter in db.t_filter_not %} + +{% endfor %} + +

+""" +tasks_tmpl = """ +

{{ date }} ({{ day.todos_sum\|round(2) }}) {{ day.comment\|e }}
{{ todo.title }}	{% if todo.done %}â{% endif %}	{{ todo.weight }}

+ +{% for uuid, t in db.tasks.items() | sort(attribute='1.title') %} +{% if t.visible %} + + + + +{% endif %} {% endfor %}

default weight	task	tags
{{ t.default_weight }}	{{ t.title\|e }}	{% for tag in t.tags \| sort %}{{ tag }} {% endfor %}

""" class Task: - def __init__(self, title_history={}, tags_history={}, default_weight_history={}): - self.title_history = title_history.copy() - self.tags_history = tags_history.copy() - self.default_weight_history = default_weight_history.copy() + def __init__(self, db, title_history=None, tags_history=None, default_weight_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.visible = True def _set_with_history(self, history, value): @@ -69,70 +179,101 @@ class Task: return default if 0 == len(history) else history[keys[-1]] @classmethod - def from_dict(cls, d): + 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']) - def tags_from_joined_string(self, tags_string): - tags = set() - for tag in [tag.strip() for tag in tags_string.split(';') if tag.strip() != '']: - tags.add(tag) - self.set_tags(tags) - @property - def tags_joined(self): - return ';'.join(sorted(list(self.tags))) + def default_weight(self): + return self._last_of_history(self.default_weight_history, 1) - def set_default_weight(self, default_weight): + @default_weight.setter + def default_weight(self, default_weight): self._set_with_history(self.default_weight_history, default_weight) - @property - def default_weight(self): - return self._last_of_history(self.default_weight_history, 1) + 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(): + if date_key > f'{queried_date} 23:59:59': + break + ret = default_weight + return ret - def set_title(self, title): - self._set_with_history(self.title_history, title) + @property + def current_default_weight(self): + return self.default_weight_at(self.db.selected_date) @property def title(self): return self._last_of_history(self.title_history, '') - def set_tags(self, tags): - self._set_with_history(self.tags_history, set(tags)) + @title.setter + def title(self, title): + self._set_with_history(self.title_history, title) + + def title_at(self, queried_date): + 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 + ret = title + return ret + + @property + def current_title(self): + return self.title_at(self.db.selected_date) @property def tags(self): return self._last_of_history(self.tags_history, set()) + @tags.setter + def tags(self, tags): + 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 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} + @property + def id_(self): + for k, v in self.db.tasks.items(): + if v == self: + return k + class Day: - def __init__(self, todos, comment=''): - self.todos = todos + def __init__(self, db, todos=None, comment=''): + self.db = db + self.todos = todos if todos else {} self.comment = comment + self.archived = True @classmethod - def from_dict(cls, d): + def from_dict(cls, db, d): todos = {} comment = d['comment'] if 'comment' in d.keys() else '' + day = cls(db, todos, comment) for uuid, todo_dict in d['todos'].items(): - todos[uuid] = Todo.from_dict(todo_dict) - return cls(todos, comment) - - @property - def todos_sum(self): - s = 0 - for todo in [todo for todo in self.todos.values() if (todo.done or todo.day_weight)]: - s += todo.weight - return s + day.add_todo(uuid, todo_dict) + return day def to_dict(self): d = {'comment': self.comment, 'todos': {}} @@ -140,72 +281,199 @@ class Day: d['todos'][task_uuid] = todo.to_dict() return d + def add_todo(self, id_, dict_source=None): + self.todos[id_] = Todo.from_dict(self, dict_source) if dict_source else Todo(self) + return self.todos[id_] + + 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 + 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 + return s + + @property + def todos_sum(self): + return self._todos_sum() + + @property + def todos_sum2(self): + return self._todos_sum(True) + + @property + def date(self): + for k, v in self.db.days.items(): + if v == self: + return k class Todo: - def __init__(self, done=False, day_weight=None): + def __init__(self, day, done=False, day_weight=None, comment=''): + self.day = day self.done = done self.day_weight = day_weight + self.comment = comment @classmethod - def from_dict(cls, d): - return cls(d['done'], d['day_weight']) + def from_dict(cls, day, d): + return cls(day, d['done'], d['day_weight'], d['comment']) def to_dict(self): - return {'done': self.done, 'day_weight': self.day_weight} + return {'done': self.done, 'day_weight': self.day_weight, 'comment': self.comment} + + @property + def default_weight(self): + return self.task.default_weight_at(self.day.date) + + @property + def weight(self): + if self.day_weight: + return self.day_weight + else: + return self.day_weight if self.day_weight else self.default_weight + + @property + def task(self): + for k, v in self.day.todos.items(): + if v == self: + return self.day.db.tasks[k] + + @property + def title(self): + return self.task.title_at(self.day.date) class TodoDB(PlomDB): - def __init__(self, t_filter_and = set(), t_filter_not = set()): - self.t_filter_and = t_filter_and - self.t_filter_not = t_filter_not - self.old_days = {} + 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 [] + 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.reset_today() self.t_tags = set() super().__init__(db_path) def read_db_file(self, f): d = json.load(f) - self.today = Day.from_dict(d['today']) - self.today_date = d['today_date'] + for date, day_dict in d['days'].items(): + self.days[date] = self.add_day(dict_source=day_dict) for uuid, t_dict in d['tasks'].items(): - t = Task.from_dict(t_dict) - self.tasks[uuid] = t + 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 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)\ + and ((not self.hide_done) or (uuid in self.selected_day.todos and not self.selected_day.todos[uuid].done)) for tag in t.tags: self.t_tags.add(tag) - for date, day_dict in d['old_days'].items(): - self.old_days[date] = Day.from_dict(day_dict) def to_dict(self): d = { - 'today': self.today.to_dict(), - 'today_date': self.today_date, - 't_filter_and': list(self.t_filter_and), - 't_filter_not': list(self.t_filter_not), + 't_filter_and': self.t_filter_and, + 't_filter_not': self.t_filter_not, 'tasks': {}, - 'old_days': {} + 'days': {} } for uuid, t in self.tasks.items(): d['tasks'][uuid] = t.to_dict() - for date, day in self.old_days.items(): - d['old_days'][date] = day.to_dict() + for date, day in self.days.items(): + d['days'][date] = day.to_dict() return d + @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 change_selected_days_date(self, new_date): + if new_date in self.days.keys(): + raise PlomException('cannot use same date twice') + else: + self.days[new_date] = self.selected_day + del self.days[self.selected_date] + self.selected_date = new_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 reset_today(self, date=None): - if date: - self.today_date = date - self.today = self.old_days[date] - del self.old_days[date] + 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: + return t + + def add_day(self, dict_source=None): + return Day.from_dict(self, dict_source) if dict_source else Day(self) + + def show_day(self): + 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) + return Template(form_header_tmpl + tag_filters_tmpl + day_tmpl + form_footer).render(db=self, action=self.prefix+'/day', prev_date=prev_date_str, next_date=next_date_str) + + def show_calendar(self, start_date_str, end_date_str): + 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, 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(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, DATE_FORMAT).strftime('%A')[:2] + for task_uuid, todo in days_to_show[current_date].todos.items(): + todo.visible = self.tasks[task_uuid].visible + return Template(form_header_tmpl + calendar_tmpl + form_footer).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') + + def update_todo(self, task_uuid, date, day_weight, done, comment): + if task_uuid in self.days[date].todos.keys(): + todo = self.days[date].todos[task_uuid] else: - self.today_date = str(datetime.now())[:10] - self.today = Day({}) + todo = self.days[date].add_todo(task_uuid) + todo.day_weight = float(day_weight) if len(day_weight) > 0 else None + todo.done = done + todo.comment = comment + + 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') + + def update_task(self, id_, title, default_weight, tags_joined): + 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 + + def show_tasks(self): + return Template(form_header_tmpl + tag_filters_tmpl + tasks_tmpl + form_footer).render(db=self, action=self.prefix+'/tasks') + class TodoHandler(PlomHandler): @@ -221,93 +489,106 @@ class TodoHandler(PlomHandler): def write_db(self): from urllib.parse import urlencode - db = TodoDB() + prefix = self.apps['todo'] if hasattr(self, 'apps') else '' 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 + '/calendar': + start = postvars['start'][0] if len(postvars['start'][0]) > 0 else '' + end = postvars['end'][0] if len(postvars['end'][0]) > 0 else '' + homepage = f'{prefix}/calendar?t_and=calendar&start={start}&end={end}' + + elif parsed_url.path == 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': + 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'}: + for target in postvars['t_and']: + if not target in db.t_filter_and: + db.t_filter_and += [target] + for target in postvars['t_not']: + if not target in db.t_filter_not: + db.t_filter_not += [target] + if 'hide_unchosen' in postvars.keys(): + db.hide_unchosen = True + if 'hide_done' in postvars.keys(): + db.hide_done = 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))] + [('hide_done', int(db.hide_done))] + + if parsed_url.path == prefix + '/tasks': + encoded_params = urlencode(data) + homepage = f'{prefix}/tasks?{encoded_params}' + + elif parsed_url.path == prefix + '/day': + db.selected_date = postvars['original_selected_date'][0] + new_selected_date = postvars['new_selected_date'][0] + try: + datetime.strptime(new_selected_date, DATE_FORMAT) + except ValueError: + raise PlomException(f"{prefix} bad date string: {new_selected_date}") + if new_selected_date != db.selected_date: + db.change_selected_days_date(new_selected_date) + 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']): + 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 'day_comment' in postvars.keys(): + db.selected_day.comment = postvars['day_comment'][0] + data += [('date', db.selected_date)] + encoded_params = urlencode(data) + homepage = f'{prefix}/day?{encoded_params}' - 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 '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: - t = Task() - new_uuid = str(uuid4()) - db.tasks[new_uuid] = t - 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.today.todos.keys() and ((not 'do_today' in postvars) or uuid not in postvars['do_today']): - del db.today.todos[uuid] - if 'do_today' in postvars.keys(): - for i, uuid in enumerate(postvars['t_uuid']): - if uuid in postvars['do_today']: - done = 'done' in postvars and uuid in postvars['done'] - day_weight = float(postvars['day_weight'][i]) if postvars['day_weight'][i] else None - db.today.todos[uuid] = Todo(done, day_weight) - db.today_date = postvars['today_date'][0] - db.today.comment = postvars['comment'][0] - switch_edited_day = None - for date in db.old_days.keys(): - if f'edit_{date}' in postvars.keys(): - switch_edited_day = date - break - if 'archive_today' in postvars.keys() or switch_edited_day: - if db.today_date in db.old_days.keys(): - raise PlomException('cannot use same date twice') - db.old_days[db.today_date] = db.today - if switch_edited_day: - db.reset_today(date) - else: - db.reset_today() db.write() - homepage = self.apps['todo'] if hasattr(self, 'apps') else self.homepage - data = [('t_and', f) for f in db.t_filter_and] + [('t_not', f) for f in db.t_filter_not] - encoded_params = urlencode(data) - homepage += '?' + encoded_params self.redirect(homepage) def do_GET(self): self.try_do(self.show_db) def show_db(self): - from jinja2 import Template - from urllib.parse import urlparse + prefix = self.apps['todo'] if hasattr(self, 'apps') else '' parsed_url = urlparse(self.path) params = parse_qs(parsed_url.query) - t_filter_and = set(params.get('t_and', [])) - t_filter_not = set(params.get('t_not', ['deleted'])) - db = TodoDB(t_filter_and, t_filter_not) - for i in range(10): - db.tasks[f'new{i}'] = Task() - for task_uuid, todo in db.today.todos.items(): - todo.weight = todo.day_weight if todo.day_weight else db.tasks[task_uuid].default_weight - for date, day in db.old_days.items(): - for task_uuid, todo in day.todos.items(): - todo.title = db.tasks[task_uuid].title - todo.weight = todo.day_weight if todo.day_weight else db.tasks[task_uuid].default_weight - page = Template(tmpl).render(db=db) - self.send_HTML(page) + selected_date = params.get('date', [None])[0] + t_filter_and = params.get('t_and', []) + t_filter_not = 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' + hide_done_params = params.get('hide_done', []) + hide_done = len(hide_done_params) > 0 and hide_done_params[0] != '0' + db = TodoDB(prefix, selected_date, t_filter_and, t_filter_not, hide_unchosen, hide_done) + if parsed_url.path == prefix + '/day': + page = db.show_day() + elif parsed_url.path == prefix + '/todo': + task_uuid = params.get('task', [None])[0] + page = db.show_todo(task_uuid, selected_date) + elif parsed_url.path == prefix + '/task': + id_ = params.get('id', [None])[0] + page = db.show_task(id_) + elif parsed_url.path == prefix + '/tasks': + page = db.show_tasks() + elif parsed_url.path == prefix + '/add_task': + page = db.show_task(None) + else: + start_date = params.get('start', [None])[0] + end_date = params.get('end', [None])[0] + 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 __name__ == "__main__":