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

Compare commits

base: DebaucheryLibrarian:91574d2e5b18e74d24adb6d6e618afb390f49f91
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental
..
compare: DebaucheryLibrarian:f81ec6f393ddef6f43cce9b73a1b27e09ba07d4e
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental

No commits in common. "91574d2e5b18e74d24adb6d6e618afb390f49f91" and "f81ec6f393ddef6f43cce9b73a1b27e09ba07d4e" have entirely different histories.
91574d2e5b ... f81ec6f393

31 changed files with 115 additions and 118 deletions
Show Stats Expand all files Collapse all files

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "traxxx",
"version": "1.240.0",
"version": "1.239.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "traxxx",
"version": "1.240.0",
"version": "1.239.1",
"license": "ISC",
"dependencies": {
"@aws-sdk/client-s3": "^3.458.0",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "traxxx",
"version": "1.240.0",
"version": "1.239.1",
"description": "All the latest porn releases in one place",
"main": "src/app.js",
"scripts": {

11
src/deep.js
View File

@ -84,15 +84,9 @@ async function fetchScene(scraper, url, entity, baseRelease, options, type = 'sc
}
if ((type === 'scene' && scraper.scrapeScene) || (type === 'movie' && scraper.scrapeMovie)) {
/*
if (scraper.useUnprint || (type === 'scene' && scraper.scrapeScene?.unprint) || (type === 'movie' && scraper.scrapeMovie?.unprint)) {
return fetchUnprintScene(scraper, url, entity, baseRelease, options, type);
}
*/
if (!scraper.deprecated) {
return fetchUnprintScene(scraper, url, entity, baseRelease, options, type);
}
const session = qu.session();
@ -197,7 +191,7 @@ async function scrapeRelease(baseRelease, entitiesByHostname, type = 'scene') {
}),
}), {});
// curatedScrapedRelease.poster = null; // wat
curatedScrapedRelease.poster = null;
const mergedRelease = {
...merge(baseRelease, curatedScrapedRelease, {
@ -205,9 +199,6 @@ async function scrapeRelease(baseRelease, entitiesByHostname, type = 'scene') {
hardMergeKeys: ['actors', 'covers', 'poster', 'trailer', 'teaser'],
ignoreKeys: ['poster'],
}),
datePrecision: curatedScrapedRelease.date // don't inherit date precision from base release
? curatedScrapedRelease.datePrecision
: baseRelease.datePrecision,
poster: Array.from(new Set([
...[].concat(curatedScrapedRelease.poster),
...[].concat(baseRelease.poster),

10
src/scrapers/adultempire.js
View File

@ -205,6 +205,12 @@ module.exports = {
fetchLatest,
// fetchMovies,
fetchProfile,
scrapeScene: scrapeRelease,
scrapeMovie: scrapeRelease,
scrapeScene: {
scraper: scrapeRelease,
unprint: true,
},
scrapeMovie: {
scraper: scrapeRelease,
unprint: true,
},
};

5
src/scrapers/amnesiac.js
View File

@ -74,5 +74,8 @@ async function fetchLatest(channel, page = 1) {
module.exports = {
fetchLatest,
scrapeScene,
scrapeScene: {
scraper: scrapeScene,
unprint: true,
},
};

5
src/scrapers/analvids.js
View File

@ -138,6 +138,9 @@ async function fetchProfile(actor, { channel }) {
module.exports = {
fetchLatest,
scrapeScene,
scrapeScene: {
scraper: scrapeScene,
unprint: true,
},
fetchProfile,
};

10
src/scrapers/archangel.js
View File

@ -208,6 +208,12 @@ async function fetchProfile({ name: actorName, url: actorUrl }, { entity, includ
module.exports = {
fetchLatest,
fetchProfile,
scrapeScene,
scrapeMovie,
scrapeScene: {
scraper: scrapeScene,
unprint: true,
},
scrapeMovie: {
scraper: scrapeMovie,
unprint: true,
},
};

1
src/scrapers/bang.js
View File

@ -225,4 +225,5 @@ module.exports = {
fetchUpcoming,
fetchProfile,
scrapeScene,
useUnprint: true,
};

1
src/scrapers/bluedonkeymedia.js
View File

@ -234,6 +234,7 @@ module.exports = {
fetchProfile,
scrapeScene: {
scraper: scrapeScene,
unprint: true,
parser: {
runScripts: 'dangerously',
},

85
src/scrapers/bradmontana.js
View File

@ -1,7 +1,6 @@
'use strict';
const unprint = require('unprint');
const qu = require('../utils/q');
const slugify = require('../utils/slugify');
function genderFromUrl(url) {
@ -21,21 +20,18 @@ function genderFromUrl(url) {
function scrapeAll(scenes) {
return scenes.map(({ query }) => {
const release = {};
const subtitle = query.cnt('.subtitle');
release.url = query.url(null);
release.url = query.url('a');
release.entryId = new URL(release.url).pathname.match(/\/videos\/([\w-]+)/)[1];
release.title = query.attribute('img', 'title') || query.content('.font-semibold');
release.title = query.cnt('.title') || query.q('img', 'title');
release.actors = subtitle.slice(subtitle.indexOf(':') + 1).split(',').map((actor) => actor.trim()).filter(Boolean);
const poster = query.img('img[src*="/uploads"]');
release.poster = query.img('.thumb img');
if (poster) {
release.poster = [
poster.replace(/-\d+x\d+/, ''),
poster,
];
const match = poster.match(/\/uploads\/(\d{4})\/(\d{2})/);
if (release.poster) {
const match = release.poster.match(/\/uploads\/(\d{4})\/(\d{2})/);
if (match) {
release.date = new Date(match[1], match[2] - 1, 1);
@ -47,34 +43,30 @@ function scrapeAll(scenes) {
});
}
function scrapeScene({ query, html }, { url, entity }) {
function scrapeScene({ query, html }, url, channel) {
const release = {};
const data = query.json('.yoast-schema-graph')?.['@graph'];
const pageData = data?.find((item) => item['@type'] === 'WebPage');
const imageData = data?.find((item) => item['@type'] === 'ImageObject');
const dataString = query.html('.yoast-schema-graph');
const data = dataString && JSON.parse(dataString)['@graph'];
const pageData = data.find((item) => item['@type'] === 'WebPage');
const imageData = data.find((item) => item['@type'] === 'ImageObject');
release.entryId = new URL(url).pathname.match(/\/videos\/([\w-]+)/)[1];
release.title = query.content('.w-screen + div .font-semibold')
|| data?.find((item) => item['@type'] === 'BreadcrumbList')?.itemListElement.slice(-1)[0].item?.name
|| pageData?.name.slice(0, pageData?.name.lastIndexOf('-')).trim();
release.title = query.cnt('.video .title h1')
|| data.find((item) => item['@type'] === 'BreadcrumbList')?.itemListElement.slice(-1)[0].item.name
|| pageData?.name.slice(0, pageData.name.lastIndexOf('-')).trim();
release.description = query.content('.leading-relaxed');
release.date = pageData?.datePublished && new Date(pageData.datePublished);
release.description = query.cnt('.video .descript');
release.actors = query.elements('.models-slider-single a').map((el) => {
const actorUrl = unprint.query.url(el, null);
const avatarUrl = unprint.query.img(el);
release.date = pageData.datePublished && new Date(pageData.datePublished);
release.actors = query.all('.video .elenco a').map((el) => {
const actorUrl = query.url(el, null);
return {
name: unprint.query.content(el),
name: query.cnt(el),
url: actorUrl,
avatar: [
avatarUrl?.replace(/-\d+x\d+/, ''),
avatarUrl,
],
gender: genderFromUrl(actorUrl),
};
});
@ -83,8 +75,11 @@ function scrapeScene({ query, html }, { url, entity }) {
|| query.meta('property="og:image"')
|| html.match(/poster: '(http.*\.jpg)'/)?.[1];
release.photos = query.imgs('.gallery img');
release.trailer = query.video('source', 'src', { origin: entity.url });
release.photos = query.imgs('.listPostSm a', 'href');
release.trailer = query.video('source', 'src', { origin: channel.url });
release.likes = query.number('.vortex-p-like-counter');
release.dislikes = query.number('.vortex-p-dislike-counter');
if (!release.date && release.poster) {
const match = release.poster.match(/\/uploads\/(\d{4})\/(\d{2})/);
@ -98,42 +93,38 @@ function scrapeScene({ query, html }, { url, entity }) {
return release;
}
function scrapeProfile({ query }, entity, url) {
function scrapeProfile({ query, el }, entity, url) {
const profile = { url };
const data = query.json('.yoast-schema-graph');
profile.gender = genderFromUrl(url);
if (data) {
profile.avatar = data['@graph']?.find((item) => item['@type'] === 'ImageObject')?.url;
}
profile.description = query.cnt('.about')?.replace(/sobre a atriz:/i, '').trim();
profile.avatar = query.img('.left .thumb img');
profile.scenes = scrapeAll(qu.initAll(el, '.listPostLg .post'));
return profile;
}
async function fetchLatest(channel, page = 1) {
const url = `${channel.url}/videos/page/${page}`;
const res = await unprint.get(url, { selectAll: '.grid > a[href*="/videos"]' });
const res = await qu.getAll(url, '.listPostLg .post');
if (res.ok) {
return scrapeAll(res.context, channel);
return scrapeAll(res.items, channel);
}
return res.status;
}
async function fetchProfilePage({ name, gender, url: actorUrl }, entity, secondAttempt) {
const url = actorUrl || `${entity.url}/${gender === 'male' || secondAttempt ? 'atores' : 'atrizes'}/${slugify(name, '-')}`;
const res = await unprint.get(url);
async function fetchProfilePage({ name, gender }, entity, secondAttempt) {
const url = `${entity.url}/${gender === 'male' || secondAttempt ? 'atores' : 'atrizes'}/${slugify(name, '-')}`;
const res = await qu.get(url);
if (res.ok) {
return { res, url };
}
if (actorUrl) {
return fetchProfilePage({ name, gender }, entity, false); // don't count as second attempt, retry without actor URL
}
if (secondAttempt) {
return res.status;
}
@ -145,7 +136,7 @@ async function fetchProfile(baseActor, entity, options) {
const { res, url } = await fetchProfilePage(baseActor, entity, false);
if (res.ok) {
return scrapeProfile(res.context, entity, url, options);
return scrapeProfile(res.item, entity, url, options);
}
return res.status;

1
src/scrapers/fabulouscash.js
View File

@ -75,4 +75,5 @@ async function fetchLatest(channel, page = 1) {
module.exports = {
fetchLatest,
scrapeScene,
useUnprint: true,
};

1
src/scrapers/gamma.js
View File

@ -981,5 +981,4 @@ module.exports = {
scrapeAll,
scrapeMovie,
scrapeScene,
deprecated: true,
};

5
src/scrapers/innofsin.js
View File

@ -93,5 +93,8 @@ async function fetchProfile({ name: actorName }, entity, include) {
module.exports = {
fetchLatest,
fetchProfile,
scrapeScene,
scrapeScene: {
scraper: scrapeScene,
unprint: true,
},
};

5
src/scrapers/julesjordan.js
View File

@ -351,5 +351,8 @@ module.exports = {
fetchMovie,
fetchProfile,
fetchUpcoming,
scrapeScene,
scrapeScene: {
scraper: scrapeScene,
unprint: true,
},
};

1
src/scrapers/karups.js
View File

@ -95,5 +95,4 @@ module.exports = {
fetchLatest,
fetchProfile,
scrapeScene,
deprecated: true,
};

1
src/scrapers/loveherfilms.js
View File

@ -151,5 +151,4 @@ module.exports = {
fetchLatest,
fetchProfile,
scrapeScene,
deprecated: true,
};

5
src/scrapers/mariskax.js
View File

@ -88,6 +88,9 @@ async function fetchProfile(actor) {
module.exports = {
fetchLatest,
scrapeScene,
scrapeScene: {
scraper: scrapeScene,
unprint: true,
},
fetchProfile,
};

5
src/scrapers/missax.js
View File

@ -87,5 +87,8 @@ async function fetchProfile({ name }, entity) {
module.exports = {
fetchLatest,
fetchProfile,
scrapeScene,
scrapeScene: {
scraper: scrapeScene,
unprint: true,
},
};

5
src/scrapers/naughtyamerica.js
View File

@ -130,5 +130,8 @@ async function fetchProfile({ slug }, { channel }) {
module.exports = {
fetchLatest,
fetchProfile,
scrapeScene,
scrapeScene: {
scraper: scrapeScene,
unprint: true,
},
};

2
src/scrapers/newsensations.js
View File

@ -158,8 +158,10 @@ async function fetchLatestBlock(site, page) {
module.exports = {
fetchLatest: fetchLatestClassic,
scrapeScene: scrapeSceneClassic,
useUnprint: true,
block: {
scrapeScene: scrapeSceneBlock,
fetchLatest: fetchLatestBlock,
useUnprint: true,
},
};

1
src/scrapers/nubiles.js
View File

@ -160,5 +160,4 @@ module.exports = {
fetchUpcoming,
fetchProfile,
scrapeScene,
deprecated: true,
};

1
src/scrapers/pierrewoodman.js
View File

@ -150,5 +150,4 @@ module.exports = {
fetchLatest,
scrapeScene,
fetchProfile,
deprecated: true,
};

1
src/scrapers/purgatoryx.js
View File

@ -169,5 +169,4 @@ module.exports = {
fetchUpcoming,
scrapeAll,
scrapeScene,
deprecated: true,
};

1
src/scrapers/spizoo.js
View File

@ -168,5 +168,4 @@ module.exports = {
fetchLatest,
fetchProfile,
scrapeScene,
deprecated: true,
};

5
src/scrapers/teenmegaworld.js
View File

@ -118,5 +118,8 @@ async function fetchProfile(actor, entity, include) {
module.exports = {
fetchLatest,
fetchProfile,
scrapeScene,
scrapeScene: {
scraper: scrapeScene,
unprint: true,
},
};

5
src/scrapers/testedefudelidade.js
View File

@ -104,5 +104,8 @@ async function fetchProfile(actor, { entity }) {
module.exports = {
fetchLatest,
fetchProfile,
scrapeScene,
scrapeScene: {
scraper: scrapeScene,
unprint: true,
},
};

1
src/scrapers/wankzvr.js
View File

@ -174,5 +174,4 @@ module.exports = {
fetchLatest,
scrapeScene,
fetchProfile,
deprecated: true,
};

5
src/scrapers/whalemember.js
View File

@ -86,5 +86,8 @@ async function fetchLatest(channel, page = 1) {
module.exports = {
fetchLatest,
scrapeScene,
scrapeScene: {
scraper: scrapeScene,
unprint: true,
},
};

14
src/store-releases.js
View File

@ -199,11 +199,11 @@ function filterInternalDuplicateReleases(releases) {
.flat();
}
async function filterDuplicateReleases(releases, domain = 'releases') {
async function filterDuplicateReleases(releases) {
const internalUniqueReleases = filterInternalDuplicateReleases(releases);
const internalUniqueReleaseChunks = chunk(internalUniqueReleases);
const duplicateReleaseEntryChunks = await Promise.map(internalUniqueReleaseChunks, async (internalUniqueReleasesChunk) => knex(domain)
const duplicateReleaseEntryChunks = await Promise.map(internalUniqueReleaseChunks, async (internalUniqueReleasesChunk) => knex('releases')
.whereIn(['entry_id', 'entity_id'], internalUniqueReleasesChunk.map((release) => [release.entryId, release.entity.id]))
.orWhereIn(['entry_id', 'entity_id'], internalUniqueReleasesChunk
// scene IDs shared across network, mark as duplicate so scene can be updated with channel if only available on release day (i.e. Perv City)
@ -349,7 +349,7 @@ async function storeMovies(movies, useBatchId) {
return [];
}
const { uniqueReleases } = await filterDuplicateReleases(movies, 'movies');
const { uniqueReleases } = await filterDuplicateReleases(movies);
const [{ id: batchId }] = useBatchId ? [{ id: useBatchId }] : await knex('batches').insert({ showcased: argv.showcased, comment: null }).returning('id');
const curatedMovieEntries = await Promise.all(uniqueReleases.map((release) => curateReleaseEntry(release, batchId, null, 'movie')));
@ -357,10 +357,9 @@ async function storeMovies(movies, useBatchId) {
const storedMovies = await bulkInsert('movies', curatedMovieEntries, ['entity_id', 'entry_id'], true);
const moviesWithId = attachReleaseIds(movies, storedMovies);
await associateReleaseTags(moviesWithId, 'movie');
await updateMovieSearch(moviesWithId.map((movie) => movie.id));
await associateReleaseMedia(moviesWithId, 'movie');
await associateReleaseTags(moviesWithId, 'movie');
return moviesWithId;
}
@ -370,7 +369,7 @@ async function storeSeries(series, useBatchId) {
return [];
}
const { uniqueReleases } = await filterDuplicateReleases(series, 'series');
const { uniqueReleases } = await filterDuplicateReleases(series);
const [{ id: batchId }] = useBatchId ? [{ id: useBatchId }] : await knex('batches').insert({ showcased: argv.showcased, comment: null }).returning('id');
const curatedSerieEntries = await Promise.all(uniqueReleases.map((release) => curateReleaseEntry(release, batchId, null, 'serie')));
@ -396,7 +395,7 @@ async function storeScenes(releases, useBatchId) {
const releasesWithStudios = await attachStudios(releasesWithBaseActors);
// uniqueness is entity ID + entry ID, filter uniques after adding entities
const { uniqueReleases, duplicateReleases, duplicateReleaseEntries } = await filterDuplicateReleases(releasesWithStudios, 'releases');
const { uniqueReleases, duplicateReleases, duplicateReleaseEntries } = await filterDuplicateReleases(releasesWithStudios);
const curatedNewReleaseEntries = await Promise.all(uniqueReleases.map((release) => curateReleaseEntry(release, batchId)));
const storedReleases = await bulkInsert('releases', curatedNewReleaseEntries);
@ -434,7 +433,6 @@ async function storeScenes(releases, useBatchId) {
await associateSerieScenes(storedSeries, releasesWithId);
await associateDirectors(releasesWithId, batchId); // some directors may also be actors, don't associate at the same time
await updateSceneSearch(releasesWithId.map((release) => release.id));
// media is more error-prone, associate separately

17
src/tools/manticore-movies.js
View File

@ -34,12 +34,10 @@ async function fetchMovies() {
parents.name as network_name,
movies_covers IS NOT NULL as has_cover,
COALESCE(JSON_AGG(DISTINCT (actors.id, actors.name)) FILTER (WHERE actors.id IS NOT NULL), '[]') as actors,
COALESCE(JSON_AGG(DISTINCT (tags.id, tags.name, tags.priority, tags_aliases.name)) FILTER (WHERE tags.id IS NOT NULL), '[]') as tags,
COALESCE(JSON_AGG(DISTINCT (movie_tags.id, movie_tags.name, movie_tags.priority, movie_tags_aliases.name)) FILTER (WHERE movie_tags.id IS NOT NULL), '[]') as movie_tags
COALESCE(JSON_AGG(DISTINCT (tags.id, tags.name, tags.priority, tags_aliases.name)) FILTER (WHERE tags.id IS NOT NULL), '[]') as tags
FROM movies
LEFT JOIN movies_meta ON movies_meta.movie_id = movies.id
LEFT JOIN movies_scenes ON movies_scenes.movie_id = movies.id
LEFT JOIN movies_tags ON movies_tags.movie_id = movies.id
LEFT JOIN entities ON movies.entity_id = entities.id
LEFT JOIN entities AS parents ON parents.id = entities.parent_id
LEFT JOIN releases_actors AS local_actors ON local_actors.release_id = movies_scenes.scene_id
@ -49,8 +47,6 @@ async function fetchMovies() {
LEFT JOIN actors AS directors ON local_directors.director_id = directors.id
LEFT JOIN tags ON local_tags.tag_id = tags.id
LEFT JOIN tags as tags_aliases ON local_tags.tag_id = tags_aliases.alias_for AND tags_aliases.secondary = true
LEFT JOIN tags as movie_tags ON movies_tags.tag_id = movie_tags.id
LEFT JOIN tags as movie_tags_aliases ON movies_tags.tag_id = movie_tags_aliases.alias_for AND movie_tags_aliases.secondary = true
LEFT JOIN movies_covers ON movies_covers.movie_id = movies.id
GROUP BY
movies.id,
@ -105,15 +101,8 @@ async function init() {
const movies = await fetchMovies();
const docs = movies.map((movie) => {
const combinedTags = Object.values(Object.fromEntries(movie.tags.concat(movie.movie_tags).map((tag) => [tag.f1, {
id: tag.f1,
name: tag.f2,
priority: tag.f3,
alias: tag.f4,
}])));
const flatActors = movie.actors.flatMap((actor) => actor.f2.match(/[\w']+/g)); // match word characters to filter out brackets etc.
const flatTags = combinedTags.filter((tag) => tag.priority > 6).flatMap((tag) => (tag.alias ? `${tag.name} ${tag.alias}` : tag.name).match(/[\w']+/g)); // only make top tags searchable to minimize cluttered results
const flatTags = movie.tags.filter((tag) => tag.f3 > 6).flatMap((tag) => (tag.f4 ? `${tag.f2} ${tag.f4}` : tag.f2).match(/[\w']+/g)); // only make top tags searchable to minimize cluttered results
const filteredTitle = movie.title && [...flatActors, ...flatTags].reduce((accTitle, tag) => accTitle.replace(new RegExp(tag.replace(/[^\w\s]+/g, ''), 'gi'), ''), movie.title).trim().replace(/\s{2,}/g, ' ');
return {
@ -135,7 +124,7 @@ async function init() {
entity_ids: [movie.channel_id, movie.network_id].filter(Boolean), // manticore does not support OR, this allows IN
actor_ids: movie.actors.map((actor) => actor.f1),
actors: movie.actors.map((actor) => actor.f2).join(),
tag_ids: combinedTags.map((tag) => tag.id),
tag_ids: movie.tags.map((tag) => tag.f1),
tags: flatTags.join(' '),
has_cover: movie.has_cover,
meta: movie.date ? format(movie.date, 'y yy M MMM MMMM d') : undefined,

17
src/update-search.js
View File

@ -235,12 +235,10 @@ async function updateManticoreMovieSearch(movieIds) {
parents.name as network_name,
movies_covers IS NOT NULL as has_cover,
COALESCE(JSON_AGG(DISTINCT (actors.id, actors.name)) FILTER (WHERE actors.id IS NOT NULL), '[]') as actors,
COALESCE(JSON_AGG(DISTINCT (tags.id, tags.name, tags.priority, tags_aliases.name)) FILTER (WHERE tags.id IS NOT NULL), '[]') as tags,
COALESCE(JSON_AGG(DISTINCT (movie_tags.id, movie_tags.name, movie_tags.priority, movie_tags_aliases.name)) FILTER (WHERE movie_tags.id IS NOT NULL), '[]') as movie_tags
COALESCE(JSON_AGG(DISTINCT (tags.id, tags.name, tags.priority, tags_aliases.name)) FILTER (WHERE tags.id IS NOT NULL), '[]') as tags
FROM movies
LEFT JOIN movies_meta ON movies_meta.movie_id = movies.id
LEFT JOIN movies_scenes ON movies_scenes.movie_id = movies.id
LEFT JOIN movies_tags ON movies_tags.movie_id = movies.id
LEFT JOIN entities ON movies.entity_id = entities.id
LEFT JOIN entities AS parents ON parents.id = entities.parent_id
LEFT JOIN releases_actors AS local_actors ON local_actors.release_id = movies_scenes.scene_id
@ -250,8 +248,6 @@ async function updateManticoreMovieSearch(movieIds) {
LEFT JOIN actors AS directors ON local_directors.director_id = directors.id
LEFT JOIN tags ON local_tags.tag_id = tags.id
LEFT JOIN tags as tags_aliases ON local_tags.tag_id = tags_aliases.alias_for AND tags_aliases.secondary = true
LEFT JOIN tags as movie_tags ON movies_tags.tag_id = movie_tags.id
LEFT JOIN tags as movie_tags_aliases ON movies_tags.tag_id = movie_tags_aliases.alias_for AND movie_tags_aliases.secondary = true
LEFT JOIN movies_covers ON movies_covers.movie_id = movies.id
${movieIds ? 'WHERE movies.id = ANY(?)' : ''}
GROUP BY
@ -274,15 +270,8 @@ async function updateManticoreMovieSearch(movieIds) {
`, movieIds && [movieIds]);
const docs = movies.rows.map((movie) => {
const combinedTags = Object.values(Object.fromEntries(movie.tags.concat(movie.movie_tags).map((tag) => [tag.f1, {
id: tag.f1,
name: tag.f2,
priority: tag.f3,
alias: tag.f4,
}])));
const flatActors = movie.actors.flatMap((actor) => actor.f2.match(/[\w']+/g)); // match word characters to filter out brackets etc.
const flatTags = combinedTags.filter((tag) => tag.priority > 6).flatMap((tag) => (tag.alias ? `${tag.name} ${tag.alias}` : tag.name).match(/[\w']+/g)); // only make top tags searchable to minimize cluttered results
const flatTags = movie.tags.filter((tag) => tag.f3 > 6).flatMap((tag) => (tag.f4 ? `${tag.f2} ${tag.f4}` : tag.f2).match(/[\w']+/g)); // only make top tags searchable to minimize cluttered results
const filteredTitle = movie.title && [...flatActors, ...flatTags].reduce((accTitle, tag) => accTitle.replace(new RegExp(tag.replace(/[^\w\s]+/g, ''), 'gi'), ''), movie.title).trim().replace(/\s{2,}/g, ' ');
return {
@ -304,7 +293,7 @@ async function updateManticoreMovieSearch(movieIds) {
entity_ids: [movie.channel_id, movie.network_id].filter(Boolean), // manticore does not support OR, this allows IN
actor_ids: movie.actors.map((actor) => actor.f1),
actors: movie.actors.map((actor) => actor.f2).join(),
tag_ids: combinedTags.map((tag) => tag.id),
tag_ids: movie.tags.map((tag) => tag.f1),
tags: flatTags.join(' '),
has_cover: movie.has_cover,
meta: movie.date ? format(movie.date, 'y yy M MMM MMMM d') : undefined,