提交: ae06d844044ab32a5fd40ee4cfb1aad533dacff2 - every (git)

An ADHD-friendly regular task tracker

Commit MetaInfo

• 修订版: ae06d844044ab32a5fd40ee4cfb1aad533dacff2 (tree)
• 时间: 2024-03-10 10:08:47
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Put more string formatting into templates.

Also redo the calendrical maths again. This is one of the situations
where types would not help.

更改概述

• modified: every-card.py
• modified: show.html

差异

--- a/every-card.py
+++ b/every-card.py
@@ -20,7 +20,7 @@ def root(): return "Working on it..."
 SHOW_QUERY = """
 select label, description, updated_at, consequences_after_s from tasks
 where updated_at + available_every_s <= unixepoch() and wheel = ?
-order by updated_at + consequences_after_s desc
+order by updated_at + consequences_after_s asc
 """
 
 SHOW_ALL_QUERY = """
@@ -32,33 +32,20 @@ order by updated_at asc
 def roundUp(delta): return timedelta(seconds=delta).days + 1
 def roundDown(delta): return timedelta(seconds=delta).days - 1
 
-def formatTask(row):
-    label = html.escape(row[0])
-    now = datetime.now()
-    updated_at = datetime.fromtimestamp(row[2])
-    updated_delta = now - updated_at
-    consequences_after = timedelta(seconds=row[3])
-    consequences_at = updated_at + consequences_after
-    if consequences_at <= now:
-        warning = "needs to be done immediately or there will be consequences"
-    else:
-        consequences_delta = consequences_at - now
-        warning = "needs to be done within %d days" % consequences_delta.days
-    return "{1} ({0}): Last done {2} days ago, {3}".format(
-        label, html.escape(row[1]), updated_delta.days + 1, warning)
-
-def formatEvery(row):
-    description = html.escape(row[0])
-    available_every = timedelta(seconds=row[1]).days
-    consequences_after = timedelta(seconds=row[2]).days
-    return "{0}: every {1} days, no less than every {2} days".format(
-            description, available_every, consequences_after)
+def prepDates(updated_at_dt, consequences_after_s):
+    updated_at = datetime.now() - datetime.fromtimestamp(updated_at_dt)
+    consequences_after = timedelta(seconds=consequences_after_s)
+    return updated_at, consequences_after - updated_at
+
[e-mail]_filter("deltadays")
+def deltaDays(s): return timedelta(seconds=s).days
 
 @app.route("/show/<wheel>")
 def show(wheel):
     c = cursor()
-    l = [formatTask(row) for row in c.execute(SHOW_QUERY, (wheel,))]
-    dets = [formatEvery(row) for row in c.execute(SHOW_ALL_QUERY, (wheel,))]
+    l = [(row[0], row[1]) + prepDates(row[2], row[3])
+         for row in c.execute(SHOW_QUERY, (wheel,))]
+    dets = c.execute(SHOW_ALL_QUERY, (wheel,))
     return render_template("show.html", wheel=wheel, availableTasks=l,
                            allTasks=dets)
 

--- a/show.html
+++ b/show.html
@@ -3,15 +3,23 @@
 <h1>Tasks for {{ wheel }}</h1>
 
 <ol>
-    {% for task in availableTasks %}
-    <li>{{ task }}</li>
+    {% for label, description, updated_delta, consequences_delta in availableTasks %}
+    <li>{{ description }} ({{ label }}): Last done {{ updated_delta.days + 1
+        }} days ago,
+        {% if consequences_delta.total_seconds() is lt(0) %}
+        needs to be done immediately or there will be consequences
+        {% else %}
+        needs to be done within {{ consequences_delta.days }} days
+        {% endif %}
+    </li>
     {% endfor %}
 </ol>
 
 <details>
     <ul>
-        {% for task in allTasks %}
-        <li>{{ task }}</li>
+        {% for description, available_every, consequences_after in allTasks %}
+        <li>{{ description }}: every {{ available_every | deltadays }}–{{
+            consequences_after | deltadays }} days</li>
         {% endfor %}
     </ul>
 </details>