Added profile scraper with releases to Hush. Added qtexts to q to return text nodes individually. Including network in profile site.

src/actors.js

@@ -13,7 +13,7 @@ const whereOr = require('./utils/where-or');
 const resolvePlace = require('./utils/resolve-place');
 const slugify = require('./utils/slugify');
 const capitalize = require('./utils/capitalize');
-// const { createMediaDirectory, storePhotos } = require('./media_legacy');
+const { curateSites } = require('./sites');
 const { storeMedia, associateMedia } = require('./media');
 
 async function curateActor(actor) {
@@ -313,7 +313,7 @@ async function mergeProfiles(profiles, actor) {
             residencePlace: prevProfile.residencePlace || profile.residencePlace,
             nationality: prevProfile.nationality || profile.nationality, // used to derive country when not available
             ethnicity: prevProfile.ethnicity || profile.ethnicity,
-            bust: prevProfile.bust || (/\d+\w+/.test(profile.bust) && profile.bust),
+            bust: prevProfile.bust || (/\d+\w+/.test(profile.bust) ? profile.bust : null),
             waist: prevProfile.waist || profile.waist,
             hip: prevProfile.hip || profile.hip,
             naturalBoobs: prevProfile.naturalBoobs === undefined ? profile.naturalBoobs : prevProfile.naturalBoobs,
@@ -385,7 +385,18 @@ async function scrapeActors(actorNames) {
 
             const finalSources = argv.withReleases ? sources.flat() : sources; // ignore race-to-success grouping when scenes are requested
 
-            const [sites, networks] = await Promise.all([knex('sites').select('*').whereIn('slug', finalSources.flat()), knex('networks').select('*').whereIn('slug', finalSources.flat())]);
+            const [siteEntries, networks] = await Promise.all([
+                knex('sites')
+                    .leftJoin('networks', 'sites.network_id', 'networks.id')
+                    .select(
+                        'sites.*',
+                        'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url', 'networks.description as network_description', 'networks.parameters as network_parameters',
+                    )
+                    .whereIn('sites.slug', finalSources.flat()),
+                knex('networks').select('*').whereIn('slug', finalSources.flat()),
+            ]);
+
+            const sites = await curateSites(siteEntries, true);
             const sitesBySlug = [].concat(networks, sites).reduce((acc, site) => ({ ...acc, [site.slug]: site }), {});
 
             const profiles = await Promise.map(finalSources, async (source) => {