Following redirects in Hush / Hussiepass scraper.

This commit is contained in:
DebaucheryLibrarian
2026-02-23 23:48:01 +01:00
parent 3e6592d1f3
commit 5a282cc372
2 changed files with 6 additions and 4 deletions

View File

@@ -334,13 +334,14 @@ async function fetchProfile({ name: actorName }, { channel }, options) {
const t1 = channel.parameters?.t1 ? 't1/' : ''; const t1 = channel.parameters?.t1 ? 't1/' : '';
// follow redirects because a lot of profiles redirect from lowercase to uppercase or vice versa
const res1 = channel.parameters?.profile const res1 = channel.parameters?.profile
? await qu.get(util.format(channel.parameters.profile, actorSlugA)) ? await qu.get(util.format(channel.parameters.profile, actorSlugA))
: await qu.get(`${channel.url}/${t1}models/${actorSlugA}.html`, null, null, { followRedirects: false }); : await qu.get(`${channel.url}/${t1}models/${actorSlugA}.html`, null, null, { followRedirects: true });
const res = (res1.ok && res1) const res = (res1.ok && res1)
|| (channel.parameters?.profile && await qu.get(util.format(channel.parameters.profile, actorSlugB))) || (channel.parameters?.profile && await qu.get(util.format(channel.parameters.profile, actorSlugB)))
|| await qu.get(`${channel.url}/${t1}models/${actorSlugB}.html`, null, null, { followRedirects: false }); || await qu.get(`${channel.url}/${t1}models/${actorSlugB}.html`, null, null, { followRedirects: true });
if (!res.ok) { if (!res.ok) {
return res.status; return res.status;

View File

@@ -200,14 +200,15 @@ async function reassociateTagEntries(tagEntries, rematch) {
})).filter((tagEntry) => tagEntry.tag_id); })).filter((tagEntry) => tagEntry.tag_id);
if (updatedTagEntries.length > 0) { if (updatedTagEntries.length > 0) {
// TODO: prevent wiping tags if insert fails
await knex('releases_tags') await knex('releases_tags')
.whereIn('id', updatedTagEntries.map((tagEntry) => tagEntry.id)) .whereIn('id', updatedTagEntries.map((tagEntry) => tagEntry.id))
.delete(); .delete();
await knex('releases_tags').insert(updatedTagEntries.map((tagEntry) => ({ await bulkInsert('releases_tags', updatedTagEntries.map((tagEntry) => ({
...tagEntry, ...tagEntry,
id: undefined, id: undefined,
}))); })), true);
} }
logger.info(`Updated ${updatedTagEntries.length} tags in ${new Set(updatedTagEntries.map((tagEntry) => tagEntry.release_id)).size} scenes`); logger.info(`Updated ${updatedTagEntries.length} tags in ${new Set(updatedTagEntries.map((tagEntry) => tagEntry.release_id)).size} scenes`);