Compare commits

...

3 Commits

Author SHA1 Message Date
DebaucheryLibrarian d4b0f2dc67 1.227.15 2023-06-16 02:29:03 +02:00
DebaucheryLibrarian 7723b2b698 Only curating release ID when present. 2023-06-16 02:29:01 +02:00
DebaucheryLibrarian 682f299c8f Added Milfy to Vixen. 2023-06-16 02:12:31 +02:00
31 changed files with 19 additions and 9 deletions

4
package-lock.json generated
View File

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

View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.227.14", "version": "1.227.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": {

BIN
public/img/logos/vixen/lazy/blacked.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
public/img/logos/vixen/lazy/blackedraw.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
public/img/logos/vixen/lazy/deeper.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
public/img/logos/vixen/lazy/favicon.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
public/img/logos/vixen/lazy/favicon_dark.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
public/img/logos/vixen/lazy/favicon_light.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
public/img/logos/vixen/lazy/network.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
public/img/logos/vixen/lazy/slayed.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
public/img/logos/vixen/lazy/tushy.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
public/img/logos/vixen/lazy/tushyraw.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
public/img/logos/vixen/lazy/vixen.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -0,0 +1 @@
<svg width="1166" height="276" viewBox="0 0 1166 276" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" class="milfy__StyledLogo-nplnwd-1 joTZrW"><defs><path id="logo-milfy_svg__a" d="M0 0h317.077v275H0z"></path><path id="logo-milfy_svg__c" d="M0 0h92.518v275H0z"></path><path id="logo-milfy_svg__e" d="M0 0h195.373v275H0z"></path><path id="logo-milfy_svg__g" d="M0 0h204.229v275H0z"></path><path id="logo-milfy_svg__i" d="M0 0h254.071v275H0z"></path></defs><g fill="none" fill-rule="evenodd"><g transform="translate(3.87 -.431)"><mask id="logo-milfy_svg__b" fill="#fff"><use xlink:href="#logo-milfy_svg__a"></use></mask><path d="M157.362 180.571L85.335.894 84.977 0H0v10.322h1.425c10.538 0 15.88 5.211 15.88 15.488v223.38c0 10.277-5.342 15.486-15.88 15.486H0V275h74.425v-10.324H73c-10.98 0-15.878-4.775-15.878-15.486V69.23L138.891 275h20.404l84.928-205.978V246.83c0 10.711-2.7 17.846-15.878 17.846h-1.425V275h90.157v-10.324h-1.424c-13.222 0-15.878-6.829-15.878-17.846V26.203c0-10.686 5.193-15.88 15.878-15.88h1.424V0h-86.94l-72.775 180.571z" fill="#FFF" mask="url(#logo-milfy_svg__b)"></path></g><g transform="translate(353.077 -.431)"><mask id="logo-milfy_svg__d" fill="#fff"><use xlink:href="#logo-milfy_svg__c"></use></mask><path d="M0 10.322h1.425c10.538 0 15.88 5.211 15.88 15.488v223.38c0 10.277-5.342 15.486-15.88 15.486H0V275h92.518v-10.324h-1.424c-10.984 0-15.881-4.775-15.881-15.486V26.203c0-10.685 5.195-15.88 15.88-15.88h1.425V0H0v10.322z" fill="#FFF" mask="url(#logo-milfy_svg__d)"></path></g><g transform="translate(477.725 -.431)"><mask id="logo-milfy_svg__f" fill="#fff"><use xlink:href="#logo-milfy_svg__e"></use></mask><path d="M184.598 217.76c-10.758 17.133-16.586 25.286-40.854 25.286h-36.919c-13.775 0-23.054 0-31.612-2.396V26.203c0-11.13 4.75-15.88 15.88-15.88h1.425V0H0v10.323h1.425c11.13 0 15.88 4.75 15.88 15.88V249.19c0 10.566-5.046 15.486-15.88 15.486H0V275h185.032l10.34-57.908h-10.354l-.42.668z" fill="#FFF" mask="url(#logo-milfy_svg__f)"></path></g><g transform="translate(691.858 -.431)"><mask id="logo-milfy_svg__h" fill="#fff"><use xlink:href="#logo-milfy_svg__g"></use></mask><path d="M0 0v10.322h1.425c10.98 0 15.878 5.383 15.878 17.454V246.83c0 12.675-4.6 17.845-15.878 17.845H0V275h92.517v-10.324h-1.425c-10.983 0-15.88-5.504-15.88-17.845v-97.682h66.425c10.508 0 17.846 7.177 17.846 17.453v1.425h10.716v-70.1h-10.716v1.424c0 12.262-9.25 17.847-17.846 17.847H75.211V43.506c0-11.18 1.183-11.554 11.946-11.554h73.937c20.525 0 26.89 9.092 32.558 20.075l.398.77h10.179L203.397 0H0z" fill="#FFF" mask="url(#logo-milfy_svg__h)"></path></g><g transform="translate(915.957 -.431)"><mask id="logo-milfy_svg__j" fill="#fff"><use xlink:href="#logo-milfy_svg__i"></use></mask><path d="M181.007 0v10.322h1.296c4.06 0 6.825 1.37 8.217 4.072 1.756 3.413.956 8.352-.745 11.466l-53.655 97.938L79.653 27.79c-3.822-6.493-5.225-11.815-3.848-14.6.942-1.902 3.314-2.867 7.05-2.867h1.296V0H0v10.322h1.296c9.373 0 16.093 9.79 22.16 19.796l78.137 133.754v85.318c0 7.066-2.506 15.486-14.443 15.486h-1.296V275h84.15v-10.324h-1.295c-9.988 0-14.443-4.775-14.443-15.486v-85.326l77.782-136.9c4.759-8.284 13.013-16.642 20.728-16.642h1.295V0h-73.064z" fill="#FFF" mask="url(#logo-milfy_svg__j)"></path></g></g></svg>

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
public/img/logos/vixen/thumbs/blacked.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
public/img/logos/vixen/thumbs/blackedraw.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
public/img/logos/vixen/thumbs/deeper.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
public/img/logos/vixen/thumbs/favicon.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
public/img/logos/vixen/thumbs/favicon_dark.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
public/img/logos/vixen/thumbs/favicon_light.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
public/img/logos/vixen/thumbs/network.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
public/img/logos/vixen/thumbs/slayed.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
public/img/logos/vixen/thumbs/tushy.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
public/img/logos/vixen/thumbs/tushyraw.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
public/img/logos/vixen/thumbs/vixen.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

