Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Foreign Affairs update front-end. #3407

Merged
merged 9 commits into from
Jan 21, 2025
Merged

Fix: Foreign Affairs update front-end. #3407

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c6c7b88
Fix: Foreign Affairs update front-end.
Wenzhi-Ding Jan 8, 2025
323dbac
Fix: Try to solve time out for test case "search"
Wenzhi-Ding Jan 8, 2025
593ea52
fix: Improve detection robustness.
Wenzhi-Ding Jan 10, 2025
9279947
fix: Copyrights update
Wenzhi-Ding Jan 10, 2025
ef89bdc
fix: Housekeeping
Wenzhi-Ding Jan 10, 2025
d044d2a
fix: linting
Wenzhi-Ding Jan 10, 2025
a1c6dc9
Merge branch 'zotero:master' into master
Wenzhi-Ding Jan 20, 2025
870eccb
fix selector
Wenzhi-Ding Jan 20, 2025
773cee6
Correct tag selector
AbeJellinek Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 79 additions & 35 deletions Foreign Affairs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"translatorID": "4ab6d49c-d94e-4a9c-ae9a-3310c44ba612",
"label": "Foreign Affairs",
"creator": "Sebastian Karcher, Philipp Zumstein",
"creator": "Sebastian Karcher, Philipp Zumstein, Wenzhi Dave Ding",
"target": "^https?://www\\.foreignaffairs\\.com",
"minVersion": "3.0",
"maxVersion": "",
"priority": 100,
"inRepository": true,
"translatorType": 4,
"browserSupport": "gcsibv",
"lastUpdated": "2023-08-23 12:37:06"
"lastUpdated": "2025-01-08 12:21:03"
}

