mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Don't add non-syncing items to sync delete log

Browse source 
Currently just external annotations
This commit is contained in:
Dan Stillman 2021-01-20 20:59:40 -05:00
parent 226fc90308
commit 857b413df1
4 changed files with 52 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/xpcom/data/dataObject.js
View file

@ -1275,10 +1275,6 @@ Zotero.DataObject.prototype._initErase = Zotero.Promise.method(function (env) {
if (!env.options.skipEditCheck) this.editCheck();
if (env.options.skipDeleteLog) {
env.notifierData[this.id].skipDeleteLog = true;
}
return true;
});
@ -1294,6 +1290,10 @@ Zotero.DataObject.prototype._finalizeErase = Zotero.Promise.coroutine(function*
this.ObjectsClass.unload(env.deletedObjectIDs || this.id);
}.bind(this));
if (env.options.skipDeleteLog) {
env.notifierData[this.id].skipDeleteLog = true;
}
if (!env.options.skipNotifier) {
Zotero.Notifier.queue(
'delete',

6
chrome/content/zotero/xpcom/data/item.js
View file

@ -4538,6 +4538,7 @@ Zotero.Item.prototype._eraseData = Zotero.Promise.coroutine(function* (env) {
}
// Regular item
else {
// Delete child items
let sql = "SELECT itemID FROM itemNotes WHERE parentItemID=?1 UNION "
+ "SELECT itemID FROM itemAttachments WHERE parentItemID=?1";
let toDelete = yield Zotero.DB.columnQueryAsync(sql, [this.id]);
@ -4550,6 +4551,11 @@ Zotero.Item.prototype._eraseData = Zotero.Promise.coroutine(function* (env) {
}
}
// Don't add non-syncing items to delete log
if (!Zotero.Sync.Data.Local.isSyncItem(this)) {
env.options.skipDeleteLog = true;
}
// Remove related-item relations pointing to this item
var relatedItems = yield Zotero.Relations.getByPredicateAndObject(
'item', Zotero.Relations.relatedItemPredicate, Zotero.URI.getItemURI(this)

9
chrome/content/zotero/xpcom/sync/syncLocal.js
View file

@ -547,6 +547,7 @@ Zotero.Sync.Data.Local = {
+ "LEFT JOIN itemAnnotations IAn ON (O.itemID=IAn.itemID)";
}
sql += " WHERE libraryID=? AND synced=0";
// Don't sync external annotations
if (objectType == 'item') {
sql += " AND (IAn.isExternal IS NULL OR IAN.isExternal=0)";
}
@ -581,6 +582,14 @@ Zotero.Sync.Data.Local = {
}),
isSyncItem: function (item) {
if (item.itemType == 'annotation' && item.annotationIsExternal) {
return false;
}
return true;
},
//
// Cache management
//

33
test/tests/syncEventListenersTest.js
View file

@ -1,6 +1,39 @@
"use strict";
describe("Zotero.Sync.EventListeners", function () {
describe("ChangeListener", function () {
it("should add items to sync delete log", async function () {
var item = await createDataObject('item');
await item.eraseTx();
assert.ok(
await Zotero.Sync.Data.Local.getDateDeleted('item', item.libraryID, item.key)
);
});
it("shouldn't add items with `skipDeleteLog: true`", async function () {
var item = await createDataObject('item');
await item.eraseTx({
skipDeleteLog: true
});
assert.isFalse(
await Zotero.Sync.Data.Local.getDateDeleted('item', item.libraryID, item.key)
);
});
// Technically skipped in Zotero.DataObject._finalizeErase(), which sets skipDeleteLog
// based on the result of Sync.Data.Local.isSyncItem()
it("shouldn't add non-syncing items to sync delete log", async function () {
var attachment = await importFileAttachment('test.pdf');
var annotation = await createAnnotation('image', attachment, { isExternal: true });
await annotation.eraseTx();
assert.isFalse(
await Zotero.Sync.Data.Local.getDateDeleted(
'item', attachment.libraryID, annotation.key
)
);
});
});
describe("AutoSyncListener", function () {
var originalTimeout;