Compare commits
No commits in common. "cde290fbd71458ff69fe4453b8efe8177dbd8c9d" and "2068202ca60891e4d3574fc41b125b1993e6b6b9" have entirely different histories.
cde290fbd7
...
2068202ca6
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "traxxx",
|
||||
"version": "1.83.4",
|
||||
"version": "1.83.3",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "traxxx",
|
||||
"version": "1.83.4",
|
||||
"version": "1.83.3",
|
||||
"description": "All the latest porn releases in one place",
|
||||
"main": "src/app.js",
|
||||
"scripts": {
|
||||
|
|
|
@ -387,7 +387,6 @@ async function scrapeActors(actorNames) {
|
|||
|
||||
if (argv.inspect) {
|
||||
console.log(profile);
|
||||
logger.info(`Found ${profile.releases.length} releases for ${actorName}`);
|
||||
}
|
||||
|
||||
if (profile === null) {
|
||||
|
|
|
@ -39,7 +39,7 @@ async function scrapeRelease(source, basicRelease = null, type = 'scene') {
|
|||
const site = await findSite(url, release);
|
||||
|
||||
if (!site) {
|
||||
throw new Error(`Could not find site ${url} in database`);
|
||||
throw new Error('Could not find site in database');
|
||||
}
|
||||
|
||||
const scraper = scrapers.releases[site.slug] || scrapers.releases[site.network.slug];
|
||||
|
|
|
@ -73,7 +73,7 @@ async function scrapeLatest(items, site) {
|
|||
return latestReleases.filter(Boolean);
|
||||
}
|
||||
|
||||
function scrapeScene(data, url, _site, networkName) {
|
||||
function scrapeScene(data, url, _site) {
|
||||
const release = {};
|
||||
|
||||
const { id: entryId, title, description } = data;
|
||||
|
@ -100,7 +100,7 @@ function scrapeScene(data, url, _site, networkName) {
|
|||
const siteName = data.collections[0]?.name || data.brand;
|
||||
release.channel = siteName.replace(/\s+/g, '').toLowerCase();
|
||||
|
||||
release.url = url || `https://www.${networkName || data.brand}.com/scene/${entryId}/`;
|
||||
release.url = url || `https://www.${data.brand}.com/scene/${entryId}/`;
|
||||
|
||||
return release;
|
||||
}
|
||||
|
@ -139,7 +139,7 @@ async function getSession(url) {
|
|||
return { session, instanceToken };
|
||||
}
|
||||
|
||||
function scrapeProfile(data, html, releases = [], networkName) {
|
||||
function scrapeProfile(data, html, releases = []) {
|
||||
const { qa, qd } = ex(html);
|
||||
|
||||
const profile = {
|
||||
|
@ -170,7 +170,7 @@ function scrapeProfile(data, html, releases = [], networkName) {
|
|||
const birthdate = qa('li').find(el => /Date of Birth/.test(el.textContent));
|
||||
if (birthdate) profile.birthdate = qd(birthdate, 'span', 'MMMM Do, YYYY');
|
||||
|
||||
profile.releases = releases.map(release => scrapeScene(release, null, null, networkName));
|
||||
profile.releases = releases.map(release => scrapeScene(release));
|
||||
|
||||
return profile;
|
||||
}
|
||||
|
@ -247,11 +247,11 @@ async function fetchProfile(actorName, networkName, actorPath = 'model') {
|
|||
]);
|
||||
|
||||
if (actorRes.statusCode === 200 && actorReleasesRes.statusCode === 200 && actorReleasesRes.body.result) {
|
||||
return scrapeProfile(actorData, actorRes.body.toString(), actorReleasesRes.body.result, networkName);
|
||||
return scrapeProfile(actorData, actorRes.body.toString(), actorReleasesRes.body.result);
|
||||
}
|
||||
|
||||
if (actorRes.statusCode === 200) {
|
||||
return scrapeProfile(actorData, actorRes.body.toString(), null, networkName);
|
||||
return scrapeProfile(actorData, actorRes.body.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,14 +3,13 @@
|
|||
const config = require('config');
|
||||
const path = require('path');
|
||||
const fs = require('fs-extra');
|
||||
const moment = require('moment');
|
||||
|
||||
const argv = require('../argv');
|
||||
const knex = require('../knex');
|
||||
|
||||
async function init() {
|
||||
const posters = await knex('actors')
|
||||
.select('actors.name as actor_name', 'releases.title', 'releases.date', 'media.path', 'sites.name as site_name', 'networks.name as network_name')
|
||||
.select('actors.name as actor_name', 'releases.title', 'media.path', 'sites.name as site_name', 'networks.name as network_name')
|
||||
.whereIn('actors.name', argv.actors)
|
||||
.join('releases_actors', 'releases_actors.actor_id', 'actors.id')
|
||||
.join('releases', 'releases_actors.release_id', 'releases.id')
|
||||
|
@ -21,7 +20,7 @@ async function init() {
|
|||
|
||||
await Promise.all(posters.map(async (poster) => {
|
||||
const source = path.join(config.media.path, poster.path);
|
||||
const target = path.join(config.media.path, 'posters', `${poster.actor_name} - ${poster.network_name}: ${poster.site_name} - ${poster.title.replace(/[/.]/g, '_')} (${moment.utc(poster.date).format('YYYY-MM-DD')}).jpeg`);
|
||||
const target = path.join(config.media.path, 'posters', `${poster.actor_name} - ${poster.network_name}: ${poster.site_name} - ${poster.title.replace(/[/.]/g, '_')}.jpeg`);
|
||||
|
||||
const file = await fs.readFile(source);
|
||||
await fs.writeFile(target, file);
|
||||
|
|
Loading…
Reference in New Issue