danvics/zerobyte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat: allow to control --one-file-system option from the schedule config (#201)

Browse source
This commit is contained in:
Nico 2025-12-21 14:21:08 +01:00 committed by GitHub
parent fc04cfe02e
commit 492aa4178d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 898 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/client/api-client/core/serverSentEvents.gen.ts
View file

@ -169,6 +169,8 @@ export const createSseClient = <TData = unknown>({
const { done, value } = await reader.read(); const { done, value } = await reader.read();
if (done) break; if (done) break;
buffer += value; buffer += value;
// Normalize line endings: CRLF -> LF, then CR -> LF
buffer = buffer.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
const chunks = buffer.split('\n\n'); const chunks = buffer.split('\n\n');
buffer = chunks.pop() ?? ''; buffer = chunks.pop() ?? '';

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

@ -1305,6 +1305,7 @@ export type ListBackupSchedulesResponses = {
lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null; lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null;
name: string; name: string;
nextBackupAt: number | null; nextBackupAt: number | null;
oneFileSystem: boolean;
repository: { repository: {
compressionMode: 'auto' | 'max' | 'off' | null; compressionMode: 'auto' | 'max' | 'off' | null;
config: { config: {
@ -1453,6 +1454,7 @@ export type CreateBackupScheduleData = {
excludeIfPresent?: Array<string>; excludeIfPresent?: Array<string>;
excludePatterns?: Array<string>; excludePatterns?: Array<string>;
includePatterns?: Array<string>; includePatterns?: Array<string>;
oneFileSystem?: boolean;
retentionPolicy?: { retentionPolicy?: {
keepDaily?: number; keepDaily?: number;
keepHourly?: number; keepHourly?: number;
@ -1486,6 +1488,7 @@ export type CreateBackupScheduleResponses = {
lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null; lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null;
name: string; name: string;
nextBackupAt: number | null; nextBackupAt: number | null;
oneFileSystem: boolean;
repositoryId: string; repositoryId: string;
retentionPolicy: { retentionPolicy: {
keepDaily?: number; keepDaily?: number;
@ -1549,6 +1552,7 @@ export type GetBackupScheduleResponses = {
lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null; lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null;
name: string; name: string;
nextBackupAt: number | null; nextBackupAt: number | null;
oneFileSystem: boolean;
repository: { repository: {
compressionMode: 'auto' | 'max' | 'off' | null; compressionMode: 'auto' | 'max' | 'off' | null;
config: { config: {
@ -1696,6 +1700,7 @@ export type UpdateBackupScheduleData = {
excludePatterns?: Array<string>; excludePatterns?: Array<string>;
includePatterns?: Array<string>; includePatterns?: Array<string>;
name?: string; name?: string;
oneFileSystem?: boolean;
retentionPolicy?: { retentionPolicy?: {
keepDaily?: number; keepDaily?: number;
keepHourly?: number; keepHourly?: number;
@ -1731,6 +1736,7 @@ export type UpdateBackupScheduleResponses = {
lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null; lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null;
name: string; name: string;
nextBackupAt: number | null; nextBackupAt: number | null;
oneFileSystem: boolean;
repositoryId: string; repositoryId: string;
retentionPolicy: { retentionPolicy: {
keepDaily?: number; keepDaily?: number;
@ -1774,6 +1780,7 @@ export type GetBackupScheduleForVolumeResponses = {
lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null; lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null;
name: string; name: string;
nextBackupAt: number | null; nextBackupAt: number | null;
oneFileSystem: boolean;
repository: { repository: {
compressionMode: 'auto' | 'max' | 'off' | null; compressionMode: 'auto' | 'max' | 'off' | null;
config: { config: {

25
app/client/modules/backups/components/create-schedule-form.tsx
View file

@ -6,6 +6,7 @@ import { useForm } from "react-hook-form";
import { listRepositoriesOptions } from "~/client/api-client/@tanstack/react-query.gen"; import { listRepositoriesOptions } from "~/client/api-client/@tanstack/react-query.gen";
import { RepositoryIcon } from "~/client/components/repository-icon"; import { RepositoryIcon } from "~/client/components/repository-icon";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "~/client/components/ui/card"; import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "~/client/components/ui/card";
import { Checkbox } from "~/client/components/ui/checkbox";
import { import {
Form, Form,
FormControl, FormControl,
@ -38,6 +39,7 @@ const internalFormSchema = type({
keepWeekly: "number?", keepWeekly: "number?",
keepMonthly: "number?", keepMonthly: "number?",
keepYearly: "number?", keepYearly: "number?",
oneFileSystem: "boolean?",
}); });
const cleanSchema = type.pipe((d) => internalFormSchema(deepClean(d))); const cleanSchema = type.pipe((d) => internalFormSchema(deepClean(d)));
@ -101,6 +103,7 @@ const backupScheduleToFormValues = (schedule?: BackupSchedule): InternalFormValu
includePatternsText: textPatterns.length > 0 ? textPatterns.join("\n") : 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, excludeIfPresentText: schedule.excludeIfPresent?.join("\n") || undefined,
oneFileSystem: schedule.oneFileSystem ?? false,
...schedule.retentionPolicy, ...schedule.retentionPolicy,
}; };
}; };
@ -416,6 +419,24 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
</FormItem> </FormItem>
)} )}
/> />
<FormField
control={form.control}
name="oneFileSystem"
render={({ field }) => (
<FormItem className="flex flex-row items-start space-x-3 space-y-0 rounded-md border p-4 mt-6">
<FormControl>
<Checkbox checked={field.value} onCheckedChange={field.onChange} />
</FormControl>
<div className="space-y-1 leading-none">
<FormLabel>Stay on one file system</FormLabel>
<FormDescription>
Prevent Restic from crossing file system boundaries. This is useful to avoid backing up network
mounts or other partitions that might be mounted inside your backup source.
</FormDescription>
</div>
</FormItem>
)}
/>
</CardContent> </CardContent>
</Card> </Card>
@ -629,6 +650,10 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
</div> </div>
</div> </div>
)} )}
<div>
<p className="text-xs uppercase text-muted-foreground">One file system</p>
<p className="font-medium">{formValues.oneFileSystem ? "Enabled" : "Disabled"}</p>
</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">

2
app/client/modules/backups/routes/backup-details.tsx
View file

@ -162,6 +162,7 @@ export default function ScheduleDetailsPage({ params, loaderData }: Route.Compon
includePatterns: formValues.includePatterns, includePatterns: formValues.includePatterns,
excludePatterns: formValues.excludePatterns, excludePatterns: formValues.excludePatterns,
excludeIfPresent: formValues.excludeIfPresent, excludeIfPresent: formValues.excludeIfPresent,
oneFileSystem: formValues.oneFileSystem,
}, },
}); });
}; };
@ -177,6 +178,7 @@ export default function ScheduleDetailsPage({ params, loaderData }: Route.Compon
includePatterns: schedule.includePatterns || [], includePatterns: schedule.includePatterns || [],
excludePatterns: schedule.excludePatterns || [], excludePatterns: schedule.excludePatterns || [],
excludeIfPresent: schedule.excludeIfPresent || [], excludeIfPresent: schedule.excludeIfPresent || [],
oneFileSystem: schedule.oneFileSystem,
}, },
}); });
}; };

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

@ -92,6 +92,7 @@ export default function CreateBackup({ loaderData }: Route.ComponentProps) {
includePatterns: formValues.includePatterns, includePatterns: formValues.includePatterns,
excludePatterns: formValues.excludePatterns, excludePatterns: formValues.excludePatterns,
excludeIfPresent: formValues.excludeIfPresent, excludeIfPresent: formValues.excludeIfPresent,
oneFileSystem: formValues.oneFileSystem,
}, },
}); });
}; };

