fix: use task id as hash

app/models/task.py

@@ -5,9 +5,6 @@ import tortoise.validators
 
 from app.models.base import AbstractModel
 
-# https://stackoverflow.com/a/57639657
-CRONTAB_REGEX = r"^(@(annually|yearly|monthly|weekly|daily|hourly|reboot))|(@every (\d+(ns|us|µs|ms|s|m|h))+)|((((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*) ?){5,7})$"
-
 
 class Task(AbstractModel):
     list_name = tortoise.fields.CharField(max_length=128, db_index=True, null=False)
@@ -15,7 +12,6 @@ class Task(AbstractModel):
     reset_cron = tortoise.fields.CharField(
         max_length=64,
         null=True,
-        validators=[tortoise.validators.RegexValidator(CRONTAB_REGEX, 0)],
     )
     check_date = tortoise.fields.DatetimeField(null=True)
     previous_check_date = tortoise.fields.DatetimeField(null=True)

package.json

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

pyproject.toml

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

resources/lang/en.json

@@ -1,12 +1,13 @@
 {
     "cron": {
         "type": {
-            "one_time": "One time",
+            "manual": "Manual",
             "every_day": "Every day",
             "every_week": "Every week",
             "every_month": "Every month",
             "every_year": "Every year",
-            "specific": "Specific"
+            "custom": "Custom (cron syntax)",
+            "one_time": "One time (then delete)"
         },
         "week": [
             "Monday",

resources/lang/fr.json

@@ -1,12 +1,13 @@
 {
     "cron": {
         "type": {
-            "one_time": "Une seule fois",
+            "manual": "Manuel",
             "every_day": "Tous les jours",
             "every_week": "Toutes les semaines",
             "every_month": "Tous les mois",
             "every_year": "Tous les ans",
-            "specific": "Spécifique"
+            "custom": "Personnalisé (syntaxe cron)",
+            "one_time": "Une seule fois (puis suppression)"
         },
         "week": [
             "Lundi",

resources/ts/components/CronInput.vue

@@ -10,7 +10,7 @@ const rawCron = ref<string>(DEFAULT_CRON);
 const valid = ref<boolean>(true);
 const props = defineProps<{ editMode: boolean }>();
 
-const cronType = ref<CronType>(CronType.ONE_TIME);
+const cronType = ref<CronType>(CronType.MANUAL);
 const cronValue = ref<number>(0);
 
 function onCronChanged() {
@@ -34,7 +34,7 @@ function onChangeCronType() {
         case CronType.EVERY_YEAR:
             cronValue.value = 1;
             break;
-        case CronType.SPECIFIC:
+        case CronType.CUSTOM:
             cron.value ??= DEFAULT_CRON;
             break;
     }
@@ -64,8 +64,8 @@ watch(cron, () => {
 <template>
     <div class="flex gap-2">
         <select v-model="cronType" class="select flex-1" @change="onChangeCronType">
-            <option :value="CronType.ONE_TIME">
-                {{ $t("cron.type.one_time") }}
+            <option :value="CronType.MANUAL">
+                {{ $t("cron.type.manual") }}
             </option>
             <option :value="CronType.EVERY_DAY">
                 {{ $t("cron.type.every_day") }}
@@ -79,8 +79,11 @@ watch(cron, () => {
             <option :value="CronType.EVERY_YEAR">
                 {{ $t("cron.type.every_year") }}
             </option>
-            <option :value="CronType.SPECIFIC">
-                {{ $t("cron.type.specific") }}
+            <option :value="CronType.CUSTOM">
+                {{ $t("cron.type.custom") }}
+            </option>
+            <option :value="CronType.ONE_TIME">
+                {{ $t("cron.type.one_time") }}
             </option>
         </select>
         <select
@@ -149,7 +152,7 @@ watch(cron, () => {
             </option>
         </select>
         <input
-            v-if="cronType === CronType.SPECIFIC"
+            v-if="cronType === CronType.CUSTOM"
             v-model="rawCron"
             type="text"
             class="input font-mono flex-1"

resources/ts/components/TaskItem.vue

@@ -17,6 +17,7 @@ import { isTemporary, taskCompleted, taskNextReset } from "@/lib/tasks";
 import { relativeTime } from "@/lib/dates";
 import { useAlertStore } from "@/stores/alerts";
 import { useI18n } from "vue-i18n";
+import { isOneTime } from "@/lib/cron";
 
 const emit =
     defineEmits<(e: "clone" | "delete" | "updated", task: Task) => void>();
@@ -75,20 +76,24 @@ function onSave() {
 function onCheck() {
     if (!isTemporary(task.value)) {
         if (!checked.value) {
-            const data = {
-                check_date: new Date().toISOString(),
-                previous_check_date: task.value.check_date?.toISOString(),
-            };
-            task.value.previous_check_date = task.value.check_date;
-            task.value.check_date = new Date();
-            updateTask(task.value.id, data)
-                .then((data) => {
-                    task.value = data;
-                    emit("updated", data);
-                })
-                .catch(() => {
-                    alertError(i18n.t("alerts.task_update_error"));
-                });
+            if (isOneTime(task.value.reset_cron)) {
+                emit("delete", task.value);
+            } else {
+                const data = {
+                    check_date: new Date().toISOString(),
+                    previous_check_date: task.value.check_date?.toISOString(),
+                };
+                task.value.previous_check_date = task.value.check_date;
+                task.value.check_date = new Date();
+                updateTask(task.value.id, data)
+                    .then((data) => {
+                        task.value = data;
+                        emit("updated", data);
+                    })
+                    .catch(() => {
+                        alertError(i18n.t("alerts.task_update_error"));
+                    });
+            }
         } else {
             const data = {
                 check_date: null,

resources/ts/enums.ts

@@ -1,10 +1,11 @@
 export enum CronType {
-    ONE_TIME,
+    MANUAL,
     EVERY_DAY,
     EVERY_WEEK,
     EVERY_MONTH,
     EVERY_YEAR,
-    SPECIFIC,
+    CUSTOM,
+    ONE_TIME,
 }
 
 export enum SortType {

resources/ts/lib/cron.ts

@@ -1,12 +1,19 @@
 import { CronType } from "@/enums";
 import { CronExpressionParser } from "cron-parser";
 
+const ONE_TIME_VALUE = "@one-time";
+
 export function parseCron(cron: string | null): {
     type: CronType;
     value: number;
 } {
     let value: RegExpMatchArray | null;
     if (cron === null) {
+        return {
+            type: CronType.MANUAL,
+            value: 0,
+        };
+    } else if (cron === ONE_TIME_VALUE) {
         return {
             type: CronType.ONE_TIME,
             value: 0,
@@ -33,7 +40,7 @@ export function parseCron(cron: string | null): {
         };
     } else {
         return {
-            type: CronType.SPECIFIC,
+            type: CronType.CUSTOM,
             value: 0,
         };
     }
@@ -45,6 +52,8 @@ export function getCron(
     fallback: string,
 ): string | null {
     switch (type) {
+        case CronType.ONE_TIME:
+            return ONE_TIME_VALUE;
         case CronType.EVERY_DAY:
             return `0 ${value.toFixed(0)} * * *`;
         case CronType.EVERY_WEEK:
@@ -53,7 +62,7 @@ export function getCron(
             return `0 0 ${value.toFixed(0)} * *`;
         case CronType.EVERY_YEAR:
             return `0 0 1 ${value.toFixed(0)} *`;
-        case CronType.SPECIFIC:
+        case CronType.CUSTOM:
             if (validCron(fallback)) {
                 return fallback;
             }
@@ -62,6 +71,10 @@ export function getCron(
     return null;
 }
 
+export function isOneTime(cron: string | null): boolean {
+    return cron === ONE_TIME_VALUE;
+}
+
 export function validCron(cron: string): boolean {
     try {
         CronExpressionParser.parse(cron);

resources/ts/lib/tasks.ts

@@ -1,6 +1,7 @@
 import { SortType } from "@/enums";
 import type { RawTask, Task, TaskCreateData } from "@/types";
 import { CronExpressionParser } from "cron-parser";
+import { isOneTime } from "@/lib/cron";
 
 const TEMPORARY_ID = "tmp";
 
@@ -27,7 +28,7 @@ export function newTemporaryTask(data: TaskCreateData): Task {
         updated_at: new Date(),
         check_date: null,
         previous_check_date: null,
-    }
+    };
 }
 
 export function isTemporary(task: Task): boolean {
@@ -35,12 +36,17 @@ export function isTemporary(task: Task): boolean {
 }
 
 export function taskNextReset(task: Task): Date | null {
-    if (task.check_date === null || task.reset_cron === null) {
+    if (
+        task.check_date === null ||
+        task.reset_cron === null ||
+        isOneTime(task.reset_cron)
+    ) {
         return null;
     }
     try {
         const interval = CronExpressionParser.parse(task.reset_cron, {
             currentDate: task.check_date,
+            hashSeed: task.id,
         });
         return interval.next().toDate();
     } catch {

uv.lock

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