klemek/tout-doux
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 15 Wiki Activity

feat: rrule format for x days repeat

Browse Source
This commit is contained in:
klemek
2026-07-20 13:41:47 +02:00
parent ca18d3b9e2
commit 40a8d02cd7
11 changed files with 317 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/lang/en.json
+3
View File
@@ -3,8 +3,11 @@
"type": {
"manual": "Manual",
"every_day": "Every day",
"every_n_days": "Every N days",
"every_week": "Every week",
"every_n_weeks": "Every N weeks",
"every_month": "Every month",
"every_n_months": "Every N months",
"every_year": "Every year",
"custom": "Custom (cron syntax)",
"one_time": "One time (then delete)"
resources/lang/fr.json
+3
View File
@@ -3,8 +3,11 @@
"type": {
"manual": "Manuel",
"every_day": "Tous les jours",
"every_n_days": "Tous les N jours",
"every_week": "Toutes les semaines",
"every_n_weeks": "Tous les N semaines",
"every_month": "Tous les mois",
"every_n_months": "Tous les N mois",
"every_year": "Tous les ans",
"custom": "Personnalisé (syntaxe cron)",
"one_time": "Une seule fois (puis suppression)"
resources/ts/components/CronInput.vue
+19 -1
View File
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { ref, onBeforeMount, watch } from "vue";
import { getCron, parseCron, validCron } from "@/lib/cron";
import { getCron, parseCron, validCron } from "@/lib/recurrence";
import { CronType } from "@/enums";
const DEFAULT_CRON = "0 0 * * *";
@@ -70,12 +70,21 @@ watch(cron, () => {
<option :value="CronType.EVERY_DAY">
{{ $t("cron.type.every_day") }}
</option>
<option :value="CronType.EVERY_N_DAYS">
{{ $t("cron.type.every_n_days") }}
</option>
<option :value="CronType.EVERY_WEEK">
{{ $t("cron.type.every_week") }}
</option>
<option :value="CronType.EVERY_N_WEEKS">
{{ $t("cron.type.every_n_weeks") }}
</option>
<option :value="CronType.EVERY_MONTH">
{{ $t("cron.type.every_month") }}
</option>
<option :value="CronType.EVERY_N_MONTHS">
{{ $t("cron.type.every_n_months") }}
</option>
<option :value="CronType.EVERY_YEAR">
{{ $t("cron.type.every_year") }}
</option>
@@ -159,5 +168,14 @@ watch(cron, () => {
:class="valid ? '' : 'input-error'"
@input="onInputRawCron"
/>
<input
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"
/>
</div>
</template>
resources/ts/components/TaskItem.vue
+1 -1
View File
@@ -17,7 +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";
import { isOneTime } from "@/lib/recurrence";
const emit =
defineEmits<(e: "clone" | "delete" | "updated", task: Task) => void>();
resources/ts/enums.ts
+3
View File
@@ -1,8 +1,11 @@
export enum CronType {
MANUAL,
EVERY_DAY,
EVERY_N_DAYS,
EVERY_WEEK,
EVERY_N_WEEKS,
EVERY_MONTH,
EVERY_N_MONTHS,
EVERY_YEAR,
CUSTOM,
ONE_TIME,
resources/ts/lib/cron.ts
-85
View File
@@ -1,85 +0,0 @@
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,
};
} else if ((value = /^0 (\d+) \* \* \*$/i.exec(cron)) !== null) {
return {
type: CronType.EVERY_DAY,
value: parseInt(value[1] ?? ""),
};
} else if ((value = /^0 0 \* \* (\d+)$/i.exec(cron)) !== null) {
return {
type: CronType.EVERY_WEEK,
value: parseInt(value[1] ?? ""),
};
} else if ((value = /^0 0 (\d+) \* \*$/i.exec(cron)) !== null) {
return {
type: CronType.EVERY_MONTH,
value: parseInt(value[1] ?? ""),
};
} else if ((value = /^0 0 1 (\d+) \*$/i.exec(cron)) !== null) {
return {
type: CronType.EVERY_YEAR,
value: parseInt(value[1] ?? ""),
};
} else {
return {
type: CronType.CUSTOM,
value: 0,
};
}
}
export function getCron(
type: CronType,
value: number,
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:
return `0 0 * * ${value.toFixed(0)}`;
case CronType.EVERY_MONTH:
return `0 0 ${value.toFixed(0)} * *`;
case CronType.EVERY_YEAR:
return `0 0 1 ${value.toFixed(0)} *`;
case CronType.CUSTOM:
if (validCron(fallback)) {
return fallback;
}
}
return null;
}
export function isOneTime(cron: string | null): boolean {
return cron === ONE_TIME_VALUE;
}
export function validCron(cron: string): boolean {
try {
CronExpressionParser.parse(cron);
return true;
} catch {
return false;
}
}
resources/ts/lib/recurrence.ts
+173
View File
@@ -0,0 +1,173 @@
import { CronType } from "@/enums";
import { CronExpressionParser } from "cron-parser";
import { RRule } from "rrule";
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,
};
} else if (cron.startsWith("RRULE:")) {
return parseRrule(cron);
} else if ((value = /^0 (\d+) \* \* \*$/i.exec(cron)) !== null) {
return {
type: CronType.EVERY_DAY,
value: parseInt(value[1] ?? ""),
};
} else if ((value = /^0 0 \* \* (\d+)$/i.exec(cron)) !== null) {
return {
type: CronType.EVERY_WEEK,
value: parseInt(value[1] ?? ""),
};
} else if ((value = /^0 0 (\d+) \* \*$/i.exec(cron)) !== null) {
return {
type: CronType.EVERY_MONTH,
value: parseInt(value[1] ?? ""),
};
} else if ((value = /^0 0 1 (\d+) \*$/i.exec(cron)) !== null) {
return {
type: CronType.EVERY_YEAR,
value: parseInt(value[1] ?? ""),
};
} else {
return {
type: CronType.CUSTOM,
value: 0,
};
}
}
export function parseRrule(rule: string): {
type: CronType;
value: number;
} {
try {
const rrule = RRule.parseString(rule);
switch (rrule.freq) {
case RRule.YEARLY:
return {
type: CronType.EVERY_N_MONTHS,
value: (rrule.interval ?? 1) * 12,
};
case RRule.MONTHLY:
return {
type: CronType.EVERY_N_MONTHS,
value: rrule.interval ?? 1,
};
case RRule.WEEKLY:
return {
type: CronType.EVERY_N_WEEKS,
value: rrule.interval ?? 1,
};
case RRule.DAILY:
return {
type: CronType.EVERY_N_DAYS,
value: rrule.interval ?? 1,
};
}
} catch {
// ignore
}
return {
type: CronType.MANUAL,
value: 0,
};
}
export function getCron(
type: CronType,
value: number,
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:
return `0 0 * * ${value.toFixed(0)}`;
case CronType.EVERY_MONTH:
return `0 0 ${value.toFixed(0)} * *`;
case CronType.EVERY_YEAR:
return `0 0 1 ${value.toFixed(0)} *`;
case CronType.EVERY_N_MONTHS:
return new RRule({
freq: RRule.MONTHLY,
interval: value,
}).toString();
case CronType.EVERY_N_WEEKS:
return new RRule({
freq: RRule.WEEKLY,
interval: value,
}).toString();
case CronType.EVERY_N_DAYS:
return new RRule({
freq: RRule.DAILY,
interval: value,
}).toString();
case CronType.CUSTOM:
if (validCron(fallback)) {
return fallback;
}
}
return null;
}
export function isOneTime(cron: string | null): boolean {
return cron === ONE_TIME_VALUE;
}
export function validCron(cron: string): boolean {
try {
CronExpressionParser.parse(cron);
return true;
} catch {
return false;
}
}
export function nextCronReset(
date: Date | null,
cron: string | null,
hash: string,
): Date | null {
if (date === null || cron === null || isOneTime(cron)) {
return null;
}
try {
if (cron.startsWith("RRULE:")) {
try {
const rule = new RRule({
...RRule.parseString(cron),
dtstart: date,
count: 2,
});
return rule.all()[1] ?? null;
} catch {
// ignore
}
}
const interval = CronExpressionParser.parse(cron, {
currentDate: date,
hashSeed: hash,
});
return interval.next().toDate();
} catch {
return null;
}
}
resources/ts/lib/tasks.ts
+2 -18
View File
@@ -1,7 +1,6 @@
import { SortType } from "@/enums";
import type { RawTask, Task, TaskCreateData } from "@/types";
import { CronExpressionParser } from "cron-parser";
import { isOneTime } from "@/lib/cron";
import { nextCronReset } from "@/lib/recurrence";
const TEMPORARY_ID = "tmp";
@@ -36,22 +35,7 @@ export function isTemporary(task: Task): boolean {
}
export function taskNextReset(task: Task): Date | 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 {
return null;
}
return nextCronReset(task.check_date, task.reset_cron, task.id);
}
export function taskCompleted(task: Task): boolean {