/*
Expand Down Expand Up @@ -37,7 +37,7 @@


function detectWeb(doc, _url) {
if (doc.getElementsByClassName('article-body-text').length) {
if (doc.getElementsByClassName('article').length) {
return "magazineArticle";
}
else if (getSearchResults(doc, true)) {
Expand All @@ -47,19 +47,23 @@ function detectWeb(doc, _url) {
}

function getSearchResults(doc, checkOnly) {
let isIssues = /^https:\/\/[^/]+\/issues\/.+/.test(doc.location.href);
var items = {};
var found = false;
var rows = doc.querySelectorAll('article.article-card > a, div.article-data > h2.title > a');

let isIssues = /^https:\/\/[^/]+\/issues\/.+/.test(doc.location.href);
let isSearch = /^https:\/\/[^/]+\/search\/.+/.test(doc.location.href);
AbeJellinek marked this conversation as resolved.
Show resolved Hide resolved

let rows = [];
if (isIssues) {
rows = doc.querySelectorAll('h3 > a');
}
if (isSearch) {
AbeJellinek marked this conversation as resolved.
Show resolved Hide resolved
rows = doc.querySelectorAll('h2 > a');
}

for (let row of rows) {
let href = row.href;
let title;
if (isIssues) {
title = text(row, ".article-card-title");
}
else {
title = ZU.trimInternal(row.textContent);
}
let title = ZU.trimInternal(row.textContent);
if (!href || !title) continue;
if (checkOnly) return true;
found = true;
Expand All @@ -83,22 +87,21 @@ async function doWeb(doc, url) {

async function scrape(doc, url = doc.location.href) {
var item = new Zotero.Item("magazineArticle");
var author = text(doc, '.article-byline-author');
var tags = doc.querySelectorAll('.article-footer--tag-item');
let issueNode = doc.querySelector(".article-header--metadata-date > a");

let issueNode = doc.querySelector(".topper__issue");
if (issueNode) {
var volumeTitle = ZU.trimInternal(issueNode.textContent.trim());
// the digits are yyyy/vol/num
let issueMatch = issueNode.href.match(/\/issues\/\d+\/(\d+)\/(\d+)$/);
if (volumeTitle) {
if (!item.extra) item.extra = "";
item.extra += `\nVolume Title: ${volumeTitle}`;
AbeJellinek marked this conversation as resolved.
Show resolved Hide resolved
}

let issueMatch = issueNode.parentNode.href.match(/\/issues\/\d+\/(\d+)\/(\d+)$/);
if (issueMatch) {
item.volume = issueMatch[1];
item.issue = issueMatch[2];
}
}
if (volumeTitle) {
if (!item.extra) item.extra = "";
item.extra += `\nVolume Title: ${volumeTitle}`;
}

item.date = attr(doc, 'meta[property="article:published_time"]', 'content');
item.title = attr(doc, 'meta[property="og:title"]', 'content');
Expand All @@ -107,23 +110,25 @@ async function scrape(doc, url = doc.location.href) {
item.date = ZU.strToISO(item.date);
}

var author = doc.querySelector('.topper__byline').textContent.trim();
author = author.replace("Reviewed by ", "");
let authors = author.split(/, and|and |, /);
for (let aut of authors) {
item.creators.push(ZU.cleanAuthor(aut, "author"));
}

var tags = doc.querySelectorAll('.mr-15');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a reliable selector (this is a Tailwind margin style) - anything else we can match on?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to:

	var tags = doc.querySelectorAll(
		'a[href^="/regions/"].text-decoration-none, ' +
		'a[href^="/topics/"].text-decoration-none, ' +
		'a[href^="/tags/"].text-decoration-none'
		);

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still matching on a Tailwind class, so still unstable. Anything else we could use? Do we need the class in the selector at all?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like:

var tags = doc.querySelectorAll(`
	ul > li > a[href^="/regions"],
	ul > li > a[href^="/topics"],
	ul > li > a[href^="/tags"]
`);

?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the comment. I now change to the style as suggested.

	var tags = doc.querySelectorAll(
		'main > div > div > div > div > ul > li > a[href^="/regions/"], ' +
		'main > div > div > div > div > ul > li > a[href^="/topics/"], ' +
		'main > div > div > div > div > ul > li > a[href^="/tags/"]'
		);

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That isn't really what I suggested, but I see that what I suggested would've matched non-tag links. Just pushed an update to fix that.

for (let tag of tags) {
item.tags.push(tag.textContent);
}
item.url = url;
item.url = url.split('?')[0];
item.attachments.push({ document: doc, title: "Snapshot" });
item.publicationTitle = "Foreign Affairs";
item.ISSN = "0015-7120";
item.language = "en-US";
item.complete();
}


/** BEGIN TEST CASES **/
var testCases = [
{
Expand All @@ -132,6 +137,12 @@ var testCases = [
"defer": true,
"items": "multiple"
},
{
"type": "web",
"url": "https://www.foreignaffairs.com/search/arkansas",
"defer": true,
"items": "multiple"
},
{
"type": "web",
"url": "https://www.foreignaffairs.com/reviews/capsule-review/2003-05-01/history-argentina-twentieth-century",
Expand All @@ -146,16 +157,16 @@ var testCases = [
"creatorType": "author"
}
],
"extra": "Volume Title: May/June 2003",
"volume": "82",
"issue": "3",
"date": "2003-05-01",
"ISSN": "0015-7120",
"abstractNote": "A fascinating and well-translated account of Argentina's misadventures over the last century by one of that country's brightest historians. Absorbing vast amounts of British capital and tens of thousands of European immigrants, Argentina began the century with great promise. In 1914, with half of its population still foreign, a dynamic society had emerged that was both open and mobile.",
"extra": "Volume Title: May/June 2003",
"issue": "3",
"language": "en-US",
"libraryCatalog": "Foreign Affairs",
"publicationTitle": "Foreign Affairs",
"url": "https://www.foreignaffairs.com/reviews/capsule-review/2003-05-01/history-argentina-twentieth-century",
"volume": "82",
"attachments": [
{
"title": "Snapshot",
Expand All @@ -164,10 +175,13 @@ var testCases = [
],
"tags": [
{
"tag": "Argentina"
"tag": " Americas"
},
{
"tag": " Argentina"
},
{
"tag": "Western Hemisphere"
"tag": " South America"
}
],
"notes": [],
Expand Down Expand Up @@ -209,6 +223,9 @@ var testCases = [
{
"tag": "Arms Control & Disarmament"
},
{
"tag": "Intelligence"
},
{
"tag": "Defense & Military"
},
Expand All @@ -228,11 +245,14 @@ var testCases = [
"tag": "Nuclear Weapons & Proliferation"
},
{
"tag": "Obama Administration"
"tag": "Barack Obama Administration"
},
{
"tag": "Persian Gulf"
},
{
"tag": "Sanctions"
},
{
"tag": "Security"
},
Expand Down Expand Up @@ -302,6 +322,21 @@ var testCases = [
{
"tag": "North America"
},
{
"tag": "World"
},
{
"tag": "Globalization"
},
{
"tag": "Finance"
},
{
"tag": "Politics & Society"
},
{
"tag": "Inequality"
},
{
"tag": "United States"
}
Expand Down Expand Up @@ -347,6 +382,21 @@ var testCases = [
},
{
"tag": "South Asia"
},
{
"tag": "Politics & Society"
},
{
"tag": "Demography"
},
{
"tag": "Gender"
},
{
"tag": "Narendra Modi"
},
{
"tag": "Business"
}
],
"notes": [],
Expand Down Expand Up @@ -427,12 +477,6 @@ var testCases = [
"seeAlso": []
}
]
},
{
"type": "web",
"url": "https://www.foreignaffairs.com/search/argentina",
"defer": true,
"items": "multiple"
}
]
/** END TEST CASES **/
Loading