Using common for place resolve.

This commit is contained in:
DebaucheryLibrarian
2024-10-31 03:01:13 +01:00
parent fd39fa93d9
commit 1aa876acd9
5 changed files with 36 additions and 98 deletions

View File

@@ -9,12 +9,14 @@ const DOMPurify = require('dompurify');
const { JSDOM } = require('jsdom');
const omit = require('object.omit');
const inquirer = require('inquirer');
const unprint = require('unprint');
const { window } = new JSDOM('');
const domPurify = DOMPurify(window);
// const logger = require('./logger')(__filename);
const knex = require('./knex');
const redis = require('./redis');
const scrapers = require('./scrapers/scrapers').actors;
const argv = require('./argv');
@@ -29,13 +31,24 @@ const { fetchEntitiesBySlug } = require('./entities');
const { deleteScenes } = require('./releases');
const actorsCommon = import('../common/actors.mjs'); // eslint-disable-line import/extensions, import/no-relative-packages
const geoCommon = import('../common/geo.mjs'); // eslint-disable-line import/extensions, import/no-relative-packages
const slugify = require('./utils/slugify');
const capitalize = require('./utils/capitalize');
const resolvePlace = require('./utils/resolve-place');
const { resolveLayoutScraper } = require('./scrapers/resolve');
const getRecursiveParameters = require('./utils/get-recursive-parameters');
const commonContext = {
argv,
knex,
redis,
logger,
moment,
slugify,
omit,
unprint,
};
const hairColors = {
'jet-black': 'black',
'red-head': 'red',
@@ -364,13 +377,7 @@ async function interpolateProfiles(actorIdsOrNames, refreshView) {
const { interpolateProfiles: interpolateProfilesUtil } = await actorsCommon;
try {
await interpolateProfilesUtil(actorIdsOrNames, {
knex,
logger,
moment,
slugify,
omit,
}, { refreshView });
await interpolateProfilesUtil(actorIdsOrNames, commonContext, { refreshView });
} catch (error) {
console.log(error);
}
@@ -381,6 +388,8 @@ async function curateProfile(profile, actor) {
return null;
}
const { resolvePlace } = await geoCommon;
try {
const curatedProfile = {
// id: profile.id,
@@ -465,8 +474,8 @@ async function curateProfile(profile, actor) {
if (argv.resolvePlace) {
const [placeOfBirth, placeOfResidence] = await Promise.all([
resolvePlace(profile.birthPlace),
resolvePlace(profile.residencePlace),
resolvePlace(profile.birthPlace, commonContext),
resolvePlace(profile.residencePlace, commonContext),
]);
curatedProfile.placeOfBirth = placeOfBirth;