self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity

Chore: Desktop: Add extra check to try to prevent duplicate setting key warning (#11084)

Browse Source
This commit is contained in:
Henry Heino 2024-09-21 05:01:08 -07:00 committed by GitHub
parent be5a6c189a
commit 99696637b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
packages/lib/models/Setting.ts
View File

@ -548,20 +548,6 @@ class Setting extends BaseModel {
this.cache_ = [];
const rows: CacheItem[] = await this.modelSelectAll('SELECT * FROM settings');
this.cache_ = [];
const pushItemsToCache = (items: CacheItem[]) => {
for (let i = 0; i < items.length; i++) {
const c = items[i];
if (!this.keyExists(c.key)) continue;
c.value = this.formatValue(c.key, c.value);
c.value = this.filterValue(c.key, c.value);
this.cache_.push(c);
}
};
// Keys in the database takes precedence over keys in the keychain because
// they are more likely to be up to date (saving to keychain can fail, but
@ -602,6 +588,25 @@ class Setting extends BaseModel {
}
}
this.cache_ = [];
const cachedKeys = new Set();
const pushItemsToCache = (items: CacheItem[]) => {
for (let i = 0; i < items.length; i++) {
const c = items[i];
// Avoid duplicating keys -- doing so causes save issues.
if (cachedKeys.has(c.key)) continue;
if (!this.keyExists(c.key)) continue;
c.value = this.formatValue(c.key, c.value);
c.value = this.filterValue(c.key, c.value);
cachedKeys.add(c.key);
this.cache_.push(c);
}
};
pushItemsToCache(rows);
pushItemsToCache(secureItems);
pushItemsToCache(itemsFromFile);