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

Compare commits

base: DebaucheryLibrarian:f5fa4b79a633b3a5f8c3e42d6e2102f5a23bfdeb
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental
..
compare: DebaucheryLibrarian:8b0b340031fda58937026c9130f8e6c3d65481de
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental

No commits in common. "f5fa4b79a633b3a5f8c3e42d6e2102f5a23bfdeb" and "8b0b340031fda58937026c9130f8e6c3d65481de" have entirely different histories.
f5fa4b79a6 ... 8b0b340031

5 changed files with 7 additions and 14 deletions
Show Stats Expand all files Collapse all files

2
migrations/20240125011700_manticore.js
View File

@ -23,8 +23,6 @@ const scenesFields = `
actors text, actors text,
tag_ids multi, tag_ids multi,
tags text, tags text,
movie_ids multi,
serie_ids multi,
meta text, meta text,
date timestamp, date timestamp,
is_showcased bool, is_showcased bool,

4
package-lock.json generated
View File

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

2
package.json
View File

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

7
src/tools/manticore-scenes.js
View File

@ -33,8 +33,7 @@ async function fetchScenes() {
parents.name as network_name, parents.name as network_name,
COALESCE(JSON_AGG(DISTINCT (actors.id, actors.name)) FILTER (WHERE actors.id IS NOT NULL), '[]') as actors, 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 (tags.id, tags.name, tags.priority, tags_aliases.name)) FILTER (WHERE tags.id IS NOT NULL), '[]') as tags,
COALESCE(JSON_AGG(DISTINCT (movies_scenes.movie_id)) FILTER (WHERE movies_scenes.movie_id IS NOT NULL), '[]') as movies, COALESCE(JSON_AGG(DISTINCT (movies.id)) FILTER (WHERE movies.id IS NOT NULL), '[]') as movies,
COALESCE(JSON_AGG(DISTINCT (series_scenes.serie_id)) FILTER (WHERE series_scenes.serie_id IS NOT NULL), '[]') as series,
studios.showcased IS NOT false studios.showcased IS NOT false
AND (entities.showcased IS NOT false OR COALESCE(studios.showcased, false) = true) AND (entities.showcased IS NOT false OR COALESCE(studios.showcased, false) = true)
AND (parents.showcased IS NOT false OR COALESCE(entities.showcased, false) = true OR COALESCE(studios.showcased, false) = true) AND (parents.showcased IS NOT false OR COALESCE(entities.showcased, false) = true OR COALESCE(studios.showcased, false) = true)
@ -52,7 +51,7 @@ async function fetchScenes() {
LEFT JOIN tags ON local_tags.tag_id = tags.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 tags_aliases ON local_tags.tag_id = tags_aliases.alias_for AND tags_aliases.secondary = true
LEFT JOIN movies_scenes ON movies_scenes.scene_id = releases.id LEFT JOIN movies_scenes ON movies_scenes.scene_id = releases.id
LEFT JOIN series_scenes ON series_scenes.scene_id = releases.id LEFT JOIN movies ON movies.id = movies_scenes.movie_id
GROUP BY GROUP BY
releases.id, releases.id,
releases.title, releases.title,
@ -96,7 +95,6 @@ async function init() {
tag_ids multi, tag_ids multi,
tags text, tags text,
movie_ids multi, movie_ids multi,
serie_ids multi,
meta text, meta text,
date timestamp, date timestamp,
is_showcased bool, is_showcased bool,
@ -136,7 +134,6 @@ async function init() {
tag_ids: scene.tags.map((tag) => tag.f1), tag_ids: scene.tags.map((tag) => tag.f1),
tags: flatTags.join(' '), tags: flatTags.join(' '),
movie_ids: scene.movies, movie_ids: scene.movies,
serie_ids: scene.series,
meta: scene.date ? format(scene.date, 'y yy M MMM MMMM d') : undefined, meta: scene.date ? format(scene.date, 'y yy M MMM MMMM d') : undefined,
stashed: scene.stashed || 0, stashed: scene.stashed || 0,
}, },

6
src/update-search.js
View File

@ -71,8 +71,7 @@ async function updateManticoreSceneSearch(releaseIds) {
parents.name as network_name, parents.name as network_name,
COALESCE(JSON_AGG(DISTINCT (actors.id, actors.name)) FILTER (WHERE actors.id IS NOT NULL), '[]') as actors, 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 (tags.id, tags.name, tags.priority, tags_aliases.name)) FILTER (WHERE tags.id IS NOT NULL), '[]') as tags,
COALESCE(JSON_AGG(DISTINCT (movies_scenes.movie_id)) FILTER (WHERE movies_scenes.movie_id IS NOT NULL), '[]') as movies, COALESCE(JSON_AGG(DISTINCT (movies.id)) FILTER (WHERE movies.id IS NOT NULL), '[]') as movies,
COALESCE(JSON_AGG(DISTINCT (series_scenes.serie_id)) FILTER (WHERE series_scenes.serie_id IS NOT NULL), '[]') as series,
studios.showcased IS NOT false studios.showcased IS NOT false
AND (entities.showcased IS NOT false OR COALESCE(studios.showcased, false) = true) AND (entities.showcased IS NOT false OR COALESCE(studios.showcased, false) = true)
AND (parents.showcased IS NOT false OR COALESCE(entities.showcased, false) = true OR COALESCE(studios.showcased, false) = true) AND (parents.showcased IS NOT false OR COALESCE(entities.showcased, false) = true OR COALESCE(studios.showcased, false) = true)
@ -90,7 +89,7 @@ async function updateManticoreSceneSearch(releaseIds) {
LEFT JOIN tags ON local_tags.tag_id = tags.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 tags_aliases ON local_tags.tag_id = tags_aliases.alias_for AND tags_aliases.secondary = true
LEFT JOIN movies_scenes ON movies_scenes.scene_id = releases.id LEFT JOIN movies_scenes ON movies_scenes.scene_id = releases.id
LEFT JOIN series_scenes ON series_scenes.scene_id = releases.id LEFT JOIN movies ON movies.id = movies_scenes.movie_id
${releaseIds ? 'WHERE releases.id = ANY(?)' : ''} ${releaseIds ? 'WHERE releases.id = ANY(?)' : ''}
GROUP BY GROUP BY
releases.id, releases.id,
@ -143,7 +142,6 @@ async function updateManticoreSceneSearch(releaseIds) {
tag_ids: scene.tags.map((tag) => tag.f1), tag_ids: scene.tags.map((tag) => tag.f1),
tags: flatTags.join(' '), // only make top tags searchable to minimize cluttered results tags: flatTags.join(' '), // only make top tags searchable to minimize cluttered results
movie_ids: scene.movies, movie_ids: scene.movies,
serie_ids: scene.series,
meta: scene.date ? format(scene.date, 'y yy M MMM MMMM d') : undefined, meta: scene.date ? format(scene.date, 'y yy M MMM MMMM d') : undefined,
stashed: scene.stashed || 0, stashed: scene.stashed || 0,
}, },