chore: 1.7.1

package.json

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

pyproject.toml

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

resources/lang/en.json

@@ -44,7 +44,8 @@
             "October",
             "November",
             "December"
-        ]
+        ],
+        "rrule_start": "Start:"
     },
     "checked": "Checked",
     "resets": "Resets",

resources/lang/fr.json

@@ -44,7 +44,8 @@
             "Octobre",
             "Novembre",
             "Décembre"
-        ]
+        ],
+        "rrule_start": "Début :"
     },
     "checked": "Complété",
     "resets": "Reviens",

resources/ts/components/CronInput.vue

@@ -1,7 +1,10 @@
 <script setup lang="ts">
-import { ref, onBeforeMount, watch } from "vue";
+import { ref, onBeforeMount, watch, defineAsyncComponent } from "vue";
 import { getCron, parseCron, validCron } from "@/lib/recurrence";
 import { CronType } from "@/enums";
+const DateInput = defineAsyncComponent(
+    () => import("@/components/DateInput.vue"),
+);
 
 const DEFAULT_CRON = "0 0 * * *";
 
@@ -11,23 +14,30 @@ const valid = ref<boolean>(true);
 const props = defineProps<{ editMode: boolean }>();
 
 const cronType = ref<CronType>(CronType.MANUAL);
-const cronValue = ref<string>('0');
+const cronValue = ref<string>("0");
+const cronDate = ref<Date>(new Date());
 
 function onCronChanged() {
     const data = parseCron(cron.value);
     rawCron.value = cron.value ?? DEFAULT_CRON;
     cronType.value = data.type;
     cronValue.value = data.value.toFixed(0);
+    cronDate.value = data.date ?? new Date();
 }
 
 function updateCron() {
-    cron.value = getCron(cronType.value, parseInt(cronValue.value), rawCron.value);
+    cron.value = getCron(
+        cronType.value,
+        parseInt(cronValue.value),
+        cronDate.value,
+        rawCron.value,
+    );
 }
 
 function onChangeCronType() {
     switch (cronType.value) {
         case CronType.EVERY_DAY:
-            cronValue.value = '0';
+            cronValue.value = "0";
             break;
         case CronType.EVERY_WEEK:
         case CronType.EVERY_MONTH:
@@ -35,7 +45,7 @@ function onChangeCronType() {
         case CronType.EVERY_N_DAYS:
         case CronType.EVERY_N_WEEKS:
         case CronType.EVERY_N_MONTHS:
-            cronValue.value = '1';
+            cronValue.value = "1";
             break;
         case CronType.CUSTOM:
             cron.value ??= DEFAULT_CRON;
@@ -48,6 +58,10 @@ function onChangeCronValue() {
     updateCron();
 }
 
+function onChangeCronDate() {
+    updateCron();
+}
+
 function onInputRawCron() {
     valid.value = validCron(rawCron.value);
     if (valid.value) {
@@ -65,8 +79,12 @@ watch(cron, () => {
 </script>
 
 <template>
-    <div class="flex gap-2">
-        <select v-model="cronType" class="select flex-1" @change="onChangeCronType">
+    <div class="flex gap-2 flex-wrap">
+        <select
+            v-model="cronType"
+            class="select flex-1"
+            @change="onChangeCronType"
+        >
             <option :value="CronType.MANUAL">
                 {{ $t("cron.type.manual") }}
             </option>
@@ -106,7 +124,7 @@ watch(cron, () => {
         >
             <option
                 v-for="i in Array.from(Array(24).keys())"
-                :key="`h${i+1}`"
+                :key="`h${i + 1}`"
                 :value="i"
             >
                 {{ i.toFixed(0).padStart(2, "0") }}:00
@@ -120,7 +138,7 @@ watch(cron, () => {
         >
             <option
                 v-for="i in Array.from(Array(7).keys())"
-                :key="`w${i+1}`"
+                :key="`w${i + 1}`"
                 :value="i + 1"
             >
                 {{ $t(`cron.week.${i.toFixed(0)}`) }}
@@ -132,35 +150,37 @@ watch(cron, () => {
             class="select flex-1"
             @change="onChangeCronValue"
         >
-            <option :value="1">{{ $t('cron.month.first_day') }}</option>
-            <option :value="32">{{ $t('cron.month.last_day') }}</option>
+            <option :value="1">{{ $t("cron.month.first_day") }}</option>
+            <option :value="32">{{ $t("cron.month.last_day") }}</option>
             <option
                 v-for="i in Array.from(Array(7).keys())"
-                :key="`d${-(i+1)}`"
+                :key="`d${-(i + 1)}`"
                 :value="-(i + 1)"
             >
-                {{ $t("cron.month.first") }} {{ $t(`cron.week.${i.toFixed(0)}`).toLowerCase() }}
+                {{ $t("cron.month.first") }}
+                {{ $t(`cron.week.${i.toFixed(0)}`).toLowerCase() }}
             </option>
             <option
                 v-for="i in Array.from(Array(7).keys())"
-                :key="`d${-(i+8)}`"
+                :key="`d${-(i + 8)}`"
                 :value="-(i + 8)"
             >
-                {{ $t("cron.month.last") }} {{ $t(`cron.week.${i.toFixed(0)}`).toLowerCase() }}
+                {{ $t("cron.month.last") }}
+                {{ $t(`cron.week.${i.toFixed(0)}`).toLowerCase() }}
             </option>
             <option
                 v-for="i in Array.from(Array(30).keys())"
-                :key="`d${i+2}`"
+                :key="`d${i + 2}`"
                 :value="i + 2"
             >
                 {{
-                    (i % 10 == 9 && i !== 9)
-                        ? $t("cron.month.st", [i+2])
-                        : (i % 10 === 0 && i !== 10)
-                          ? $t("cron.month.nd", [i+2])
-                          : (i % 10 === 1 && i !== 11)
-                            ? $t("cron.month.rd", [i+2])
-                            : $t("cron.month.th", [i+2])
+                    i % 10 == 9 && i !== 9
+                        ? $t("cron.month.st", [i + 2])
+                        : i % 10 === 0 && i !== 10
+                          ? $t("cron.month.nd", [i + 2])
+                          : i % 10 === 1 && i !== 11
+                            ? $t("cron.month.rd", [i + 2])
+                            : $t("cron.month.th", [i + 2])
                 }}
             </option>
         </select>
@@ -187,13 +207,31 @@ watch(cron, () => {
             @input="onInputRawCron"
         />
         <input
-            v-if="cronType === CronType.EVERY_N_DAYS || cronType === CronType.EVERY_N_WEEKS || cronType === CronType.EVERY_N_MONTHS"
+            v-if="
+                cronType === CronType.EVERY_N_DAYS ||
+                cronType === CronType.EVERY_N_WEEKS ||
+                cronType === CronType.EVERY_N_MONTHS
+            "
             v-model="cronValue"
             type="number"
             min="1"
             step="1"
             class="input font-mono flex-1"
-            @input="onChangeCronValue"
+            @change="onChangeCronValue"
         />
+        <label class="label flex-1 basis-full">
+            {{ $t("cron.rrule_start") }}
+            <date-input
+                v-if="
+                    cronType === CronType.EVERY_N_DAYS ||
+                    cronType === CronType.EVERY_N_WEEKS ||
+                    cronType === CronType.EVERY_N_MONTHS
+                "
+                v-model="cronDate"
+                required
+                class="input font-mono"
+                @change="onChangeCronDate"
+            />
+        </label>
     </div>
 </template>

resources/ts/components/DateInput.vue

@@ -0,0 +1,26 @@
+<script setup lang="ts">
+const emit = defineEmits<(e: "input"|"change", value: Date) => void>();
+
+const date = defineModel<Date>({ required: true });
+
+function onInput(event: Event) {
+    const inputValue = (event.target as HTMLInputElement).value;
+    date.value =  new Date(inputValue);
+    emit('input', date.value);
+}
+
+function onChange(event: Event) {
+    const inputValue = (event.target as HTMLInputElement).value;
+    date.value =  new Date(inputValue);
+    emit('change', date.value);
+}
+</script>
+
+<template>
+    <input
+        :value="date.toISOString().substring(0, 10)"
+        type="date"
+        @input="onInput"
+        @change="onChange"
+    />
+</template>

resources/ts/lib/recurrence.ts

@@ -7,59 +7,70 @@ const ONE_TIME_VALUE = "@one-time";
 export function parseCron(cron: string | null): {
     type: CronType;
     value: number;
+    date: Date | null;
 } {
     let value: RegExpMatchArray | null;
     if (cron === null) {
         return {
             type: CronType.MANUAL,
             value: 0,
+            date: null,
         };
     } else if (cron === ONE_TIME_VALUE) {
         return {
             type: CronType.ONE_TIME,
             value: 0,
+            date: null,
         };
-    } else if (cron.startsWith("RRULE:")) {
+    } else if (cron.startsWith("RRULE:") || cron.startsWith("DTSTART:")) {
         return parseRrule(cron);
     } else if ((value = /^0 (\d+) \* \* \*$/i.exec(cron)) !== null) {
         return {
             type: CronType.EVERY_DAY,
             value: parseInt(value[1] ?? ""),
+            date: null,
         };
     } else if ((value = /^0 0 \* \* (\d+)$/i.exec(cron)) !== null) {
         return {
             type: CronType.EVERY_WEEK,
             value: parseInt(value[1] ?? ""),
+            date: null,
         };
     } else if ((value = /^0 0 (\d+) \* \*$/i.exec(cron)) !== null) {
         return {
             type: CronType.EVERY_MONTH,
             value: parseInt(value[1] ?? ""),
+            date: null,
         };
     } else if ((value = /^0 0 L \* \*$/i.exec(cron)) !== null) {
         return {
             type: CronType.EVERY_MONTH,
             value: 32,
+            date: null,
         };
     } else if ((value = /^0 0 \* \* (\d+)#1$/i.exec(cron)) !== null) {
         return {
             type: CronType.EVERY_MONTH,
             value: -parseInt(value[1] ?? ""),
+            date: null,
         };
     } else if ((value = /^0 0 \* \* (\d+)L$/i.exec(cron)) !== null) {
         return {
             type: CronType.EVERY_MONTH,
             value: -parseInt(value[1] ?? "") - 7,
+            date: null,
         };
     } else if ((value = /^0 0 1 (\d+) \*$/i.exec(cron)) !== null) {
         return {
             type: CronType.EVERY_YEAR,
             value: parseInt(value[1] ?? ""),
+            date: null,
         };
     } else {
         return {
             type: CronType.CUSTOM,
             value: 0,
+            date: null,
         };
     }
 }
@@ -67,6 +78,7 @@ export function parseCron(cron: string | null): {
 export function parseRrule(rule: string): {
     type: CronType;
     value: number;
+    date: Date | null;
 } {
     try {
         const rrule = RRule.parseString(rule);
@@ -75,21 +87,25 @@ export function parseRrule(rule: string): {
                 return {
                     type: CronType.EVERY_N_MONTHS,
                     value: (rrule.interval ?? 1) * 12,
+                    date: rrule.dtstart ?? null,
                 };
             case RRule.MONTHLY:
                 return {
                     type: CronType.EVERY_N_MONTHS,
                     value: rrule.interval ?? 1,
+                    date: rrule.dtstart ?? null,
                 };
             case RRule.WEEKLY:
                 return {
                     type: CronType.EVERY_N_WEEKS,
                     value: rrule.interval ?? 1,
+                    date: rrule.dtstart ?? null,
                 };
             case RRule.DAILY:
                 return {
                     type: CronType.EVERY_N_DAYS,
                     value: rrule.interval ?? 1,
+                    date: rrule.dtstart ?? null,
                 };
         }
     } catch {
@@ -98,12 +114,14 @@ export function parseRrule(rule: string): {
     return {
         type: CronType.MANUAL,
         value: 0,
+        date: null,
     };
 }
 
 export function getCron(
     type: CronType,
     value: number,
+    date: Date,
     fallback: string,
 ): string | null {
     switch (type) {
@@ -127,11 +145,23 @@ export function getCron(
         case CronType.EVERY_YEAR:
             return `0 0 1 ${value.toFixed(0)} *`;
         case CronType.EVERY_N_MONTHS:
-            return `RRULE:FREQ=MONTHLY;INTERVAL=${value.toFixed(0)}`;
+            return new RRule({
+                freq: RRule.MONTHLY,
+                interval: value,
+                dtstart: date,
+            }).toString();
         case CronType.EVERY_N_WEEKS:
-            return `RRULE:FREQ=WEEKLY;INTERVAL=${value.toFixed(0)}`;
+            return new RRule({
+                freq: RRule.WEEKLY,
+                interval: value,
+                dtstart: date,
+            }).toString();
         case CronType.EVERY_N_DAYS:
-            return `RRULE:FREQ=DAILY;INTERVAL=${value.toFixed(0)}`;
+            return new RRule({
+                freq: RRule.DAILY,
+                interval: value,
+                dtstart: date,
+            }).toString();
         case CronType.CUSTOM:
             if (validCron(fallback)) {
                 return fallback;
@@ -141,6 +171,10 @@ export function getCron(
     return null;
 }
 
+function dtStartFormat(date: Date): string {
+    return `${date.getFullYear().toFixed(0)}${(date.getMonth() + 1).toFixed(0).padStart(2, "0")}${date.getDate().toFixed(0).padStart(2, "0")}T000000Z`;
+}
+
 export function isOneTime(cron: string | null): boolean {
     return cron === ONE_TIME_VALUE;
 }
@@ -155,11 +189,11 @@ export function validCron(cron: string): boolean {
 }
 
 export function nextCronReset(
-    date: Date | null,
+    date: Date,
     cron: string | null,
     hash: string,
 ): Date | null {
-    if (date === null || cron === null || isOneTime(cron)) {
+    if (cron === null || isOneTime(cron)) {
         return null;
     }
     try {
@@ -167,11 +201,10 @@ export function nextCronReset(
             try {
                 const rule = new RRule({
                     ...RRule.parseString(cron),
-                    dtstart: date,
                     count: 2,
                 });
 
-                return rule.all()[1] ?? null;
+                return rule.after(date) ?? null;
             } catch {
                 // ignore
             }

resources/ts/lib/tasks.ts

@@ -35,17 +35,20 @@ export function isTemporary(task: Task): boolean {
 }
 
 export function taskNextReset(task: Task): Date | null {
-    return nextCronReset(task.check_date, task.reset_cron, task.id);
+    return nextCronReset(task.check_date ?? new Date(), task.reset_cron, task.id);
 }
 
 export function taskFutureReset(task: Task): Date | null {
-    return nextCronReset(taskNextReset(task), task.reset_cron, task.id);
+    return nextCronReset(taskNextReset(task) ?? new Date(), task.reset_cron, task.id);
 }
 
 export function taskCompleted(task: Task): boolean {
+    if (task.check_date === null) {
+        return false;
+    }
     const nextReset = taskNextReset(task);
     if (nextReset === null) {
-        return task.check_date !== null;
+        return true;
     }
     return nextReset.getTime() > new Date().getTime();
 }

uv.lock

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