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

Use seconds instead of ms for attachmentLastProcessedModificationTime

Browse source
This commit is contained in:
Dan Stillman 2021-01-22 02:34:50 -05:00
parent 88f886cb30
commit 89d9efdec7
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3233,10 +3233,11 @@ for (let name of ['lastProcessedModificationTime', 'pageIndex']) {
} }
if (parseInt(val) != val || val < 0) { if (parseInt(val) != val || val < 0) {
Zotero.debug(val, 2); Zotero.debug(val, 2);
throw new Error(`${prop} must be a timestamp in milliseconds`); throw new Error(`${prop} must be a timestamp in seconds`);
} }
if (val < 10000000000) { // Change before 2065!
Zotero.logError("attachmentlastProcesedModificationTime should be a timestamp in milliseconds " if (val > 3000000000) {
throw new Error(`${prop} should be a timestamp in seconds `
+ "-- " + val + " given"); + "-- " + val + " given");
} }
break; break;

4
chrome/content/zotero/xpcom/pdfWorker/manager.js
View file

@ -252,7 +252,9 @@ class PDFWorker {
reader.toggleImportPrompt(attachment.attachmentHasUnimportedAnnotations); reader.toggleImportPrompt(attachment.attachmentHasUnimportedAnnotations);
} }
} }
attachment.attachmentLastProcessedModificationTime = await attachment.attachmentModificationTime; attachment.attachmentLastProcessedModificationTime = Math.floor(
await attachment.attachmentModificationTime / 1000
);
await attachment.saveTx(); await attachment.saveTx();
return annotations.length; return annotations.length;
}); });

2
chrome/content/zotero/xpcom/reader.js
View file

@ -811,7 +811,7 @@ class Reader {
async triggerAnnotationsImportCheck(itemID) { async triggerAnnotationsImportCheck(itemID) {
let item = await Zotero.Items.getAsync(itemID); let item = await Zotero.Items.getAsync(itemID);
let mtime = await item.attachmentModificationTime; let mtime = await item.attachmentModificationTime;
if (item.attachmentLastProcessedModificationTime < mtime) { if (item.attachmentLastProcessedModificationTime < Math.floor(mtime / 1000)) {
await Zotero.PDFWorker.import(itemID, false); await Zotero.PDFWorker.import(itemID, false);
} }
} }

4
test/tests/itemTest.js
View file

@ -1191,7 +1191,7 @@ describe("Zotero.Item", function () {
var item = await createDataObject('item'); var item = await createDataObject('item');
var attachment = await importFileAttachment('test.pdf', { parentID: item.id }); var attachment = await importFileAttachment('test.pdf', { parentID: item.id });
var mtime = Date.now(); var mtime = Math.floor(Date.now() / 1000);
attachment.attachmentLastProcessedModificationTime = mtime; attachment.attachmentLastProcessedModificationTime = mtime;
await attachment.saveTx(); await attachment.saveTx();
@ -1512,7 +1512,7 @@ describe("Zotero.Item", function () {
); );
assert.lengthOf(annotationIDs, 1); assert.lengthOf(annotationIDs, 1);
attachment.attachmentLastProcessedModificationTime = Date.now(); attachment.attachmentLastProcessedModificationTime = Math.floor(Date.now() / 1000);
await attachment.saveTx(); await attachment.saveTx();
annotationIDs = await Zotero.DB.columnQueryAsync( annotationIDs = await Zotero.DB.columnQueryAsync(