Compare commits
No commits in common. "f1c9ac420727a95537f91239b9d312db97e7e5dd" and "430c7e124d4c3126969e90c1901fb54ca7a8c794" have entirely different histories.
f1c9ac4207
...
430c7e124d
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "traxxx",
|
"name": "traxxx",
|
||||||
"version": "1.214.1",
|
"version": "1.214.0",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "traxxx",
|
"name": "traxxx",
|
||||||
"version": "1.214.1",
|
"version": "1.214.0",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@casl/ability": "^5.2.2",
|
"@casl/ability": "^5.2.2",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "traxxx",
|
"name": "traxxx",
|
||||||
"version": "1.214.1",
|
"version": "1.214.0",
|
||||||
"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": {
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 88 KiB |
|
@ -2785,9 +2785,6 @@ const sites = [
|
||||||
name: 'Gloryhole Initiations',
|
name: 'Gloryhole Initiations',
|
||||||
url: 'https://www.gloryhole-initiations.com',
|
url: 'https://www.gloryhole-initiations.com',
|
||||||
parent: 'dogfartnetwork',
|
parent: 'dogfartnetwork',
|
||||||
parameters: {
|
|
||||||
latest: 'https://www.gloryhole-initiations.com/tourx/scenes',
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
slug: 'dogfartbehindthescenes',
|
slug: 'dogfartbehindthescenes',
|
||||||
|
|
|
@ -100,13 +100,6 @@ const banners = [
|
||||||
channel: 'archangel',
|
channel: 'archangel',
|
||||||
tags: ['dp', 'anal', 'sex', 'interracial', 'black'],
|
tags: ['dp', 'anal', 'sex', 'interracial', 'black'],
|
||||||
},
|
},
|
||||||
{
|
|
||||||
id: 'wefuckblackgirls_728_90_loss',
|
|
||||||
width: 728,
|
|
||||||
height: 90,
|
|
||||||
network: 'dogfartnetwork',
|
|
||||||
tags: ['mfm', 'threesome', 'anal', 'black', 'interracial'],
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
id: 'evilangel_728_90_adriana_chechik_gangbang',
|
id: 'evilangel_728_90_adriana_chechik_gangbang',
|
||||||
width: 728,
|
width: 728,
|
||||||
|
@ -802,7 +795,7 @@ const campaigns = [
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
exports.seed = async (knex) => Promise.resolve()
|
exports.seed = async knex => Promise.resolve()
|
||||||
.then(async () => {
|
.then(async () => {
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
knex('campaigns').delete(),
|
knex('campaigns').delete(),
|
||||||
|
@ -817,19 +810,19 @@ exports.seed = async (knex) => Promise.resolve()
|
||||||
const [networks, channels, tags] = await Promise.all([
|
const [networks, channels, tags] = await Promise.all([
|
||||||
knex('entities')
|
knex('entities')
|
||||||
.where('type', 'network')
|
.where('type', 'network')
|
||||||
.whereIn('slug', campaigns.concat(banners).map((link) => link.network).filter(Boolean)),
|
.whereIn('slug', campaigns.concat(banners).map(link => link.network).filter(Boolean)),
|
||||||
knex('entities')
|
knex('entities')
|
||||||
.where('type', 'channel')
|
.where('type', 'channel')
|
||||||
.whereIn('slug', campaigns.concat(banners).map((link) => link.channel).filter(Boolean)),
|
.whereIn('slug', campaigns.concat(banners).map(link => link.channel).filter(Boolean)),
|
||||||
knex('tags')
|
knex('tags')
|
||||||
.whereIn('slug', banners.flatMap((banner) => banner.tags || [])),
|
.whereIn('slug', banners.flatMap(banner => banner.tags || [])),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const networksBySlug = networks.reduce((acc, network) => ({ ...acc, [network.slug]: network }), {});
|
const networksBySlug = networks.reduce((acc, network) => ({ ...acc, [network.slug]: network }), {});
|
||||||
const channelsBySlug = channels.reduce((acc, channel) => ({ ...acc, [channel.slug]: channel }), {});
|
const channelsBySlug = channels.reduce((acc, channel) => ({ ...acc, [channel.slug]: channel }), {});
|
||||||
const tagsBySlug = tags.reduce((acc, tag) => ({ ...acc, [tag.slug]: tag }), {});
|
const tagsBySlug = tags.reduce((acc, tag) => ({ ...acc, [tag.slug]: tag }), {});
|
||||||
|
|
||||||
const affiliatesWithEntityId = affiliates.map((affiliate) => ({
|
const affiliatesWithEntityId = affiliates.map(affiliate => ({
|
||||||
id: affiliate.id,
|
id: affiliate.id,
|
||||||
entity_id: networksBySlug[affiliate.network]?.id || channelsBySlug[affiliate.channel]?.id || null,
|
entity_id: networksBySlug[affiliate.network]?.id || channelsBySlug[affiliate.channel]?.id || null,
|
||||||
url: affiliate.url,
|
url: affiliate.url,
|
||||||
|
@ -837,7 +830,7 @@ exports.seed = async (knex) => Promise.resolve()
|
||||||
comment: affiliate.comment,
|
comment: affiliate.comment,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const bannersWithEntityId = banners.map((banner) => ({
|
const bannersWithEntityId = banners.map(banner => ({
|
||||||
id: banner.id,
|
id: banner.id,
|
||||||
width: banner.width,
|
width: banner.width,
|
||||||
height: banner.height,
|
height: banner.height,
|
||||||
|
@ -845,17 +838,17 @@ exports.seed = async (knex) => Promise.resolve()
|
||||||
entity_id: networksBySlug[banner.network]?.id || channelsBySlug[banner.channel]?.id || null,
|
entity_id: networksBySlug[banner.network]?.id || channelsBySlug[banner.channel]?.id || null,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const bannerTags = banners.flatMap((banner) => banner.tags?.map((tag) => ({
|
const bannerTags = banners.flatMap(banner => banner.tags?.map(tag => ({
|
||||||
banner_id: banner.id,
|
banner_id: banner.id,
|
||||||
tag_id: tagsBySlug[tag].id,
|
tag_id: tagsBySlug[tag].id,
|
||||||
})) || []);
|
})) || []);
|
||||||
|
|
||||||
const campaignsWithEntityIdAndAffiliateId = campaigns.map((campaign) => ({
|
const campaignsWithEntityIdAndAffiliateId = campaigns.map(campaign => ({
|
||||||
entity_id: networksBySlug[campaign.network]?.id || channelsBySlug[campaign.channel]?.id,
|
entity_id: networksBySlug[campaign.network]?.id || channelsBySlug[campaign.channel]?.id,
|
||||||
url: campaign.url,
|
url: campaign.url,
|
||||||
affiliate_id: campaign.affiliate,
|
affiliate_id: campaign.affiliate,
|
||||||
banner_id: campaign.banner,
|
banner_id: campaign.banner,
|
||||||
})).filter((link) => link.entity_id && (link.url || link.affiliate_id));
|
})).filter(link => link.entity_id && (link.url || link.affiliate_id));
|
||||||
|
|
||||||
await knex('affiliates').insert(affiliatesWithEntityId);
|
await knex('affiliates').insert(affiliatesWithEntityId);
|
||||||
await bulkInsert('banners', bannersWithEntityId, false);
|
await bulkInsert('banners', bannersWithEntityId, false);
|
||||||
|
|
|
@ -93,8 +93,9 @@ async function scrapeScene({ query }, url, channel, baseScene, parameters) {
|
||||||
return release;
|
return release;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function fetchLatest(channel, page = 1, { parameters }) {
|
async function fetchLatest(channel, page = 1) {
|
||||||
const res = await qu.getAll(parameters.latest ? `${parameters.latest}/?p=${page}` : `${channel.url}/tour/scenes/?p=${page}`, '.recent-updates, .preview-image-container');
|
// const res = await qu.getAll(`https://dogfartnetwork.com/tour/scenes/?p=${page}`, '.recent-updates');
|
||||||
|
const res = await qu.getAll(`${channel.url}/tour/scenes/?p=${page}`, '.recent-updates, .preview-image-container');
|
||||||
|
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
return scrapeLatest(res.items, channel);
|
return scrapeLatest(res.items, channel);
|
||||||
|
|
Loading…
Reference in New Issue