c4f3300e9b
When a selected subfolder had the exact same name as its parent volume mount, the `path.relative` check falsely identified the subfolder path as an absolute path already inside the volume. This caused the entire volume root to be backed up instead of the intended subfolder. Closes #250 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Improved handling of backup patterns when folder names match volume names. * Enhanced error handling for snapshot deletion operations. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
41 lines
1.5 KiB
TypeScript
41 lines
1.5 KiB
TypeScript
import CronExpressionParser from "cron-parser";
|
|
import path from "node:path";
|
|
import type { BackupSchedule } from "~/server/db/schema";
|
|
import { toMessage } from "~/server/utils/errors";
|
|
import { logger } from "~/server/utils/logger";
|
|
|
|
export const calculateNextRun = (cronExpression: string) => {
|
|
try {
|
|
const interval = CronExpressionParser.parse(cronExpression, {
|
|
currentDate: new Date(),
|
|
tz: Intl.DateTimeFormat().resolvedOptions().timeZone,
|
|
});
|
|
return interval.next().getTime();
|
|
} catch (error) {
|
|
logger.error(`Failed to parse cron expression "${cronExpression}": ${toMessage(error)}`);
|
|
const fallback = new Date();
|
|
fallback.setMinutes(fallback.getMinutes() + 1);
|
|
return fallback.getTime();
|
|
}
|
|
};
|
|
|
|
export const processPattern = (pattern: string, volumePath: string) => {
|
|
const isNegated = pattern.startsWith("!");
|
|
const p = isNegated ? pattern.slice(1) : pattern;
|
|
|
|
if (!p.startsWith("/")) {
|
|
return pattern;
|
|
}
|
|
|
|
const processed = path.join(volumePath, p.slice(1));
|
|
return isNegated ? `!${processed}` : processed;
|
|
};
|
|
|
|
export const createBackupOptions = (schedule: BackupSchedule, volumePath: string, signal: AbortSignal) => ({
|
|
tags: [schedule.shortId],
|
|
oneFileSystem: schedule.oneFileSystem,
|
|
signal,
|
|
exclude: schedule.excludePatterns ? schedule.excludePatterns.map((p) => processPattern(p, volumePath)) : undefined,
|
|
excludeIfPresent: schedule.excludeIfPresent ?? undefined,
|
|
include: schedule.includePatterns ? schedule.includePatterns.map((p) => processPattern(p, volumePath)) : undefined,
|
|
});
|