View File

@ -11424,6 +11424,13 @@ const sites = [
parent: 'vixen', parent: 'vixen',
tags: ['lesbian'], tags: ['lesbian'],
}, },
{
slug: 'milfy',
name: 'Milfy',
url: 'https://www.milfy.com',
parent: 'vixen',
tags: ['milf'],
},
// VOGOV // VOGOV
{ {
slug: 'vogov', slug: 'vogov',

View File

@ -48,7 +48,7 @@ function scrapeScene({ query }, url, channel) {
release.director = query.cnt('.director')?.split(/\s*:\s*/)[1]; release.director = query.cnt('.director')?.split(/\s*:\s*/)[1];
const fallbackPoster = query.img('.player img'); const fallbackPoster = query.img('.player img');
release.poster = query.sourceSet('.player img', 'data-srcset') || [fallbackPoster.replace('_crop', ''), fallbackPoster]; release.poster = query.sourceSet('.player img', 'data-srcset') || [fallbackPoster?.replace('_crop', ''), fallbackPoster];
const movieUrl = query.url('.movie a', 'href', { origin: channel.url }); const movieUrl = query.url('.movie a', 'href', { origin: channel.url });
@ -173,7 +173,7 @@ async function fetchMovies(channel, page = 1) {
Referer: 'https://www.dorcelclub.com/en/porn-movie?sorting=new', // might be used to derive sorting Referer: 'https://www.dorcelclub.com/en/porn-movie?sorting=new', // might be used to derive sorting
}); });
if (res.ok) { if (res.ok && res.items) {
return scrapeMovies(res.items, channel); return scrapeMovies(res.items, channel);
} }
@ -199,7 +199,7 @@ async function fetchMovie(url, channel) {
Referer: `${channel.url}/en/porn-movie`, Referer: `${channel.url}/en/porn-movie`,
}); });
if (res.ok) { if (res.ok && res.item) {
return scrapeMovie(res.item, url, channel); return scrapeMovie(res.item, url, channel);
} }

View File

@ -30,7 +30,6 @@ async function curateReleaseEntry(release, batchId, existingRelease, type = 'sce
}); });
const curatedRelease = { const curatedRelease = {
id: release.id, // release is updated
title: decode(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,
@ -46,6 +45,11 @@ async function curateReleaseEntry(release, batchId, existingRelease, type = 'sce
updated_batch_id: batchId, updated_batch_id: batchId,
}; };
if (release.id) {
// release is updated
curatedRelease.id = release.id;
}
if (type === 'scene') { if (type === 'scene') {
curatedRelease.shoot_id = release.shootId || null; curatedRelease.shoot_id = release.shootId || null;
curatedRelease.production_date = Number(release.productionDate) ? release.productionDate : null; curatedRelease.production_date = Number(release.productionDate) ? release.productionDate : null;
@ -474,8 +478,6 @@ async function storeScenes(releases, useBatchId) {
const curatedDuplicateReleases = await Promise.all(duplicateReleasesWithId.map((release) => curateReleaseEntry(release, 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),