Compare commits

..

3 Commits

Author SHA1 Message Date
DebaucheryLibrarian c0347eed50 1.172.2 2021-02-21 22:17:32 +01:00
DebaucheryLibrarian 8a739893ea Improved duplicate handling. Added tag photos. 2021-02-21 22:17:25 +01:00
DebaucheryLibrarian a39750d808 Fixed Nubiles deep scrape date. 2021-02-20 01:16:09 +01:00
14 changed files with 15 additions and 16 deletions

2
package-lock.json generated
View File

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

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 840 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 729 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 324 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 350 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -645,7 +645,7 @@ const tagPosters = [
['mff', 1, 'Anikka Albrite, Kelsi Monroe and Mick Blue for HardX'],
['mfm', 0, 'Vina Sky in "Jules Jordan\'s Three Ways" for Jules Jordan'],
['natural-boobs', 1, 'Nia Nacci for First Class POV'],
['nurse', 1, 'Mia Malkova in "Always Think Happy Thoughts" for Brazzers'],
['nurse', 0, 'Sarah Vandella in "Cum For Nurse Sarah" for Brazzers'],
['nun', 0, 'Lady Zee in LegalPorno NF053'],
['oil', 2, 'Jade Kush for Passion HD'],
['oral-creampie', 1, 'Valentina Nappi for Her Limit'],
@ -872,7 +872,8 @@ const tagPhotos = [
['nun', 1, 'Penny Pax and Darcie Dolce in "Confessions Of A Sinful Nun" for Sweetheart Video'],
['nun', 3, 'Higurashi Rin in "Naughty Nun" for All Gravure'],
['nun', 2, 'Lea Lexis in "Confessions Of A Sinful Nun" for Sweetheart Video'],
['nurse', 0, 'Sarah Vandella in "Cum For Nurse Sarah" for Brazzers'],
['nurse', 2, 'Evelina Dellai in "Horny Nurses" for Private'],
['nurse', 1, 'Mia Malkova in "Always Think Happy Thoughts" for Brazzers'],
['oil', 1, 'Kissa Sins in "Oil Overload 14" for JulesJordan'],
['oil', 3, 'Vina Sky for Lubed'],
['oil', 0, 'Jada Stevens in "Jada Stevens Anal Ass Oiled Up For James Deen\'s Cock" for Jules Jordan'],

View File

@ -605,7 +605,12 @@ async function trySource(baseSource, existingMedias, baseMedia) {
};
}
return fetchSource(extractedSource, baseMedia);
const source = await fetchSource(extractedSource, baseMedia);
return {
...source,
entry: extractedSource.entry || existingSourceMedia,
};
}
async function fetchMedia(baseMedia, existingMedias) {
@ -698,9 +703,6 @@ async function storeMedias(baseMedias, options) {
const newMediaEntries = newMediaWithEntries.filter(media => media.newEntry).map(media => media.entry);
try {
// TODO: path duplicates disappear in DO NOTHING query, causing association error. source duplicate detection not working? use scene generator
// UPDATE: cannot replicate when using the same poster and photo source in scene generator
// await bulkInsert('media', newMediaEntries, false);
await bulkInsert('media', newMediaEntries);
return [...newMediaWithEntries, ...existingHashMedias];

View File

@ -72,7 +72,7 @@ async function scrapeScene({ query }, url, site) {
release.title = query.q('.content-pane-title h2', true);
release.description = query.q('.content-pane-column div', true);
release.date = query.q('.date', 'MMM D, YYYY');
release.date = query.date('.date', 'MMM D, YYYY');
release.actors = query.all('.content-pane-performers .model', true);
release.tags = query.all('.categories a', true);
@ -134,12 +134,6 @@ async function fetchUpcoming(site) {
return [];
}
async function fetchScene(url, site) {
const res = await qu.get(url);
return res.ok ? scrapeScene(res.item, url, site) : res.status;
}
async function fetchProfile({ name: actorName }, { site }) {
const firstLetter = actorName.charAt(0).toLowerCase();
const origin = slugUrlMap[site.slug] || site.url;
@ -164,6 +158,6 @@ async function fetchProfile({ name: actorName }, { site }) {
module.exports = {
fetchLatest,
fetchUpcoming,
fetchScene,
fetchProfile,
scrapeScene,
};

View File

@ -251,6 +251,8 @@ async function fetchLatest(entity, page, options) {
.orderByRaw('random()')
.limit(Math.floor(Math.random() * 10) + 1);
// const poster = 'sfw/kittens/thumbs/iNEXVlX-RLs.jpeg';
release.poster = `http://${config.web.host}:${config.web.port}/img/${poster}?id=${nanoid()}`; // ensure source is unique
release.photos = photos.map(photo => `http://${config.web.host}:${config.web.port}/img/${photo}?id=${nanoid()}`);
}