Compare commits

..

No commits in common. "a9fa71e455d18712d69ec1a664059d0f941da76a" and "796a624d2bd4f8c1f5eac9e467c36dadf937ac6b" have entirely different histories.

3 changed files with 9 additions and 12 deletions

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.135.3", "version": "1.135.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

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

View File

@ -33,7 +33,6 @@ function scrapeLatest(scenes, site, models) {
const actorString = qu.q('.mas_description', true); const actorString = qu.q('.mas_description', true);
const actors = matchActors(actorString, models); const actors = matchActors(actorString, models);
if (actors.length > 0) release.actors = actors; if (actors.length > 0) release.actors = actors;
else release.actors = extractActors(actorString); else release.actors = extractActors(actorString);
@ -52,12 +51,10 @@ function scrapeScene({ html, qu }, url, site, include, models) {
release.description = qu.q('.mas_longdescription', true); release.description = qu.q('.mas_longdescription', true);
release.date = qu.date('.mas_description', 'MMMM DD, YYYY', /\w+ \d{1,2}, \d{4}/); release.date = qu.date('.mas_description', 'MMMM DD, YYYY', /\w+ \d{1,2}, \d{4}/);
if (models) { const actorString = qu.q('.mas_description', true).replace(/\w+ \d{1,2}, \d{4}/, '');
const actorString = qu.q('.mas_description', true).replace(/\w+ \d{1,2}, \d{4}/, ''); const actors = matchActors(actorString, models);
const actors = matchActors(actorString, models); if (actors.length > 0) release.actors = actors;
if (actors.length > 0) release.actors = actors; else release.actors = extractActors(actorString);
else release.actors = extractActors(actorString);
}
release.tags = qu.all('.tags a', true); release.tags = qu.all('.tags a', true);
@ -115,14 +112,14 @@ async function fetchModels(site, page = 1, accModels = []) {
return []; return [];
} }
async function fetchLatest(site, page = 1, include, { beforeFetchLatest }) { async function fetchLatest(site, page = 1, models) {
const url = `${site.url}/show.php?a=${site.parameters.a}_${page}`; const url = `${site.url}/show.php?a=${site.parameters.a}_${page}`;
const res = await geta(url, '.item'); const res = await geta(url, '.item');
return res.ok ? scrapeLatest(res.items, site, beforeFetchLatest) : res.status; return res.ok ? scrapeLatest(res.items, site, models) : res.status;
} }
async function fetchScene(url, site, release, include, beforeFetchLatest) { async function fetchScene(url, site, release, beforeFetchLatest) {
const models = beforeFetchLatest || await fetchModels(site); const models = beforeFetchLatest || await fetchModels(site);
const res = await get(url); const res = await get(url);