Compare commits

...

2 Commits

Author SHA1 Message Date
DebaucheryLibrarian 53e8495d06 1.135.4 2020-09-17 14:49:56 +02:00
DebaucheryLibrarian a9fa71e455 Fixed predata parameter in Assylum scraper. 2020-09-17 14:49:45 +02:00
3 changed files with 12 additions and 9 deletions

2
package-lock.json generated
View File

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

View File

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

View File

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