deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2026-03-14 14:35:46 +01:00
Code Issues Projects Releases Wiki Activity

Update logging for upsert() function (#3333)

Browse source 
* Add additional logging for upsert() function
* Add missing finalise() for orphan deletion
This commit is contained in:
abraunegg 2025-06-11 16:57:18 +10:00 • committed by GitHub
commit 6e5e83843d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/itemdb.d
View file

@ -516,6 +516,10 @@ final class ItemDatabase {
}
try {
if (debugLogging) {
addLogEntry("Attempting upsert for item: id='" ~ item.id ~ "', parentId='" ~ item.parentId ~ "', name='" ~ item.name ~ "'", ["debug"]);
}
selectStmt.bind(1, item.driveId);
selectStmt.bind(2, item.id);
auto result = selectStmt.exec();
@ -523,36 +527,49 @@ final class ItemDatabase {
// If the existing 'driveId' and 'id' are in the DB, then this is a record to update
if (count == 0) {
// No existing record .... however
// Item with id not found, check for orphaned entry by parentId and name
// - If the user has deleted and recreated the folder online with the same name, whilst we may have an existing entry, this will have the old 'id'
selectParentalStmt.bind(1, item.driveId);
selectParentalStmt.bind(2, item.parentId);
selectParentalStmt.bind(3, item.name);
auto orphanResult = selectParentalStmt.exec();
size_t orphanCount = orphanResult.front[0].to!size_t;
// Were orphans found?
if (orphanCount == 0) {
// Yes .. unique, no orphaned entry
// No match on name+parentId either — new insert
if (debugLogging) {
addLogEntry("Inserting new item: id='" ~ item.id ~ "', parentId='" ~ item.parentId ~ "', name='" ~ item.name ~ "'", ["debug"]);
}
executionStmt = db.prepare(insertItemStmt);
} else {
// Orphaned entry ...
if (debugLogging) {addLogEntry("Orphaned DB Entry - must delete orphan entry", ["debug"]);}
// Orphans found
if (debugLogging) {
addLogEntry("Orphan lookup: count=" ~ to!string(orphanCount) ~ " for driveId='" ~ item.driveId ~ "', parentId='" ~ item.parentId ~ "', name='" ~ item.name ~ "'", ["debug"]);
addLogEntry("Orphaned DB Entry - deleting old entry for name='" ~ item.name ~ "' and parentId='" ~ item.parentId ~ "'", ["debug"]);
}
// Orphan exists, delete it first
auto deleteOrphan = db.prepare(deleteOrphanItemStmt);
deleteOrphan.bind(1, item.driveId);
deleteOrphan.bind(2, item.parentId);
deleteOrphan.bind(3, item.name);
deleteOrphan.exec();
if (debugLogging) {addLogEntry("Orphaned DB Entry Removed - must insert new entry", ["debug"]);}
// Add new entry to avoid future orphan
deleteOrphan.finalise();
if (debugLogging) {
addLogEntry("Deleted orphaned entry — now inserting new item: id='" ~ item.id ~ "', parentId='" ~ item.parentId ~ "', name='" ~ item.name ~ "'", ["debug"]);
}
executionStmt = db.prepare(insertItemStmt);
if (debugLogging) {addLogEntry("Orphaned DB Entry Replaced with new entry", ["debug"]);}
}
} else {
// Existing record
// Found by ID — perform update
if (debugLogging) {
addLogEntry("Updating existing DB record: id='" ~ item.id ~ "', parentId='" ~ item.parentId ~ "', name='" ~ item.name ~ "'", ["debug"]);
}
executionStmt = db.prepare(updateItemStmt);
}
bindItem(item, executionStmt);
executionStmt.exec();
} catch (SqliteException exception) {