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

fix: prepend mount path location in exclude patterns

Browse source
This commit is contained in:
Nicolas Meienberger 2025-12-19 21:40:42 +01:00
parent 61dc07b36b
commit d6dc3fa96f
4 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -318,7 +318,7 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
onSelectionChange={handleSelectionChange}
withCheckboxes={true}
foldersOnly={false}
className="flex-1 border rounded-md bg-card p-2 min-h-[300px] max-h-[400px] overflow-auto"
className="flex-1 border rounded-md bg-card p-2 min-h-75 max-h-100 overflow-auto"
/>
{selectedPaths.size > 0 && (
<div className="mt-4">
@ -342,7 +342,7 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
<Textarea
{...field}
placeholder="/data/**&#10;/config/*.json&#10;*.db"
className="font-mono text-sm min-h-[100px]"
className="font-mono text-sm min-h-25"
/>
</FormControl>
<FormDescription>
@ -375,7 +375,7 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
<Textarea
{...field}
placeholder="*.tmp&#10;node_modules/**&#10;.cache/&#10;*.log"
className="font-mono text-sm min-h-[120px]"
className="font-mono text-sm min-h-30"
/>
</FormControl>
<FormDescription>

4
app/server/modules/backends/utils/backend-utils.ts
View file

@ -7,6 +7,7 @@ import { $ } from "bun";
export const executeMount = async (args: string[]): Promise<void> => {
let stderr: string | undefined;
logger.debug(`Executing mount ${args.join(" ")}`);
const result = await $`mount ${args}`.nothrow();
stderr = result.stderr.toString();
@ -22,7 +23,8 @@ export const executeMount = async (args: string[]): Promise<void> => {
export const executeUnmount = async (path: string): Promise<void> => {
let stderr: string | undefined;
const result = await $`umount -l -f ${path}`.nothrow();
logger.debug(`Executing umount -l ${path}`);
const result = await $`umount -l ${path}`.nothrow();
stderr = result.stderr.toString();
if (stderr?.trim()) {

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

@ -13,6 +13,7 @@ import { serverEvents } from "../../core/events";
import { notificationsService } from "../notifications/notifications.service";
import { repoMutex } from "../../core/repository-mutex";
import { checkMirrorCompatibility, getIncompatibleMirrorError } from "~/server/utils/backend-compatibility";
import path from "node:path";
const runningBackups = new Map<number, AbortController>();
@ -258,7 +259,16 @@ const executeBackup = async (scheduleId: number, manual = false) => {
};
if (schedule.excludePatterns && schedule.excludePatterns.length > 0) {
backupOptions.exclude = schedule.excludePatterns;
const excludePatterns = [];
for (const pattern of schedule.excludePatterns) {
if (!pattern.startsWith(volumePath)) {
excludePatterns.push(path.join(volumePath, pattern));
} else {
excludePatterns.push(pattern);
}
}
backupOptions.exclude = excludePatterns;
}
if (schedule.excludeIfPresent && schedule.excludeIfPresent.length > 0) {
@ -266,7 +276,16 @@ const executeBackup = async (scheduleId: number, manual = false) => {
}
if (schedule.includePatterns && schedule.includePatterns.length > 0) {
backupOptions.include = schedule.includePatterns;
const includePatterns = [];
for (const pattern of schedule.includePatterns) {
if (!pattern.startsWith(volumePath)) {
includePatterns.push(path.join(volumePath, pattern));
} else {
includePatterns.push(pattern);
}
}
backupOptions.include = includePatterns;
}
const releaseBackupLock = await repoMutex.acquireShared(repository.id, `backup:${volume.name}`);

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

@ -267,9 +267,7 @@ const backup = async (
const tmp = await fs.mkdtemp(path.join(os.tmpdir(), "zerobyte-restic-include-"));
includeFile = path.join(tmp, `include.txt`);
const includePaths = options.include.map((p) => path.join(source, p));
await fs.writeFile(includeFile, includePaths.join("\n"), "utf-8");
await fs.writeFile(includeFile, options.include.join("\n"), "utf-8");
args.push("--files-from", includeFile);
} else {
@ -280,10 +278,14 @@ const backup = async (
args.push("--exclude", exclude);
}
let excludeFile: string | null = null;
if (options?.exclude && options.exclude.length > 0) {
for (const pattern of options.exclude) {
args.push("--exclude", pattern);
}
const tmp = await fs.mkdtemp(path.join(os.tmpdir(), "zerobyte-restic-exclude-"));
excludeFile = path.join(tmp, `exclude.txt`);
await fs.writeFile(excludeFile, options.exclude.join("\n"), "utf-8");
args.push("--exclude-file", excludeFile);
}
if (options?.excludeIfPresent && options.excludeIfPresent.length > 0) {
@ -330,6 +332,7 @@ const backup = async (
},
finally: async () => {
includeFile && (await fs.unlink(includeFile).catch(() => {}));
excludeFile && (await fs.unlink(excludeFile).catch(() => {}));
await cleanupTemporaryKeys(config, env);
},
});