DebaucheryLibrarian
/
traxxx
2
1
Fork 1
Code Issues 37 Pull Requests 1 Releases Wiki Activity

Improved q so missing date element returns null.

This commit is contained in:
ThePendulum 2020-01-25 01:46:58 +01:00
parent 3891a6e86b
commit ab82329171
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/actors.js
View File

@ -339,13 +339,18 @@ async function scrapeActors(actorNames) {
const sources = argv.sources ? argv.sources.map(source => [source, scrapers.actors[source]]) : Object.entries(scrapers.actors); const sources = argv.sources ? argv.sources.map(source => [source, scrapers.actors[source]]) : Object.entries(scrapers.actors);
const profiles = await Promise.map(sources, async ([scraperSlug, scraper]) => { const profiles = await Promise.map(sources, async ([scraperSlug, scraper]) => {
const profile = await scraper.fetchProfile(actorEntry ? actorEntry.name : actorName); try {
const profile = await scraper.fetchProfile(actorEntry ? actorEntry.name : actorName);
return { return {
...profile, ...profile,
name: actorName, name: actorName,
scraper: scraperSlug, scraper: scraperSlug,
}; };
} catch (error) {
console.log(scraperSlug, error);
return null;
}
}); });
const profile = await mergeProfiles(profiles, actorEntry); const profile = await mergeProfiles(profiles, actorEntry);

8
src/utils/q.js
View File

@ -7,9 +7,9 @@ function q(context, selector, attrArg, trim = true) {
const attr = attrArg === true ? 'textContent' : attrArg; const attr = attrArg === true ? 'textContent' : attrArg;
if (attr) { if (attr) {
const value = context.querySelector(selector)[attr]; const value = context.querySelector(selector)?.[attr];
return trim ? value.trim() : value; return trim ? value?.trim() : value;
} }
return context.querySelector(selector); return context.querySelector(selector);
@ -26,7 +26,9 @@ function qall(context, selector, attrArg, trim = true) {
} }
function qdate(context, selector, format, match, attr = 'textContent') { function qdate(context, selector, format, match, attr = 'textContent') {
const dateString = context.querySelector(selector)[attr]; const dateString = context.querySelector(selector)?.[attr];
if (!dateString) return null;
if (match) { if (match) {
const dateStamp = dateString.match(match); const dateStamp = dateString.match(match);