2
app/drizzle/0023_special_thor.sql Normal file
View file

@ -0,0 +1,2 @@
ALTER TABLE `backup_schedules_table` ADD `one_file_system` integer DEFAULT false NOT NULL;
UPDATE `backup_schedules_table` SET `one_file_system` = true;

839
app/drizzle/meta/0023_snapshot.json Normal file
View file

@ -0,0 +1,839 @@
{
"version": "6",
"dialect": "sqlite",
"id": "3e3841ca-67a8-493a-a061-9c2a780878ed",
"prevId": "11c24867-3186-4578-b8dd-cee4c48a28d1",
"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_warning": {
"name": "notify_on_warning",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": true
},
"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
},
"one_file_system": {
"name": "one_file_system",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": false
},
"sort_order": {
"name": "sort_order",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": 0
},
"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

@ -162,6 +162,13 @@
"when": 1765794552191, "when": 1765794552191,
"tag": "0022_woozy_shen", "tag": "0022_woozy_shen",
"breakpoints": true "breakpoints": true
},
{
"idx": 23,
"version": "6",
"when": 1766320570509,
"tag": "0023_special_thor",
"breakpoints": true
} }
] ]
} }

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

@ -94,6 +94,7 @@ export const backupSchedulesTable = sqliteTable("backup_schedules_table", {
lastBackupStatus: text("last_backup_status").$type<"success" | "error" | "in_progress" | "warning">(), lastBackupStatus: text("last_backup_status").$type<"success" | "error" | "in_progress" | "warning">(),
lastBackupError: text("last_backup_error"), lastBackupError: text("last_backup_error"),
nextBackupAt: int("next_backup_at", { mode: "number" }), nextBackupAt: int("next_backup_at", { mode: "number" }),
oneFileSystem: int("one_file_system", { mode: "boolean" }).notNull().default(false),
sortOrder: int("sort_order", { mode: "number" }).notNull().default(0), sortOrder: int("sort_order", { mode: "number" }).notNull().default(0),
createdAt: int("created_at", { mode: "number" }).notNull().default(sql`(unixepoch() * 1000)`), createdAt: int("created_at", { mode: "number" }).notNull().default(sql`(unixepoch() * 1000)`),
updatedAt: int("updated_at", { mode: "number" }).notNull().default(sql`(unixepoch() * 1000)`), updatedAt: int("updated_at", { mode: "number" }).notNull().default(sql`(unixepoch() * 1000)`),

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

@ -26,6 +26,7 @@ const backupScheduleSchema = type({
excludePatterns: "string[] | null", excludePatterns: "string[] | null",
excludeIfPresent: "string[] | null", excludeIfPresent: "string[] | null",
includePatterns: "string[] | null", includePatterns: "string[] | null",
oneFileSystem: "boolean",
lastBackupAt: "number | null", lastBackupAt: "number | null",
lastBackupStatus: "'success' | 'error' | 'in_progress' | 'warning' | null", lastBackupStatus: "'success' | 'error' | 'in_progress' | 'warning' | null",
lastBackupError: "string | null", lastBackupError: "string | null",
@ -131,6 +132,7 @@ export const createBackupScheduleBody = type({
excludePatterns: "string[]?", excludePatterns: "string[]?",
excludeIfPresent: "string[]?", excludeIfPresent: "string[]?",
includePatterns: "string[]?", includePatterns: "string[]?",
oneFileSystem: "boolean?",
tags: "string[]?", tags: "string[]?",
}); });
@ -168,6 +170,7 @@ export const updateBackupScheduleBody = type({
excludePatterns: "string[]?", excludePatterns: "string[]?",
excludeIfPresent: "string[]?", excludeIfPresent: "string[]?",
includePatterns: "string[]?", includePatterns: "string[]?",
oneFileSystem: "boolean?",
tags: "string[]?", tags: "string[]?",
}); });

