chore: 1.7.6

package.json

@@ -1,6 +1,6 @@
 {
     "name": "tout-doux",
-    "version": "1.7.3",
+    "version": "1.7.6",
     "private": true,
     "type": "module",
     "engines": {

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tout-doux"
-version = "1.7.3"
+version = "1.7.6"
 description = ""
 requires-python = ">=3.14"
 dependencies = [

resources/ts/lib/recurrence.ts

@@ -22,7 +22,7 @@ export function parseCron(cron: string | null): {
             value: 0,
             date: null,
         };
-    } else if (cron.startsWith("RRULE:") || cron.startsWith("DTSTART:")) {
+    } else if (isRrule(cron)) {
         return parseRrule(cron);
     } else if ((value = /^0 (\d+) \* \* \*$/i.exec(cron)) !== null) {
         return {
@@ -75,6 +75,10 @@ export function parseCron(cron: string | null): {
     }
 }
 
+function isRrule(cron: string): boolean {
+    return cron.startsWith("RRULE:") || cron.startsWith("DTSTART:");
+}
+
 export function parseRrule(rule: string): {
     type: CronType;
     value: number;
@@ -193,7 +197,7 @@ export function nextCronReset(
         return null;
     }
     try {
-        if (cron.startsWith("RRULE:")) {
+        if (isRrule(cron)) {
             try {
                 const rule = new RRule({
                     ...RRule.parseString(cron),

resources/ts/lib/tasks.ts

@@ -50,6 +50,14 @@ export function taskFutureReset(task: Task): Date | null {
     );
 }
 
+export function taskSortReset(task: Task): Date | null {
+    let resetDate = taskNextReset(task);
+    while (resetDate !== null && resetDate.getTime() < new Date().getTime()) {
+        resetDate = nextCronReset(resetDate, task.reset_cron, task.id);
+    }
+    return resetDate;
+}
+
 export function taskCompleted(task: Task): boolean {
     if (task.check_date === null) {
         return false;
@@ -63,9 +71,9 @@ export function taskCompleted(task: Task): boolean {
 
 export function fallbackDate(task: Task): Date {
     return new Date(
-        task.created_at.getFullYear() - 100,
-        task.created_at.getMonth(),
-        task.created_at.getDate(),
+        (task.check_date ?? task.created_at).getFullYear() + 100,
+        (task.check_date ?? task.created_at).getMonth(),
+        (task.check_date ?? task.created_at).getDate(),
         0,
         0,
         0,
@@ -73,54 +81,31 @@ export function fallbackDate(task: Task): Date {
     );
 }
 
-export function sortTasks(
-    tasks: Task[],
+export function taskSortFunction(
     sortType: SortType,
     reverse: boolean,
-): Task[] {
+): (a: Task, b: Task) => number {
     switch (sortType) {
         case SortType.CREATED_AT:
-            return tasks
-                .slice()
-                .sort(
-                    (a: Task, b: Task) =>
+            return (a: Task, b: Task) =>
                 (reverse ? -1 : 1) *
-                        (a.created_at.getTime() - b.created_at.getTime()),
-                );
+                (a.created_at.getTime() - b.created_at.getTime());
         case SortType.UPDATED_AT:
-            return tasks
-                .slice()
-                .sort(
-                    (a: Task, b: Task) =>
+            return (a: Task, b: Task) =>
                 (reverse ? -1 : 1) *
-                        (a.updated_at.getTime() - b.updated_at.getTime()),
-                );
+                (a.updated_at.getTime() - b.updated_at.getTime());
         case SortType.CHECK_DATE:
-            return tasks
-                .slice()
-                .sort(
-                    (a: Task, b: Task) =>
+            return (a: Task, b: Task) =>
                 (reverse ? -1 : 1) *
                 ((a.check_date ?? fallbackDate(a)).getTime() -
-                            (b.check_date ?? fallbackDate(b)).getTime()),
-                );
+                    (b.check_date ?? fallbackDate(b)).getTime());
         case SortType.RESET_DATE:
-            return tasks
-                .slice()
-                .sort(
-                    (a: Task, b: Task) =>
+            return (a: Task, b: Task) =>
                 (reverse ? -1 : 1) *
-                            (taskNextReset(a) ?? fallbackDate(a)).getTime() -
-                        (taskNextReset(b) ?? fallbackDate(b)).getTime(),
-                );
+                ((taskSortReset(a) ?? fallbackDate(a)).getTime() -
+                    (taskSortReset(b) ?? fallbackDate(b)).getTime());
         case SortType.NAME:
-            return tasks
-                .slice()
-                .sort(
-                    (a: Task, b: Task) =>
-                        (reverse ? -1 : 1) * a.name.localeCompare(b.name),
-                );
-        default:
-            return tasks.slice();
+            return (a: Task, b: Task) =>
+                (reverse ? -1 : 1) * a.name.localeCompare(b.name);
     }
 }

resources/ts/views/ListView.vue

@@ -11,7 +11,7 @@ import {
 } from "@lucide/vue";
 import TaskItem from "@/components/TaskItem.vue";
 import ListOptions from "@/components/ListOptions.vue";
-import { taskCompleted, sortTasks, newTemporaryTask } from "@/lib/tasks";
+import { taskCompleted, taskSortFunction, newTemporaryTask } from "@/lib/tasks";
 import { SortType } from "@/enums";
 import { booleanCookieRef, enumCookieRef } from "@/lib/cookies";
 import { useAlertStore } from "@/stores/alerts";
@@ -75,7 +75,7 @@ function fetchTasks(requestedList: string) {
 }
 
 function reSortTasks(update = false) {
-    tasks.value = sortTasks(tasks.value, sortType.value, sortReverse.value);
+    tasks.value.sort(taskSortFunction(sortType.value, sortReverse.value));
     if (update) {
         updateTitle();
         if (tasks.value.length && list.value) {

uv.lock

@@ -323,7 +323,7 @@ asyncpg = [
 
 [[package]]
 name = "tout-doux"
-version = "1.7.3"
+version = "1.7.6"
 source = { editable = "." }
 dependencies = [
     { name = "flask", extra = ["async"] },