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

fx-compat: Fix Zotero.File.download()

Browse source
This commit is contained in:
Dan Stillman 2022-06-19 18:58:25 -04:00
parent 8f7a160ba1
commit dfff86df72
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
chrome/content/zotero/xpcom/file.js
View file

@ -474,7 +474,6 @@ Zotero.File = new function(){
// NOTE: This noop callback is required, do not remove. // NOTE: This noop callback is required, do not remove.
}, },
onStopRequest(request, status) { onStopRequest(request, status) {
const responseStatus = 'responseStatus' in request ? request.responseStatus : null;
pipe.outputStream.close(); pipe.outputStream.close();
if (!Components.isSuccessCode(status)) { if (!Components.isSuccessCode(status)) {
@ -490,11 +489,14 @@ Zotero.File = new function(){
return; return;
} }
if (isHTTP && responseStatus != 200) { if (isHTTP) {
let msg = `Download failed with response code ${responseStatus}`; let statusCode = request.QueryInterface(Ci.nsIHttpChannel).responseStatus;
Zotero.logError(msg); if (statusCode != 200) {
deferred.reject(new Error(msg)); let msg = `Download failed with response code ${responseStatus}`;
return; Zotero.logError(msg);
deferred.reject(new Error(msg));
return;
}
} }
} }
}); });

3
test/tests/fileTest.js
View file

@ -493,7 +493,8 @@ describe("Zotero.File", function () {
it("should concurrently download three large files", async function () { it("should concurrently download three large files", async function () {
const url = `${baseURL}/file1.txt`; const url = `${baseURL}/file1.txt`;
var { ConcurrentCaller } = ChromeUtils.import("resource://zotero/concurrentCaller.js");
var caller = new ConcurrentCaller({ var caller = new ConcurrentCaller({
numConcurrent: 3, numConcurrent: 3,
Promise: Zotero.Promise, Promise: Zotero.Promise,