ondra/ironmount
1
1
Fork 0
mirror of https://github.com/nicotsx/ironmount.git synced 2025-12-10 12:10:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: custom include patterns (#104)

Browse Source 
* feat: add custom include patterns

* feat: add exclude-if-present option
This commit is contained in:
Nico
2025-12-04 18:44:34 +01:00
committed by Nicolas Meienberger
parent 2c11b7c7de
commit 6b6338291b
11 changed files with 963 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/client/api-client/types.gen.ts
View File

@@ -1291,6 +1291,7 @@ export type ListBackupSchedulesResponses = {
createdAt: number; createdAt: number;
cronExpression: string; cronExpression: string;
enabled: boolean; enabled: boolean;
excludeIfPresent: Array<string> | null;
excludePatterns: Array<string> | null; excludePatterns: Array<string> | null;
id: number; id: number;
includePatterns: Array<string> | null; includePatterns: Array<string> | null;
@@ -1439,6 +1440,7 @@ export type CreateBackupScheduleData = {
name: string; name: string;
repositoryId: string; repositoryId: string;
volumeId: number; volumeId: number;
excludeIfPresent?: Array<string>;
excludePatterns?: Array<string>; excludePatterns?: Array<string>;
includePatterns?: Array<string>; includePatterns?: Array<string>;
retentionPolicy?: { retentionPolicy?: {
@@ -1465,6 +1467,7 @@ export type CreateBackupScheduleResponses = {
createdAt: number; createdAt: number;
cronExpression: string; cronExpression: string;
enabled: boolean; enabled: boolean;
excludeIfPresent: Array<string> | null;
excludePatterns: Array<string> | null; excludePatterns: Array<string> | null;
id: number; id: number;
includePatterns: Array<string> | null; includePatterns: Array<string> | null;
@@ -1527,6 +1530,7 @@ export type GetBackupScheduleResponses = {
createdAt: number; createdAt: number;
cronExpression: string; cronExpression: string;
enabled: boolean; enabled: boolean;
excludeIfPresent: Array<string> | null;
excludePatterns: Array<string> | null; excludePatterns: Array<string> | null;
id: number; id: number;
includePatterns: Array<string> | null; includePatterns: Array<string> | null;
@@ -1673,6 +1677,7 @@ export type UpdateBackupScheduleData = {
cronExpression: string; cronExpression: string;
repositoryId: string; repositoryId: string;
enabled?: boolean; enabled?: boolean;
excludeIfPresent?: Array<string>;
excludePatterns?: Array<string>; excludePatterns?: Array<string>;
includePatterns?: Array<string>; includePatterns?: Array<string>;
name?: string; name?: string;
@@ -1702,6 +1707,7 @@ export type UpdateBackupScheduleResponses = {
createdAt: number; createdAt: number;
cronExpression: string; cronExpression: string;
enabled: boolean; enabled: boolean;
excludeIfPresent: Array<string> | null;
excludePatterns: Array<string> | null; excludePatterns: Array<string> | null;
id: number; id: number;
includePatterns: Array<string> | null; includePatterns: Array<string> | null;
@@ -1744,6 +1750,7 @@ export type GetBackupScheduleForVolumeResponses = {
createdAt: number; createdAt: number;
cronExpression: string; cronExpression: string;
enabled: boolean; enabled: boolean;
excludeIfPresent: Array<string> | null;
excludePatterns: Array<string> | null; excludePatterns: Array<string> | null;
id: number; id: number;
includePatterns: Array<string> | null; includePatterns: Array<string> | null;

120
app/client/modules/backups/components/create-schedule-form.tsx
View File

@@ -26,6 +26,8 @@ const internalFormSchema = type({
name: "1 <= string <= 32", name: "1 <= string <= 32",
repositoryId: "string", repositoryId: "string",
excludePatternsText: "string?", excludePatternsText: "string?",
excludeIfPresentText: "string?",
includePatternsText: "string?",
includePatterns: "string[]?", includePatterns: "string[]?",
frequency: "string", frequency: "string",
dailyTime: "string?", dailyTime: "string?",
@@ -51,8 +53,12 @@ export const weeklyDays = [
type InternalFormValues = typeof internalFormSchema.infer; type InternalFormValues = typeof internalFormSchema.infer;
export type BackupScheduleFormValues = Omit<InternalFormValues, "excludePatternsText"> & { export type BackupScheduleFormValues = Omit<
InternalFormValues,
"excludePatternsText" | "excludeIfPresentText" | "includePatternsText"
> & {
excludePatterns?: string[]; excludePatterns?: string[];
excludeIfPresent?: string[];
}; };
type Props = { type Props = {
@@ -80,14 +86,21 @@ const backupScheduleToFormValues = (schedule?: BackupSchedule): InternalFormValu
const weeklyDay = frequency === "weekly" ? dayOfWeekPart : undefined; const weeklyDay = frequency === "weekly" ? dayOfWeekPart : undefined;
const patterns = schedule.includePatterns || [];
const isGlobPattern = (p: string) => /[*?[\]]/.test(p);
const fileBrowserPaths = patterns.filter((p) => !isGlobPattern(p));
const textPatterns = patterns.filter(isGlobPattern);
return { return {
name: schedule.name, name: schedule.name,
repositoryId: schedule.repositoryId, repositoryId: schedule.repositoryId,
frequency, frequency,
dailyTime, dailyTime,
weeklyDay, weeklyDay,
includePatterns: schedule.includePatterns || undefined, includePatterns: fileBrowserPaths.length > 0 ? fileBrowserPaths : undefined,
includePatternsText: textPatterns.length > 0 ? textPatterns.join("\n") : undefined,
excludePatternsText: schedule.excludePatterns?.join("\n") || undefined, excludePatternsText: schedule.excludePatterns?.join("\n") || undefined,
excludeIfPresentText: schedule.excludeIfPresent?.join("\n") || undefined,
...schedule.retentionPolicy, ...schedule.retentionPolicy,
}; };
}; };
@@ -100,18 +113,40 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
const handleSubmit = useCallback( const handleSubmit = useCallback(
(data: InternalFormValues) => { (data: InternalFormValues) => {
// Convert excludePatternsText string to excludePatterns array const {
const { excludePatternsText, ...rest } = data; excludePatternsText,
excludeIfPresentText,
includePatternsText,
includePatterns: fileBrowserPatterns,
...rest
} = data;
const excludePatterns = excludePatternsText const excludePatterns = excludePatternsText
? excludePatternsText ? excludePatternsText
.split("\n") .split("\n")
.map((p) => p.trim()) .map((p) => p.trim())
.filter(Boolean) .filter(Boolean)
: undefined; : [];
const excludeIfPresent = excludeIfPresentText
? excludeIfPresentText
.split("\n")
.map((p) => p.trim())
.filter(Boolean)
: [];
const textPatterns = includePatternsText
? includePatternsText
.split("\n")
.map((p) => p.trim())
.filter(Boolean)
: [];
const includePatterns = [...(fileBrowserPatterns || []), ...textPatterns];
onSubmit({ onSubmit({
...rest, ...rest,
includePatterns: includePatterns.length > 0 ? includePatterns : [],
excludePatterns, excludePatterns,
excludeIfPresent,
}); });
}, },
[onSubmit], [onSubmit],
@@ -296,6 +331,27 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
</div> </div>
</div> </div>
)} )}
<FormField
control={form.control}
name="includePatternsText"
render={({ field }) => (
<FormItem className="mt-6">
<FormLabel>Additional include patterns</FormLabel>
<FormControl>
<Textarea
{...field}
placeholder="/data/**&#10;/config/*.json&#10;*.db"
className="font-mono text-sm min-h-[100px]"
/>
</FormControl>
<FormDescription>
Optionally add custom include patterns using glob syntax. Enter one pattern per line. These will
be combined with the paths selected above.
</FormDescription>
<FormMessage />
</FormItem>
)}
/>
</CardContent> </CardContent>
</Card> </Card>
@@ -337,6 +393,28 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
</FormItem> </FormItem>
)} )}
/> />
<FormField
control={form.control}
name="excludeIfPresentText"
render={({ field }) => (
<FormItem className="mt-6">
<FormLabel>Exclude if file present</FormLabel>
<FormControl>
<Textarea
{...field}
placeholder=".nobackup&#10;.exclude-from-backup&#10;CACHEDIR.TAG"
className="font-mono text-sm min-h-20"
/>
</FormControl>
<FormDescription>
Exclude folders containing a file with the specified name. Enter one filename per line. For
example, use <code className="bg-muted px-1 rounded">.nobackup</code> to skip any folder
containing a <code className="bg-muted px-1 rounded">.nobackup</code> file.
</FormDescription>
<FormMessage />
</FormItem>
)}
/>
</CardContent> </CardContent>
</Card> </Card>
@@ -499,18 +577,27 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
{repositoriesData?.find((r) => r.id === formValues.repositoryId)?.name || "—"} {repositoriesData?.find((r) => r.id === formValues.repositoryId)?.name || "—"}
</p> </p>
</div> </div>
{formValues.includePatterns && formValues.includePatterns.length > 0 && ( {(formValues.includePatterns && formValues.includePatterns.length > 0) ||
formValues.includePatternsText ? (
<div> <div>
<p className="text-xs uppercase text-muted-foreground">Include paths</p> <p className="text-xs uppercase text-muted-foreground">Include paths/patterns</p>
<div className="flex flex-col gap-1"> <div className="flex flex-col gap-1">
{formValues.includePatterns.map((path) => ( {formValues.includePatterns?.map((path) => (
<span key={path} className="text-xs font-mono bg-accent px-1.5 py-0.5 rounded"> <span key={path} className="text-xs font-mono bg-accent px-1.5 py-0.5 rounded">
{path} {path}
</span> </span>
))} ))}
{formValues.includePatternsText
?.split("\n")
.filter(Boolean)
.map((pattern) => (
<span key={pattern} className="text-xs font-mono bg-accent px-1.5 py-0.5 rounded">
{pattern.trim()}
</span>
))}
</div> </div>
</div> </div>
)} ) : null}
{formValues.excludePatternsText && ( {formValues.excludePatternsText && (
<div> <div>
<p className="text-xs uppercase text-muted-foreground">Exclude patterns</p> <p className="text-xs uppercase text-muted-foreground">Exclude patterns</p>
@@ -526,6 +613,21 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
</div> </div>
</div> </div>
)} )}
{formValues.excludeIfPresentText && (
<div>
<p className="text-xs uppercase text-muted-foreground">Exclude if present</p>
<div className="flex flex-col gap-1">
{formValues.excludeIfPresentText
.split("\n")
.filter(Boolean)
.map((filename) => (
<span key={filename} className="text-xs font-mono bg-accent px-1.5 py-0.5 rounded">
{filename.trim()}
</span>
))}
</div>
</div>
)}
<div> <div>
<p className="text-xs uppercase text-muted-foreground">Retention</p> <p className="text-xs uppercase text-muted-foreground">Retention</p>
<p className="font-medium"> <p className="font-medium">

6
app/client/modules/backups/routes/backup-details.tsx
View File

@@ -160,6 +160,7 @@ export default function ScheduleDetailsPage({ params, loaderData }: Route.Compon
retentionPolicy: Object.keys(retentionPolicy).length > 0 ? retentionPolicy : undefined, retentionPolicy: Object.keys(retentionPolicy).length > 0 ? retentionPolicy : undefined,
includePatterns: formValues.includePatterns, includePatterns: formValues.includePatterns,
excludePatterns: formValues.excludePatterns, excludePatterns: formValues.excludePatterns,
excludeIfPresent: formValues.excludeIfPresent,
}, },
}); });
}; };
@@ -172,8 +173,9 @@ export default function ScheduleDetailsPage({ params, loaderData }: Route.Compon
enabled, enabled,
cronExpression: schedule.cronExpression, cronExpression: schedule.cronExpression,
retentionPolicy: schedule.retentionPolicy || undefined, retentionPolicy: schedule.retentionPolicy || undefined,
includePatterns: schedule.includePatterns || undefined, includePatterns: schedule.includePatterns || [],
excludePatterns: schedule.excludePatterns || undefined, excludePatterns: schedule.excludePatterns || [],
excludeIfPresent: schedule.excludeIfPresent || [],
}, },
}); });
}; };

