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

fix: normalize names for existence checks

Browse source
This commit is contained in:
Jakub Trávník 2025-12-31 12:06:16 +01:00
parent 0be65dc9b4
commit 37d04d3b61
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/server/modules/lifecycle/config-import.ts
View file

@ -159,7 +159,9 @@ async function importVolumes(volumes: unknown[]): Promise<ImportResult> {
throw new Error("Invalid volume entry"); throw new Error("Invalid volume entry");
} }
if (existingNames.has(v.name)) { // The service uses slugify to normalize the name, so we check against stored names
const slugifiedName = slugify(v.name, { lower: true, strict: true });
if (existingNames.has(slugifiedName)) {
logger.info(`Volume '${v.name}' already exists`); logger.info(`Volume '${v.name}' already exists`);
result.skipped++; result.skipped++;
continue; continue;
@ -244,7 +246,8 @@ async function importRepositories(repositories: unknown[]): Promise<ImportResult
} }
// Skip if a repository with the same name already exists (fallback for repos without deterministic paths) // Skip if a repository with the same name already exists (fallback for repos without deterministic paths)
if (existingNames.has(r.name)) { // Repository names are stored trimmed
if (existingNames.has(r.name.trim())) {
logger.info(`Repository '${r.name}': a repository with this name already exists`); logger.info(`Repository '${r.name}': a repository with this name already exists`);
result.skipped++; result.skipped++;
continue; continue;
@ -457,7 +460,9 @@ async function importBackupSchedules(backupSchedules: unknown[]): Promise<Import
result.warnings++; result.warnings++;
continue; continue;
} }
const volume = volumeByName.get(volumeName); // Volume names are stored slugified
const volumeSlug = slugify(volumeName, { lower: true, strict: true });
const volume = volumeByName.get(volumeSlug);
if (!volume) { if (!volume) {
logger.warn(`Backup schedule not processed: Volume '${volumeName}' not found`); logger.warn(`Backup schedule not processed: Volume '${volumeName}' not found`);
result.warnings++; result.warnings++;
@ -470,7 +475,8 @@ async function importBackupSchedules(backupSchedules: unknown[]): Promise<Import
result.warnings++; result.warnings++;
continue; continue;
} }
const repository = repoByName.get(repositoryName); // Repository names are stored trimmed
const repository = repoByName.get(repositoryName.trim());
if (!repository) { if (!repository) {
logger.warn(`Backup schedule not processed: Repository '${repositoryName}' not found`); logger.warn(`Backup schedule not processed: Repository '${repositoryName}' not found`);
result.warnings++; result.warnings++;
@ -589,7 +595,8 @@ async function attachScheduleMirrors(
continue; continue;
} }
const repo = repoByName.get(repoName); // Repository names are stored trimmed
const repo = repoByName.get(repoName.trim());
if (!repo) { if (!repo) {
logger.warn(`Mirror repository '${repoName}' not found for schedule '${scheduleName}'`); logger.warn(`Mirror repository '${repoName}' not found for schedule '${scheduleName}'`);
result.warnings++; result.warnings++;