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

ZFS: Don't retry download for canceled redirect with mtime/hash match

Browse source 
This was a regression from the switch to `Zotero.HTTP.download()`. 302
wasn't a success code, so `HTTP.download()` would throw, and since the
status wasn't set correctly on the `XMLHttpRequest` within
`HTTP.UnexpectedStatusException`, it would think it was an interrupted
S3 connection and trigger another download after a delay.
This commit is contained in:
Dan Stillman 2025-07-24 01:10:52 -04:00
parent bd11fd7234
commit 8379bdc8cd
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
chrome/content/zotero/xpcom/storage/zfs.js
View file

@ -77,12 +77,13 @@ Zotero.Sync.Storage.Mode.ZFS.prototype = {
var uri = this.apiClient.buildRequestURI(params);
return new Promise(async (resolve, reject) => {
var resultOptions = {};
try {
let req = await Zotero.HTTP.download(
uri,
destPath,
{
successCodes: [200, 404],
successCodes: [200, 302, 404],
headers: this.apiClient.getHeaders(),
noCache: true,
notificationCallbacks: {
@ -139,10 +140,7 @@ Zotero.Sync.Storage.Mode.ZFS.prototype = {
}
item.attachmentSyncState = "in_sync";
await item.saveTx({ skipAll: true });
resolve(new Zotero.Sync.Storage.Result({
localChanges: true
}));
resultOptions.localChanges = true;
callback.onRedirectVerifyCallback(Cr.NS_ERROR_ABORT);
},
@ -154,6 +152,11 @@ Zotero.Sync.Storage.Mode.ZFS.prototype = {
}
);
if (req.status == 302) {
resolve(new Zotero.Sync.Storage.Result(resultOptions));
return;
}
if (req.status == 404) {
Zotero.debug("Remote file not found for item " + item.libraryKey);
// Don't refresh item pane rows when nothing happened

5
test/tests/zfsTest.js
View file

@ -679,6 +679,8 @@ describe("Zotero.Sync.Storage.Mode.ZFS", function () {
var mtime = (Math.floor(new Date().getTime() / 1000) * 1000) + "";
var md5 = Zotero.Utilities.Internal.md5(file)
var processDownloadSpy = sinon.spy(Zotero.Sync.Storage.Local, "processDownload");
var s3Path = `pretend-s3/${item.key}`;
httpd.registerPathHandler(
`/users/1/items/${item.key}/file`,
@ -708,6 +710,9 @@ describe("Zotero.Sync.Storage.Mode.ZFS", function () {
assert.isTrue(result.localChanges);
assert.isFalse(result.remoteChanges);
assert.isFalse(result.syncRequired);
assert.isTrue(processDownloadSpy.notCalled);
processDownloadSpy.restore();
})
it("should update local info for file that already exists on the server", function* () {