gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-05 15:04:24 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

fix(fs_sync): unique constraint failed

Browse Source
This commit is contained in:
Elian Doran 2025-07-26 20:33:54 +03:00
parent 2c096f3080
commit eb07d4b0ed
No known key found for this signature in database
2 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/server/src/services/file_system_sync.ts
View File

@ -295,6 +295,13 @@ class FileSystemSync {
const fileStats = await fs.stat(filePath);
const fileHash = await this.calculateFileHash(filePath);
// Check if mapping already exists (safety check)
const existingMapping = this.findFileNoteMappingByPath(mapping.mappingId, filePath);
if (existingMapping) {
log.info(`File mapping already exists for ${filePath}, skipping creation`);
return;
}
// Create file note mapping
const fileNoteMapping = new BFileNoteMapping({
mappingId: mapping.mappingId,
@ -380,6 +387,13 @@ class FileSystemSync {
// Create note from file
const note = await this.createNoteFromFile(mapping, filePath);
// Check if mapping already exists (safety check)
const existingMapping = this.findFileNoteMappingByPath(mapping.mappingId, filePath);
if (existingMapping) {
log.info(`File mapping already exists for ${filePath}, skipping creation`);
return;
}
// Create file note mapping
const fileNoteMapping = new BFileNoteMapping({
mappingId: mapping.mappingId,

46
apps/server/src/services/file_system_watcher.ts
View File

@ -297,7 +297,7 @@ class FileSystemWatcher {
// Find existing file note mapping
let fileNoteMapping: BFileNoteMapping | null = null;
for (const mapping of Object.values(becca.fileNoteMappings || {})) {
if (mapping.mappingId === event.mappingId && mapping.filePath === event.filePath) {
if (mapping.mappingId === event.mappingId && path.normalize(mapping.filePath) === path.normalize(event.filePath)) {
fileNoteMapping = mapping;
break;
}
@ -319,15 +319,41 @@ class FileSystemWatcher {
fileNoteMapping.markPending();
} else {
// Create new file note mapping
fileNoteMapping = new BFileNoteMapping({
mappingId: event.mappingId,
noteId: '', // Will be determined by sync service
filePath: event.filePath,
fileHash,
fileModifiedTime,
syncStatus: 'pending'
}).save();
// Double-check if mapping exists before creating (race condition protection)
const existingCheck = Object.values(becca.fileNoteMappings || {}).find(m =>
m.mappingId === event.mappingId && path.normalize(m.filePath) === path.normalize(event.filePath)
);
if (existingCheck) {
log.info(`File mapping already exists for ${event.filePath}, using existing mapping`);
fileNoteMapping = existingCheck;
fileNoteMapping.markPending();
} else {
// Create new file note mapping
try {
fileNoteMapping = new BFileNoteMapping({
mappingId: event.mappingId,
noteId: '', // Will be determined by sync service
filePath: event.filePath,
fileHash,
fileModifiedTime,
syncStatus: 'pending'
}).save();
} catch (error: any) {
if (error.code === 'SQLITE_CONSTRAINT_UNIQUE') {
log.info(`File mapping constraint violation for ${event.filePath}, trying to find existing mapping`);
// Try to find the mapping again - it might have been created by another process
fileNoteMapping = Object.values(becca.fileNoteMappings || {}).find(m =>
m.mappingId === event.mappingId && path.normalize(m.filePath) === path.normalize(event.filePath)
) || null;
if (!fileNoteMapping) {
throw error; // Re-throw if we still can't find it
}
} else {
throw error;
}
}
}
}
// Emit event for sync service to handle