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

Handle relative PDF links when using custom PDF resolver

Browse source
This commit is contained in:
Dan Stillman 2022-11-16 18:32:17 -05:00
parent ac4308b3e7
commit a48e0f2437
2 changed files with 62 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chrome/content/zotero/xpcom/attachments.js
View file

@ -1432,6 +1432,12 @@ Zotero.Attachments = new function(){
? elem.getAttribute(attribute) ? elem.getAttribute(attribute)
: elem.textContent; : elem.textContent;
if (!val) return []; if (!val) return [];
// Handle relative paths
val = Services.io.newURI(
val, null, Services.io.newURI(url)
).spec;
return [{ return [{
accessMethod: name, accessMethod: name,
url: val, url: val,

56
test/tests/attachmentsTest.js
View file

@ -835,6 +835,24 @@ describe("Zotero.Attachments", function() {
Zotero.File.pathToFile(OS.Path.join(getTestDataDirectory().path, 'test.pdf')) Zotero.File.pathToFile(OS.Path.join(getTestDataDirectory().path, 'test.pdf'))
); );
// Generate a page with a relative PDF URL
httpd.registerPathHandler(
"/" + doi4,
{
handle: function (request, response) {
response.setStatusLine(null, 200, "OK");
response.write(`<html>
<head>
<title>Page Title</title>
</head>
<body>
<a id="pdf-link" href="/article1/pdf">Download PDF</a>
</body>
</html>`);
}
}
);
requestStubCallTimes = []; requestStubCallTimes = [];
}); });
@ -1165,6 +1183,44 @@ describe("Zotero.Attachments", function() {
assert.equal(await OS.File.stat(attachment.getFilePath()).size, pdfSize); assert.equal(await OS.File.stat(attachment.getFilePath()).size, pdfSize);
}); });
it("should handle a custom resolver with a relative PDF path in HTML mode", async function () {
var doi = doi4;
var item = createUnsavedDataObject('item', { itemType: 'journalArticle' });
item.setField('title', 'Test');
item.setField('DOI', doi);
await item.saveTx();
var resolvers = [{
name: 'Custom',
method: 'get',
// Registered with httpd.js in beforeEach()
url: baseURL + "{doi}",
mode: 'html',
selector: '#pdf-link',
attribute: 'href'
}];
Zotero.Prefs.set('findPDFs.resolvers', JSON.stringify(resolvers));
var attachment = await Zotero.Attachments.addAvailablePDF(item);
assert.equal(requestStub.callCount, 4);
var call = requestStub.getCall(0);
assert.isTrue(call.calledWith('GET', 'https://doi.org/' + doi));
var call = requestStub.getCall(1);
assert.isTrue(call.calledWith('GET', pageURL4));
call = requestStub.getCall(2);
assert.isTrue(call.calledWith('POST', ZOTERO_CONFIG.SERVICES_URL + 'oa/search'));
var call = requestStub.getCall(3);
assert.isTrue(call.calledWith('GET', baseURL + doi4));
assert.ok(attachment);
var json = attachment.toJSON();
assert.equal(json.url, pdfURL);
assert.equal(json.contentType, 'application/pdf');
assert.equal(json.filename, 'Test.pdf');
assert.equal(await OS.File.stat(attachment.getFilePath()).size, pdfSize);
});
it("should handle a custom resolver in JSON mode with URL strings", async function () { it("should handle a custom resolver in JSON mode with URL strings", async function () {
var doi = doi4; var doi = doi4;
var item = createUnsavedDataObject('item', { itemType: 'journalArticle' }); var item = createUnsavedDataObject('item', { itemType: 'journalArticle' });