-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 = """
-<style>
-tr:nth-child(even) {
- background-color: #f2f2f2;
-}
-tr:nth-child(odd) {
- background-color: #ffffff;
-}
-th, td { border: 1px solid black; text-align: left; vertical_align: top; }
-td details { display: inline }
-td.input { width: 100%; }
-td.checkbox { width: 1.5em; }
-th.checkbox { width: 1.5em; }
-input[type="text"] { width: 100%; box-sizing: border-box; }
-</style>
-<body>
-tasks: <a href="{{db.prefix}}/tasks">list</a> <a href="{{db.prefix}}/add_task">add</a> | day:
-<a href="{{db.prefix}}/day{% if date %}?date={{date}}{% endif %}">choose tasks</a>
-<a href="{{db.prefix}}/day?{% if date %}date={{date}}&{% endif %}hide_unchosen=1">do tasks</a>
-| <a href="{{db.prefix}}/calendar?t_and=calendar">calendar</a>
-<hr />
-"""
-form_footer = '\n</form>'
-
-form_header_tmpl = """
-<form action="{{action|e}}" method="POST">
-"""
-calendar_tmpl = """
-<table>
-{% for date, day in days.items() | sort(reverse=True) %}
-<tr><td colspan=3><a href="{{db.prefix}}/day?date={{date}}&hide_unchosen=1">{{ date }}</a> {{ day.weekday }} ({{ day.todos_sum|round(2) }}) {{ day.comment|e }}</td></tr>
-{% for task, todo in day.todos.items() | sort(attribute='1.title', reverse=True) %}
-{% if todo.visible %}
-<tr><td class="checkbox">{% if todo.done %}✓{% else %} {% endif %}</td><td><a href="{{db.prefix}}/todo?task={{ todo.task.id_ }}&date={{ date }}">{{ todo.title }}</a></td><td>{{ todo.comment|e }}</td></tr>
-{% endif %}
-{% endfor %}
-{% endfor %}
-</table>
-"""
-todo_tmpl = """
-<input type="hidden" name="task_uuid" value="{{ todo.task.id_ }}" />
-<input type="hidden" name="date" value="{{ todo.day.date }}" />
-<table>
-<tr><th>task</th><td><a href="{{db.prefix}}/task?id={{ todo.task.id_ }}">{{ todo.task.title|e }}</a></td></tr>
-<tr><th>default weight</th><td>{{ todo.default_weight }}</td></tr>
-<tr><th>day</th><td>{{ todo.day.date }}</td></tr>
-<tr><th>day weight</th><td class="input"><input type="number" name="day_weight" step=0.1 size=5 value="{{ todo.day_weight }}" /></td></tr>
-<tr><th>comment</th><td class="input"><input type="text" name="comment" value="{{todo.comment|e}}" /></td></tr>
-<tr><th>done</th><td class="input"><input type="checkbox" name="done" {% if todo.done %}checked{% endif %}/></td></tr>
-</table>
-<input type="submit" value="update" />
-"""
-task_tmpl = """
-<input type="hidden" name="id" value="{{ task.id_ }}" />
-<table>
-<tr><th>title</th><td class="input"><input name="title" type="text" value="{{ task.title|e }}" /><details><summary>history</summary><ul>{% for k,v in task.title_history.items() | sort(attribute='0', reverse=True) %}<li>{{ k }}: {{ v|e }}{% endfor %}</ul></details></td></tr>
-<tr><th>default weight</th><td class="input"><input type="number" name="default_weight" value="{{ task.default_weight }}" step=0.1 size=5 required /><details><summary>history</summary><ul>{% for k,v in task.default_weight_history.items() | sort(attribute='0', reverse=True) %}<li>{{ k }}: {{ v|e }}{% endfor %}</ul></details></td></tr>
-<tr><th>tags</th><td class="input"><input name="tags" type="text" value="{{ task.tags_joined|e }}" ><details><summary>history</summary><ul>{% for k,v in task.tags_history.items() | sort(attribute='0', reverse=True) %}<li>{{ k }}: {{ v|e }}{% endfor %}</ul></details></td></tr>
-</table>
-<input type="submit" value="update" />
-"""
-# archived_days_tmpl = """
-# <table>
-# {% for date, day in days.items() | sort(reverse=True) %}
-# {% if day.archived %}
-# <tr><td>{{ date }} {{ day.weekday }} ({{ day.todos_sum|round(2) }}) {{ day.comment|e }} <input type="submit" name="edit_{{date}}" value="edit" /></td></tr>
-# {% for task, todo in day.todos.items() | sort(attribute='1.title', reverse=True) %}
-# <tr><td>{{ todo.title }}</td><td>{% if todo.done %}✓{% endif %}</td><td>{{ todo.weight }}</td></tr>
-# {% endfor %}
-# {% endif %}
-# {% endfor %}
-# </table>
-# """
-day_tmpl = """
-<input type="submit" value="OK">
-hide unchosen: <input name="hide_unchosen" type="checkbox" {% if db.hide_unchosen %}checked{% endif %} /><br />
-mandatory tags: {% for t_tag in db.t_tags | sort %}
-<input name="t_filter_and" type="checkbox" value="{{ t_tag }}" {% if t_tag in db.t_filter_and %} checked {% endif %} >{{ t_tag }}
-{% endfor %}
-<br />
-forbidden tags: {% for t_tag in db.t_tags | sort %}
-<input name="t_filter_not" type="checkbox" value="{{ t_tag }}" {% if t_tag in db.t_filter_not %} checked {% endif %} >{{ t_tag }}
-{% endfor %}
-</p>
-
-<p>
-<input type="hidden" name="original_selected_date" value="{{ db.selected_date }}" />
-<a href="{{db.prefix}}/day?date={{prev_date}}{% if db.hide_unchosen %}&hide_unchosen=1{% endif %}">prev</a> <a href="{{db.prefix}}/day?date={{next_date}}{% if db.hide_unchosen %}&hide_unchosen=1{% endif %}">next</a> date: <input name="new_selected_date" value="{{ db.selected_date }}" size=8 /> {{ db.selected_day.todos_sum|round(2) }} ({{ db.selected_day.todos_sum2|round(2)}}) comment: <input name="comment" value="{{ db.selected_day.comment|e }}">
-</p>
-
-<table>
-<tr><th>task</th><th class="checkbox">choose?</th><th class="checkbox">done?</th><th>weight</th><th>comment</th></tr>
-{% for uuid, t in db.tasks.items() | sort(attribute='1.title', reverse=True) %}
-{% if t.visible %}
-<tr>
-<input name="t_uuid" value="{{ uuid }}" type="hidden" >
-<td><details><summary>] <a href="{{db.prefix}}/task?id={{ uuid }}" />{{ t.current_title|e }}</a></summary>tags: {% for tag in t.tags | sort %}<a href="{{db.prefix}}/day?date={{ db.selected_date }}&t_and={{tag|e}}">{{ tag }}</a> {% endfor %}</details></td>
-<td><input name="choose" type="checkbox" value="{{ uuid }}" {% if uuid in db.selected_day.todos.keys() %}checked{% endif %} ></td>
-<td class="checkbox"><input name="done" type="checkbox" value="{{ uuid }}" {% if uuid in db.selected_day.todos.keys() and db.selected_day.todos[uuid].done %}checked{% endif %} ></td>
-<td class="checkbox"><input name="day_weight" type="number" step=0.1 size=5 value="{% if uuid in db.selected_day.todos.keys() and db.selected_day.todos[uuid].day_weight %}{{ db.selected_day.todos[uuid].day_weight }}{% endif %}" placeholder={{ t.current_default_weight }} ></td>
-<td type="input"><input name="todo_comment" type="text" value="{% if uuid in db.selected_day.todos.keys() %}{{ db.selected_day.todos[uuid].comment|e }}{% endif %}" ></td>
-</tr>
-{% endif %}
-{% endfor %}
-</table>
-<input type="submit" value="OK">
-"""
-tasks_tmpl = """
-<p>
-<input type="submit" value="OK"> mandatory tags: {% for t_tag in db.t_tags | sort %}
-<input name="t_filter_and" type="checkbox" value="{{ t_tag }}" {% if t_tag in db.t_filter_and %} checked {% endif %} >{{ t_tag }}
-{% endfor %}
-<br />
-forbidden tags: {% for t_tag in db.t_tags | sort %}
-<input name="t_filter_not" type="checkbox" value="{{ t_tag }}" {% if t_tag in db.t_filter_not %} checked {% endif %} >{{ t_tag }}
-{% endfor %}
-</p>
-<table>
-<tr><th>default<br />weight</th><th>task</th><th>tags</th></tr>
-{% for uuid, t in db.tasks.items() | sort(attribute='1.title', reverse=True) %}
-{% if t.visible %}
-<tr>
-<td>{{ t.default_weight }}</a></td>
-<td><a href="{{db.prefix}}/task?id={{ uuid }}" />{{ t.title|e }}</a></td>
-<td>{% for tag in t.tags | sort %}<a href="{{db.prefix}}/tags?t_and={{tag|e}}">{{ tag }}</a> {% endfor %}</td>
-{% endif %}
-{% endfor %}
-</table>
-"""
-# selected_day_tmpl = """
-# <p>
-# hide unchosen: <input name="hide_unchosen" type="checkbox" {% if db.hide_unchosen %}checked{% endif %} /><br />
-# mandatory tags: {% for t_tag in db.t_tags | sort %}
-# <input name="t_filter_and" type="checkbox" value="{{ t_tag }}" {% if t_tag in db.t_filter_and %} checked {% endif %} >{{ t_tag }}
-# {% endfor %}
-# <br />
-# forbidden tags: {% for t_tag in db.t_tags | sort %}
-# <input name="t_filter_not" type="checkbox" value="{{ t_tag }}" {% if t_tag in db.t_filter_not %} checked {% endif %} >{{ t_tag }}
-# {% endfor %}
-# </p>
-#
-# <p>
-# <input type="hidden" name="original_selected_date" value="{{ db.selected_date }}" />
-# date: <input name="new_selected_date" value="{{ db.selected_date }}" size=8 /> {{ db.selected_day.todos_sum|round(2) }} ({{ db.selected_day.todos_sum2|round(2)}}) comment: <input name="comment" value="{{ db.selected_day.comment|e }}">
-# </p>
-#
-# <table>
-# <tr><th>default<br />weight</th><th>title</th><th>tags</th><th>choose?</th><th>done?</th><th>day<br />weight</th></tr>
-# {% for uuid, t in db.tasks.items() | sort(attribute='1.title', reverse=True) %}
-# {% if t.visible %}
-# <input name="t_uuid" value="{{ uuid }}" type="hidden" >
-# <tr>
-# <td><input name="t_default_weight" value="{{ t.default_weight }}" type="number" step=0.1 size=5 required/></td>
-# <td><input name="t_title" value="{{ t.title|e }}"/></td>
-# <td><input name="t_tags" value="{{ t.tags_joined|e }}" >
-# <td><input name="choose" type="checkbox" value="{{ uuid }}" {% if uuid in db.selected_day.todos.keys() %}checked{% endif %} ></td>
-# <td><input name="done" type="checkbox" value="{{ uuid }}" {% if uuid in db.selected_day.todos.keys() and db.selected_day.todos[uuid].done %}checked{% endif %} ></td>
-# <td colspan=2><input name="day_weight" type="number" step=0.1 size=5 value="{% if uuid in db.selected_day.todos.keys() and db.selected_day.todos[uuid].day_weight %}{{ db.selected_day.todos[uuid].day_weight }}{% endif %}" ></td>
-# </tr>
-# {% endif %}
-# {% endfor %}
-# </table>
-# <input type="submit" value="OK">
-# """
+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):
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):
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
self._set_with_history(self.tags_history, set(tags))
@property
- def tags_joined(self):
- return ';'.join(sorted(list(self.tags)))
+ def links(self):
+ return self._last_of_history(self.links_history, set())
- @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}
+ @links.setter
+ def links(self, links):
+ self._set_with_history(self.links_history, set(links))
@property
def id_(self):
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):
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
if v == self:
return k
+
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):
def title(self):
return self.task.title_at(self.day.date)
+ @property
+ def tags(self):
+ return self.day_tags | self.task.tags
+
+ def internals_empty(self):
+ return len(self.comment) == 0 and 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():
@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, sort=task_sort)
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)
-
- 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')
+ 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, referer):
+ if selected_date not in self.days.keys():
+ self.days[selected_date] = self.add_day()
+ 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', referer=referer)
- def update_todo(self, task_uuid, date, day_weight, done, comment):
+ def update_todo_mini(self, task_uuid, date, day_effort, done, importance):
+ if date not in self.days.keys():
+ self.days[date] = self.add_day()
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 = day_effort
+ todo.done = done
+ todo.importance = importance
+ return todo
- def show_task(self, id_):
+ 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):
+ day_effort = float(day_effort) if len(day_effort) > 0 else None
+ importance = float(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_, referer=''):
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', referer=referer)
- 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():
+ 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':
+ # always store the two hide params in the URL if possible … TODO: find out if really necessary
+ 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 'day_comment' in postvars.keys():
+ db.selected_day.comment = postvars['day_comment'][0]
+ params_to_encode += [('selected_date', db.selected_date)]
+
+ # handle todo list updates via task UUIDs
+ if 't_uuid' 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}'
+ task = db.tasks[uuid]
+ old_todo = None if not uuid in db.selected_day.todos.keys() else db.selected_day.todos[uuid]
+ selects_as_todo = 'choose' in postvars and uuid in postvars['choose']
+ too_much_keepworthy_data = ('done' in postvars and uuid in postvars['done']) or postvars['day_effort'][i] != '' or (old_todo and not old_todo.internals_empty())
+ if old_todo and too_much_keepworthy_data and not selects_as_todo:
+ raise PlomException('cannot deselect task as todo of preserve-worthy values')
+ elif old_todo and not selects_as_todo:
+ del db.selected_day.todos[uuid]
+ else:
+ done = ('done' in postvars) and (uuid in postvars['done'])
+ day_effort_input = postvars['day_effort'][i]
+ day_effort = float(day_effort_input) if len(day_effort_input) > 0 else None
+ importance = float(postvars['importance'][i])
+ if old_todo and old_todo.done == done and old_todo.day_effort == day_effort and old_todo.importance == importance:
+ continue
+ db.update_todo_mini(uuid, db.selected_date, day_effort, done, importance)
+
+ if 'referer' in postvars.keys() and len(postvars['referer'][0]) > 0:
+ homepage = postvars['referer'][0]
+ else:
+ 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
+ referer = params.get('referer', [''])[0]
+ 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, referer)
+ 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':
+ page = db.show_task(id_, referer)
+ 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)
projects / misc / blobdiff