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

Compare commits

base: DebaucheryLibrarian:c2c329e00a634d369907843db0e97457ae1f07a7
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental
..
compare: DebaucheryLibrarian:d7f9157424020a482b6ffac243ea250742179763
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental

No commits in common. "c2c329e00a634d369907843db0e97457ae1f07a7" and "d7f9157424020a482b6ffac243ea250742179763" have entirely different histories.
c2c329e00a ... d7f9157424

4 changed files with 8 additions and 14 deletions
Show Stats Expand all files Collapse all files

1
assets/css/_inputs.scss
View File

@ -28,7 +28,6 @@
.button { .button {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
justify-content: center;
border: none; border: none;
background: none; background: none;
padding: .5rem; padding: .5rem;

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.227.11", "version": "1.227.10",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "traxxx", "name": "traxxx",
"version": "1.227.11", "version": "1.227.10",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@casl/ability": "^5.2.2", "@casl/ability": "^5.2.2",

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.227.11", "version": "1.227.10",
"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": {

15
src/store-releases.js
View File

@ -2,7 +2,6 @@
const config = require('config'); const config = require('config');
const Promise = require('bluebird'); const Promise = require('bluebird');
const { decode } = require('html-entities');
const argv = require('./argv'); const argv = require('./argv');
const logger = require('./logger')(__filename); const logger = require('./logger')(__filename);
@ -30,8 +29,7 @@ async function curateReleaseEntry(release, batchId, existingRelease, type = 'sce
}); });
const curatedRelease = { const curatedRelease = {
id: release.id, // release is updated title: release.title,
title: decode(release.title),
entry_id: release.entryId || null, entry_id: release.entryId || null,
entity_id: release.entity.id, entity_id: release.entity.id,
studio_id: release.studio?.id || null, studio_id: release.studio?.id || null,
@ -39,7 +37,7 @@ async function curateReleaseEntry(release, batchId, existingRelease, type = 'sce
date: Number(release.date) ? release.date : null, date: Number(release.date) ? release.date : null,
date_precision: release.datePrecision, date_precision: release.datePrecision,
slug, slug,
description: decode(release.description), description: release.description,
comment: release.comment, comment: release.comment,
deep: typeof release.deep === 'boolean' ? release.deep : false, deep: typeof release.deep === 'boolean' ? release.deep : false,
deep_url: release.deepUrl, deep_url: release.deepUrl,
@ -54,10 +52,10 @@ async function curateReleaseEntry(release, batchId, existingRelease, type = 'sce
} }
if (release.productionLocation) { if (release.productionLocation) {
curatedRelease.production_location = decode(release.productionLocation); curatedRelease.production_location = release.productionLocation;
if (argv.resolvePlace) { if (argv.resolvePlace) {
const productionLocation = await resolvePlace(decode(release.productionLocation)); const productionLocation = await resolvePlace(release.productionLocation);
if (productionLocation) { if (productionLocation) {
curatedRelease.production_city = productionLocation.city; curatedRelease.production_city = productionLocation.city;
@ -471,11 +469,8 @@ async function storeScenes(releases, useBatchId) {
const uniqueReleasesWithId = attachReleaseIds(uniqueReleases, storedReleaseEntries, batchId); const uniqueReleasesWithId = attachReleaseIds(uniqueReleases, storedReleaseEntries, batchId);
const duplicateReleasesWithId = attachReleaseIds(duplicateReleases, duplicateReleaseEntries, batchId); const duplicateReleasesWithId = attachReleaseIds(duplicateReleases, duplicateReleaseEntries, batchId);
const curatedDuplicateReleases = await Promise.all(duplicateReleasesWithId.map((release) => curateReleaseEntry(release, batchId)));
const releasesWithId = uniqueReleasesWithId.concat(duplicateReleasesWithId); const releasesWithId = uniqueReleasesWithId.concat(duplicateReleasesWithId);
console.log(curatedDuplicateReleases);
const updated = await knex.raw(` const updated = await knex.raw(`
UPDATE releases UPDATE releases
SET url = COALESCE(new.url, releases.url), SET url = COALESCE(new.url, releases.url),
@ -490,7 +485,7 @@ async function storeScenes(releases, useBatchId) {
AS new(id int, url text, date timestamptz, entity json, title text, description text, duration integer, deep boolean) AS new(id int, url text, date timestamptz, entity json, title text, description text, duration integer, deep boolean)
WHERE releases.id = new.id WHERE releases.id = new.id
`, { `, {
scenes: JSON.stringify(curatedDuplicateReleases), scenes: JSON.stringify(duplicateReleasesWithId),
}); });
const [actors, storedSeries] = await Promise.all([ const [actors, storedSeries] = await Promise.all([