scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-07 02:58:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix Added By backfill skipping items when batch count doesn't change

Browse source 
Use itemID offset to advance through batches instead of comparing
result counts, which would bail out when the number of remaining items
equaled the previous batch size.
This commit is contained in:
Dan Stillman 2026-03-23 10:23:11 -04:00
parent 46ba21fe75
commit 5bceea7b7b
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
chrome/content/zotero/xpcom/sync/syncEngine.js
View file

@ -1510,8 +1510,9 @@ Zotero.Sync.Data.Engine.prototype._updateGroupItemUsers = async function () {
let max = this.apiClient.MAX_OBJECTS_PER_REQUEST;
let sql = "SELECT key FROM items LEFT JOIN groupItems GI USING (itemID) "
+ "WHERE libraryID=? AND (GI.itemID IS NULL OR GI.createdByUserID IS NULL) "
+ `ORDER BY itemID LIMIT ${max}`;
let keys = await Zotero.DB.columnQueryAsync(sql, this.libraryID);
+ `AND items.itemID > ? ORDER BY items.itemID LIMIT ${max}`;
let minItemID = 0;
let keys = await Zotero.DB.columnQueryAsync(sql, [this.libraryID, minItemID]);
if (!keys.length) {
await Zotero.DB.queryAsync(
"REPLACE INTO settings VALUES ('sync', ?, 1)",
@ -1523,16 +1524,7 @@ Zotero.Sync.Data.Engine.prototype._updateGroupItemUsers = async function () {
Zotero.debug(`Updating item users in ${this.library.name}`);
let updatedItemIDs = [];
let lastCount;
while (keys.length) {
// If no progress was made, some items can't be resolved -- mark
// as complete so we don't retry every sync
if (keys.length === lastCount) {
Zotero.debug(`${keys.length} items remaining without user data -- stopping`);
break;
}
lastCount = keys.length;
let { json: jsonItems, error } = await this.apiClient.downloadObjects(
this.library.libraryType, this.libraryTypeID, 'item', keys
)[0];
@ -1550,7 +1542,6 @@ Zotero.Sync.Data.Engine.prototype._updateGroupItemUsers = async function () {
let item = Zotero.Items.getByLibraryAndKey(this.libraryID, jsonItem.key);
let params = [null, null];
// This should almost always exist, but maybe doesn't for some old items?
if (jsonItem.meta.createdByUser) {
let { id: userID, username, name } = jsonItem.meta.createdByUser;
await Zotero.Users.setName(userID, name !== '' ? name : username);
@ -1567,7 +1558,12 @@ Zotero.Sync.Data.Engine.prototype._updateGroupItemUsers = async function () {
updatedItemIDs.push(item.id);
}
keys = await Zotero.DB.columnQueryAsync(sql, this.libraryID);
// Advance past this batch using the last key from the query
let lastItem = Zotero.Items.getByLibraryAndKey(
this.libraryID, keys[keys.length - 1]
);
minItemID = lastItem.id;
keys = await Zotero.DB.columnQueryAsync(sql, [this.libraryID, minItemID]);
}
await Zotero.DB.queryAsync("REPLACE INTO settings VALUES ('sync', ?, 1)", settingKey);