3
app/server/modules/backups/backups.service.ts
View file

@ -124,6 +124,7 @@ const createSchedule = async (data: CreateBackupScheduleBody) => {
excludePatterns: data.excludePatterns ?? [], excludePatterns: data.excludePatterns ?? [],
excludeIfPresent: data.excludeIfPresent ?? [], excludeIfPresent: data.excludeIfPresent ?? [],
includePatterns: data.includePatterns ?? [], includePatterns: data.includePatterns ?? [],
oneFileSystem: data.oneFileSystem,
nextBackupAt: nextBackupAt, nextBackupAt: nextBackupAt,
}) })
.returning(); .returning();
@ -273,9 +274,11 @@ const executeBackup = async (scheduleId: number, manual = false) => {
excludeIfPresent?: string[]; excludeIfPresent?: string[];
include?: string[]; include?: string[];
tags?: string[]; tags?: string[];
oneFileSystem?: boolean;
signal?: AbortSignal; signal?: AbortSignal;
} = { } = {
tags: [schedule.id.toString()], tags: [schedule.id.toString()],
oneFileSystem: schedule.oneFileSystem,
signal: abortController.signal, signal: abortController.signal,
}; };

14
app/server/utils/restic.ts
View file

@ -238,6 +238,7 @@ const backup = async (
excludeIfPresent?: string[]; excludeIfPresent?: string[];
include?: string[]; include?: string[];
tags?: string[]; tags?: string[];
oneFileSystem?: boolean;
compressionMode?: CompressionMode; compressionMode?: CompressionMode;
signal?: AbortSignal; signal?: AbortSignal;
onProgress?: (progress: BackupProgress) => void; onProgress?: (progress: BackupProgress) => void;
@ -246,14 +247,11 @@ const backup = async (
const repoUrl = buildRepoUrl(config); const repoUrl = buildRepoUrl(config);
const env = await buildEnv(config); const env = await buildEnv(config);
const args: string[] = [ const args: string[] = ["--repo", repoUrl, "backup", "--compression", options?.compressionMode ?? "auto"];
"--repo",
repoUrl, if (options?.oneFileSystem) {
"backup", args.push("--one-file-system");
"--one-file-system", }
"--compression",
options?.compressionMode ?? "auto",
];
if (options?.tags && options.tags.length > 0) { if (options?.tags && options.tags.length > 0) {
for (const tag of options.tags) { for (const tag of options.tags) {