From 8c76568f444a820acc123ae1f78a29412b6c798b Mon Sep 17 00:00:00 2001 From: Niels Simenon Date: Tue, 14 Jan 2020 01:50:11 +0100 Subject: [PATCH] Added Babes network --- .gitignore | 1 + config/default.js | 31 ------------------------------- log/2020-01-13.log | 22 ++++++++++++++++++++++ seeds/00_networks.js | 5 +++++ seeds/01_sites.js | 37 +++++++++++++++++++++++++++++++++++++ src/scrapers/scrapers.js | 2 ++ src/sites.js | 11 +++++------ 7 files changed, 72 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 71781010f..e850585e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ node_modules/ dist/ +log/ public/js/* public/css/* config/* diff --git a/config/default.js b/config/default.js index 258cf2815..552661c47 100644 --- a/config/default.js +++ b/config/default.js @@ -52,37 +52,6 @@ module.exports = { 'xempire', ], fetchAfter: [1, 'week'], - columns: [ - { - value: 'date', - format: 'MMM DD, YYYY', - width: 14, - }, - { - value: 'network', - width: 15, - }, - { - value: 'site', - width: 25, - }, - { - value: 'shootId', - width: 15, - }, - { - value: 'title', - width: 80, - }, - { - value: 'actors', - width: 60, - }, - { - value: 'rating', - width: 30, - }, - ], media: { path: './', thumbnailSize: 320, // width for 16:9 will be exactly 576px diff --git a/log/2020-01-13.log b/log/2020-01-13.log index 00b67e40e..eedfbe2fe 100644 --- a/log/2020-01-13.log +++ b/log/2020-01-13.log @@ -1891,3 +1891,25 @@ 2020-01-13T22:14:58.307Z debug: 'actors_avatars: Updating 0' 2020-01-13T22:14:58.309Z debug: 'actors_photos: Inserting 1' 2020-01-13T22:14:58.309Z debug: 'actors_photos: Updating 0' +2020-01-13T22:54:13.451Z debug: 'networks: Inserting 1' +2020-01-13T22:54:13.454Z debug: 'networks: Updating 23' +2020-01-13T22:54:13.569Z debug: 'sites: Inserting 5' +2020-01-13T22:54:13.570Z debug: 'sites: Updating 389' +2020-01-13T22:54:14.254Z debug: 'studios: Inserting 0' +2020-01-13T22:54:14.255Z debug: 'studios: Updating 22' +2020-01-13T22:54:14.316Z debug: 'tags_groups: Inserting 0' +2020-01-13T22:54:14.317Z debug: 'tags_groups: Updating 13' +2020-01-13T22:54:14.367Z debug: 'tags: Inserting 0' +2020-01-13T22:54:14.368Z debug: 'tags: Updating 143' +2020-01-13T22:54:14.613Z debug: 'tags: Inserting 0' +2020-01-13T22:54:14.614Z debug: 'tags: Updating 165' +2020-01-13T22:54:14.863Z debug: 'sites_tags: Inserting 0' +2020-01-13T22:54:14.864Z debug: 'sites_tags: Updating 13' +2020-01-13T22:54:14.896Z debug: 'media: Inserting 0' +2020-01-13T22:54:14.897Z debug: 'media: Updating 48' +2020-01-13T22:54:14.972Z debug: 'tags_posters: Inserting 0' +2020-01-13T22:54:14.972Z debug: 'tags_posters: Updating 28' +2020-01-13T22:54:14.979Z debug: 'tags_photos: Inserting 0' +2020-01-13T22:54:14.979Z debug: 'tags_photos: Updating 20' +2020-01-13T22:54:15.053Z debug: 'countries: Inserting 0' +2020-01-13T22:54:15.053Z debug: 'countries: Updating 250' diff --git a/seeds/00_networks.js b/seeds/00_networks.js index 32c85a446..4319b5b7b 100644 --- a/seeds/00_networks.js +++ b/seeds/00_networks.js @@ -8,6 +8,11 @@ const networks = [ url: 'https://www.21sextury.com', description: 'Watch all the latest scenes and porn video updates on 21Sextury.com, the best European porn site with the hottest pornstars from all over the world! Watch porn videos from the large network here.', }, + { + slug: 'babes', + name: 'Babes', + url: 'https://www.babes.com', + }, { slug: 'bang', name: 'Bang!', diff --git a/seeds/01_sites.js b/seeds/01_sites.js index 3a0697087..f768b1231 100644 --- a/seeds/01_sites.js +++ b/seeds/01_sites.js @@ -119,6 +119,43 @@ function getSites(networksMap) { name: 'Sweet Sophie Moone', network_id: networksMap['21sextury'], }, + // BABES + { + name: 'Babes', + url: 'https://www.babes.com/scenes?site=213', + slug: 'babes', + network_id: networksMap.babes, + }, + { + name: 'Babes Unleashed', + url: 'https://www.babes.com/scenes?site=218', + slug: 'babesunleashed', + network_id: networksMap.babes, + }, + { + name: 'Black Is Better', + url: 'https://www.babes.com/scenes?site=217', + slug: 'blackisbetter', + network_id: networksMap.babes, + }, + { + name: 'Elegant Anal', + url: 'https://www.babes.com/scenes?site=216', + slug: 'elegantanal', + network_id: networksMap.babes, + }, + { + name: 'Office Obsession', + url: 'https://www.babes.com/scenes?site=214', + slug: 'officeobsession', + network_id: networksMap.babes, + }, + { + name: 'Step Mom Lessons', + url: 'https://www.babes.com/scenes?site=215', + slug: 'stepmomlessons', + network_id: networksMap.babes, + }, // BANG { name: 'Trickery', diff --git a/src/scrapers/scrapers.js b/src/scrapers/scrapers.js index e96bfe412..94c5fc4d7 100644 --- a/src/scrapers/scrapers.js +++ b/src/scrapers/scrapers.js @@ -2,6 +2,7 @@ // releases const twentyonesextury = require('./21sextury'); +const babes = require('./babes'); const bang = require('./bang'); const bangbros = require('./bangbros'); const blowpass = require('./blowpass'); @@ -34,6 +35,7 @@ const pornhub = require('./pornhub'); module.exports = { releases: { '21sextury': twentyonesextury, + babes, bang, bangbros, blowpass, diff --git a/src/sites.js b/src/sites.js index 94442a6bf..3f6585466 100644 --- a/src/sites.js +++ b/src/sites.js @@ -63,18 +63,17 @@ async function findSiteByUrl(url) { const { hostname } = new URL(url); const domain = hostname.replace(/www.|tour./, ''); - const site = await knex('sites') + const sites = await knex('sites') .leftJoin('networks', 'sites.network_id', 'networks.id') .select( 'sites.*', 'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url', 'networks.description as network_description', 'networks.parameters as network_parameters', ) - .where('sites.url', 'like', `%${domain}`) - .orWhere('sites.url', url) - .first(); + .where('sites.url', 'like', `${domain}`) + .orWhere('sites.url', url); - if (site) { - const curatedSite = curateSite(site, true); + if (sites.length > 0) { + const curatedSite = curateSite(sites[0], true); return curatedSite; }