1
app/client/modules/backups/routes/create-backup.tsx
View File

@@ -91,6 +91,7 @@ export default function CreateBackup({ loaderData }: Route.ComponentProps) {
retentionPolicy: Object.keys(retentionPolicy).length > 0 ? retentionPolicy : undefined, retentionPolicy: Object.keys(retentionPolicy).length > 0 ? retentionPolicy : undefined,
includePatterns: formValues.includePatterns, includePatterns: formValues.includePatterns,
excludePatterns: formValues.excludePatterns, excludePatterns: formValues.excludePatterns,
excludeIfPresent: formValues.excludeIfPresent,
}, },
}); });
}; };

1
app/drizzle/0020_even_dexter_bennett.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE `backup_schedules_table` ADD `exclude_if_present` text DEFAULT '[]';

815
app/drizzle/meta/0020_snapshot.json Normal file
View File

@@ -0,0 +1,815 @@
{
"version": "6",
"dialect": "sqlite",
"id": "729d3ce9-b4b9-41f6-a270-d74c96510238",
"prevId": "b5b3acff-51d7-45ae-b9d2-4b07a6286fc3",
"tables": {
"app_metadata": {
"name": "app_metadata",
"columns": {
"key": {
"name": "key",
"type": "text",
"primaryKey": true,
"notNull": true,
"autoincrement": false
},
"value": {
"name": "value",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"created_at": {
"name": "created_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
},
"updated_at": {
"name": "updated_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"checkConstraints": {}
},
"backup_schedule_mirrors_table": {
"name": "backup_schedule_mirrors_table",
"columns": {
"id": {
"name": "id",
"type": "integer",
"primaryKey": true,
"notNull": true,
"autoincrement": true
},
"schedule_id": {
"name": "schedule_id",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"repository_id": {
"name": "repository_id",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"enabled": {
"name": "enabled",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": true
},
"last_copy_at": {
"name": "last_copy_at",
"type": "integer",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"last_copy_status": {
"name": "last_copy_status",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"last_copy_error": {
"name": "last_copy_error",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"created_at": {
"name": "created_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
}
},
"indexes": {
"backup_schedule_mirrors_table_schedule_id_repository_id_unique": {
"name": "backup_schedule_mirrors_table_schedule_id_repository_id_unique",
"columns": [
"schedule_id",
"repository_id"
],
"isUnique": true
}
},
"foreignKeys": {
"backup_schedule_mirrors_table_schedule_id_backup_schedules_table_id_fk": {
"name": "backup_schedule_mirrors_table_schedule_id_backup_schedules_table_id_fk",
"tableFrom": "backup_schedule_mirrors_table",
"tableTo": "backup_schedules_table",
"columnsFrom": [
"schedule_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
},
"backup_schedule_mirrors_table_repository_id_repositories_table_id_fk": {
"name": "backup_schedule_mirrors_table_repository_id_repositories_table_id_fk",
"tableFrom": "backup_schedule_mirrors_table",
"tableTo": "repositories_table",
"columnsFrom": [
"repository_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"checkConstraints": {}
},
"backup_schedule_notifications_table": {
"name": "backup_schedule_notifications_table",
"columns": {
"schedule_id": {
"name": "schedule_id",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"destination_id": {
"name": "destination_id",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"notify_on_start": {
"name": "notify_on_start",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": false
},
"notify_on_success": {
"name": "notify_on_success",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": false
},
"notify_on_failure": {
"name": "notify_on_failure",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": true
},
"created_at": {
"name": "created_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
}
},
"indexes": {},
"foreignKeys": {
"backup_schedule_notifications_table_schedule_id_backup_schedules_table_id_fk": {
"name": "backup_schedule_notifications_table_schedule_id_backup_schedules_table_id_fk",
"tableFrom": "backup_schedule_notifications_table",
"tableTo": "backup_schedules_table",
"columnsFrom": [
"schedule_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
},
"backup_schedule_notifications_table_destination_id_notification_destinations_table_id_fk": {
"name": "backup_schedule_notifications_table_destination_id_notification_destinations_table_id_fk",
"tableFrom": "backup_schedule_notifications_table",
"tableTo": "notification_destinations_table",
"columnsFrom": [
"destination_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {
"backup_schedule_notifications_table_schedule_id_destination_id_pk": {
"columns": [
"schedule_id",
"destination_id"
],
"name": "backup_schedule_notifications_table_schedule_id_destination_id_pk"
}
},
"uniqueConstraints": {},
"checkConstraints": {}
},
"backup_schedules_table": {
"name": "backup_schedules_table",
"columns": {
"id": {
"name": "id",
"type": "integer",
"primaryKey": true,
"notNull": true,
"autoincrement": true
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"volume_id": {
"name": "volume_id",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"repository_id": {
"name": "repository_id",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"enabled": {
"name": "enabled",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": true
},
"cron_expression": {
"name": "cron_expression",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"retention_policy": {
"name": "retention_policy",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"exclude_patterns": {
"name": "exclude_patterns",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false,
"default": "'[]'"
},
"exclude_if_present": {
"name": "exclude_if_present",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false,
"default": "'[]'"
},
"include_patterns": {
"name": "include_patterns",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false,
"default": "'[]'"
},
"last_backup_at": {
"name": "last_backup_at",
"type": "integer",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"last_backup_status": {
"name": "last_backup_status",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"last_backup_error": {
"name": "last_backup_error",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"next_backup_at": {
"name": "next_backup_at",
"type": "integer",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"created_at": {
"name": "created_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
},
"updated_at": {
"name": "updated_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
}
},
"indexes": {
"backup_schedules_table_name_unique": {
"name": "backup_schedules_table_name_unique",
"columns": [
"name"
],
"isUnique": true
}
},
"foreignKeys": {
"backup_schedules_table_volume_id_volumes_table_id_fk": {
"name": "backup_schedules_table_volume_id_volumes_table_id_fk",
"tableFrom": "backup_schedules_table",
"tableTo": "volumes_table",
"columnsFrom": [
"volume_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
},
"backup_schedules_table_repository_id_repositories_table_id_fk": {
"name": "backup_schedules_table_repository_id_repositories_table_id_fk",
"tableFrom": "backup_schedules_table",
"tableTo": "repositories_table",
"columnsFrom": [
"repository_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"checkConstraints": {}
},
"notification_destinations_table": {
"name": "notification_destinations_table",
"columns": {
"id": {
"name": "id",
"type": "integer",
"primaryKey": true,
"notNull": true,
"autoincrement": true
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"enabled": {
"name": "enabled",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": true
},
"type": {
"name": "type",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"config": {
"name": "config",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"created_at": {
"name": "created_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
},
"updated_at": {
"name": "updated_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
}
},
"indexes": {
"notification_destinations_table_name_unique": {
"name": "notification_destinations_table_name_unique",
"columns": [
"name"
],
"isUnique": true
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"checkConstraints": {}
},
"repositories_table": {
"name": "repositories_table",
"columns": {
"id": {
"name": "id",
"type": "text",
"primaryKey": true,
"notNull": true,
"autoincrement": false
},
"short_id": {
"name": "short_id",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"type": {
"name": "type",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"config": {
"name": "config",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"compression_mode": {
"name": "compression_mode",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false,
"default": "'auto'"
},
"status": {
"name": "status",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false,
"default": "'unknown'"
},
"last_checked": {
"name": "last_checked",
"type": "integer",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"last_error": {
"name": "last_error",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"created_at": {
"name": "created_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
},
"updated_at": {
"name": "updated_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
}
},
"indexes": {
"repositories_table_short_id_unique": {
"name": "repositories_table_short_id_unique",
"columns": [
"short_id"
],
"isUnique": true
},
"repositories_table_name_unique": {
"name": "repositories_table_name_unique",
"columns": [
"name"
],
"isUnique": true
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"checkConstraints": {}
},
"sessions_table": {
"name": "sessions_table",
"columns": {
"id": {
"name": "id",
"type": "text",
"primaryKey": true,
"notNull": true,
"autoincrement": false
},
"user_id": {
"name": "user_id",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"expires_at": {
"name": "expires_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"created_at": {
"name": "created_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
}
},
"indexes": {},
"foreignKeys": {
"sessions_table_user_id_users_table_id_fk": {
"name": "sessions_table_user_id_users_table_id_fk",
"tableFrom": "sessions_table",
"tableTo": "users_table",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"checkConstraints": {}
},
"users_table": {
"name": "users_table",
"columns": {
"id": {
"name": "id",
"type": "integer",
"primaryKey": true,
"notNull": true,
"autoincrement": true
},
"username": {
"name": "username",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"password_hash": {
"name": "password_hash",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"has_downloaded_restic_password": {
"name": "has_downloaded_restic_password",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": false
},
"created_at": {
"name": "created_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
},
"updated_at": {
"name": "updated_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
}
},
"indexes": {
"users_table_username_unique": {
"name": "users_table_username_unique",
"columns": [
"username"
],
"isUnique": true
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"checkConstraints": {}
},
"volumes_table": {
"name": "volumes_table",
"columns": {
"id": {
"name": "id",
"type": "integer",
"primaryKey": true,
"notNull": true,
"autoincrement": true
},
"short_id": {
"name": "short_id",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"type": {
"name": "type",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"status": {
"name": "status",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "'unmounted'"
},
"last_error": {
"name": "last_error",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"last_health_check": {
"name": "last_health_check",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
},
"created_at": {
"name": "created_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
},
"updated_at": {
"name": "updated_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(unixepoch() * 1000)"
},
"config": {
"name": "config",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"auto_remount": {
"name": "auto_remount",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": true
}
},
"indexes": {
"volumes_table_short_id_unique": {
"name": "volumes_table_short_id_unique",
"columns": [
"short_id"
],
"isUnique": true
},
"volumes_table_name_unique": {
"name": "volumes_table_name_unique",
"columns": [
"name"
],
"isUnique": true
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"checkConstraints": {}
}
},
"views": {},
"enums": {},
"_meta": {
"schemas": {},
"tables": {},
"columns": {}
},
"internal": {
"indexes": {}
}
}

7
app/drizzle/meta/_journal.json
View File

@@ -141,6 +141,13 @@
"when": 1764839917446, "when": 1764839917446,
"tag": "0019_secret_nomad", "tag": "0019_secret_nomad",
"breakpoints": true "breakpoints": true
},
{
"idx": 20,
"version": "6",
"when": 1764847918249,
"tag": "0020_even_dexter_bennett",
"breakpoints": true
} }
] ]
} }

1
app/server/db/schema.ts
View File

@@ -86,6 +86,7 @@ export const backupSchedulesTable = sqliteTable("backup_schedules_table", {
keepWithinDuration?: string; keepWithinDuration?: string;
}>(), }>(),
excludePatterns: text("exclude_patterns", { mode: "json" }).$type<string[]>().default([]), excludePatterns: text("exclude_patterns", { mode: "json" }).$type<string[]>().default([]),
excludeIfPresent: text("exclude_if_present", { mode: "json" }).$type<string[]>().default([]),
includePatterns: text("include_patterns", { mode: "json" }).$type<string[]>().default([]), includePatterns: text("include_patterns", { mode: "json" }).$type<string[]>().default([]),
lastBackupAt: int("last_backup_at", { mode: "number" }), lastBackupAt: int("last_backup_at", { mode: "number" }),
lastBackupStatus: text("last_backup_status").$type<"success" | "error" | "in_progress" | "warning">(), lastBackupStatus: text("last_backup_status").$type<"success" | "error" | "in_progress" | "warning">(),

3
app/server/modules/backups/backups.dto.ts
View File

@@ -24,6 +24,7 @@ const backupScheduleSchema = type({
cronExpression: "string", cronExpression: "string",
retentionPolicy: retentionPolicySchema.or("null"), retentionPolicy: retentionPolicySchema.or("null"),
excludePatterns: "string[] | null", excludePatterns: "string[] | null",
excludeIfPresent: "string[] | null",
includePatterns: "string[] | null", includePatterns: "string[] | null",
lastBackupAt: "number | null", lastBackupAt: "number | null",
lastBackupStatus: "'success' | 'error' | 'in_progress' | 'warning' | null", lastBackupStatus: "'success' | 'error' | 'in_progress' | 'warning' | null",
@@ -128,6 +129,7 @@ export const createBackupScheduleBody = type({
cronExpression: "string", cronExpression: "string",
retentionPolicy: retentionPolicySchema.optional(), retentionPolicy: retentionPolicySchema.optional(),
excludePatterns: "string[]?", excludePatterns: "string[]?",
excludeIfPresent: "string[]?",
includePatterns: "string[]?", includePatterns: "string[]?",
tags: "string[]?", tags: "string[]?",
}); });
@@ -164,6 +166,7 @@ export const updateBackupScheduleBody = type({
cronExpression: "string", cronExpression: "string",
retentionPolicy: retentionPolicySchema.optional(), retentionPolicy: retentionPolicySchema.optional(),
excludePatterns: "string[]?", excludePatterns: "string[]?",
excludeIfPresent: "string[]?",
includePatterns: "string[]?", includePatterns: "string[]?",
tags: "string[]?", tags: "string[]?",
}); });

6
app/server/modules/backups/backups.service.ts
View File

@@ -99,6 +99,7 @@ const createSchedule = async (data: CreateBackupScheduleBody) => {
cronExpression: data.cronExpression, cronExpression: data.cronExpression,
retentionPolicy: data.retentionPolicy ?? null, retentionPolicy: data.retentionPolicy ?? null,
excludePatterns: data.excludePatterns ?? [], excludePatterns: data.excludePatterns ?? [],
excludeIfPresent: data.excludeIfPresent ?? [],
includePatterns: data.includePatterns ?? [], includePatterns: data.includePatterns ?? [],
nextBackupAt: nextBackupAt, nextBackupAt: nextBackupAt,
}) })
@@ -246,6 +247,7 @@ const executeBackup = async (scheduleId: number, manual = false) => {
const backupOptions: { const backupOptions: {
exclude?: string[]; exclude?: string[];
excludeIfPresent?: string[];
include?: string[]; include?: string[];
tags?: string[]; tags?: string[];
signal?: AbortSignal; signal?: AbortSignal;
@@ -258,6 +260,10 @@ const executeBackup = async (scheduleId: number, manual = false) => {
backupOptions.exclude = schedule.excludePatterns; backupOptions.exclude = schedule.excludePatterns;
} }
if (schedule.excludeIfPresent && schedule.excludeIfPresent.length > 0) {
backupOptions.excludeIfPresent = schedule.excludeIfPresent;
}
if (schedule.includePatterns && schedule.includePatterns.length > 0) { if (schedule.includePatterns && schedule.includePatterns.length > 0) {
backupOptions.include = schedule.includePatterns; backupOptions.include = schedule.includePatterns;
} }

7
app/server/utils/restic.ts
View File

@@ -235,6 +235,7 @@ const backup = async (
source: string, source: string,
options?: { options?: {
exclude?: string[]; exclude?: string[];
excludeIfPresent?: string[];
include?: string[]; include?: string[];
tags?: string[]; tags?: string[];
compressionMode?: CompressionMode; compressionMode?: CompressionMode;
@@ -280,6 +281,12 @@ const backup = async (
} }
} }
if (options?.excludeIfPresent && options.excludeIfPresent.length > 0) {
for (const filename of options.excludeIfPresent) {
args.push("--exclude-if-present", filename);
}
}
addCommonArgs(args, env); addCommonArgs(args, env);
const logData = throttle((data: string) => { const logData = throttle((data: string) => {