From 4db9a34a341ad161c6d1cfa44b0fd4c79f5f7de5 Mon Sep 17 00:00:00 2001 From: DebaucheryLibrarian Date: Tue, 2 Feb 2021 22:36:47 +0100 Subject: [PATCH] Removed superfluous Gamma scrapers. --- seeds/01_networks.js | 12 ++++++++++++ seeds/02_sites.js | 8 +++++++- src/scrapers/burningangel.js | 10 ---------- src/scrapers/girlsway.js | 10 ---------- src/scrapers/jayrock.js | 12 ++++-------- src/scrapers/puretaboo.js | 9 --------- src/scrapers/scrapers.js | 14 ++------------ src/scrapers/wicked.js | 10 ---------- src/scrapers/xempire.js | 10 +--------- src/scrapers/zerotolerance.js | 10 ---------- 10 files changed, 26 insertions(+), 79 deletions(-) delete mode 100644 src/scrapers/burningangel.js delete mode 100644 src/scrapers/girlsway.js delete mode 100644 src/scrapers/puretaboo.js delete mode 100644 src/scrapers/wicked.js delete mode 100644 src/scrapers/zerotolerance.js diff --git a/seeds/01_networks.js b/seeds/01_networks.js index 650dcddb..017bf3d3 100644 --- a/seeds/01_networks.js +++ b/seeds/01_networks.js @@ -262,6 +262,9 @@ const networks = [ name: 'Girlsway', url: 'https://www.girlsway.com', description: 'Girlsway.com has the best lesbian porn videos online! The hottest pornstars & first time lesbians in real girl on girl sex, tribbing, squirting & pussy licking action right HERE!', + parameters: { + layout: 'api', + }, parent: 'gamma', }, { @@ -444,6 +447,9 @@ const networks = [ name: 'Pure Taboo', url: 'https://www.puretaboo.com', description: 'PureTaboo.com is the ultimate site for family taboo porn, featuring submissive teens & virgins in rough sex videos in ultra 4k HD.', + parameters: { + layout: 'api', + }, parent: 'gamma', }, { @@ -533,6 +539,9 @@ const networks = [ name: 'XEmpire', url: 'https://www.xempire.com', description: 'XEmpire.com brings you today\'s top pornstars in beautifully shot, HD sex scenes across 4 unique porn sites of gonzo porn, interracial, lesbian & erotica!', + parameters: { + actorScenes: 'https://www.xempire.com/en/videos/xempire/latest/{page}/All-Categories/0{actorPath}', + }, parent: 'gamma', }, { @@ -540,6 +549,9 @@ const networks = [ name: 'Zero Tolerance', alias: ['ztod'], url: 'http://www.ztod.com', + parameters: { + layout: 'api', + }, parent: 'gamma', }, ]; diff --git a/seeds/02_sites.js b/seeds/02_sites.js index c475330f..4130d9d2 100644 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -1627,6 +1627,9 @@ const sites = [ alias: ['burna'], url: 'https://www.burningangel.com', independent: true, + parameters: { + layout: 'api', + }, parent: 'gamma', }, // CHERRY PIMPS @@ -3627,7 +3630,7 @@ const sites = [ url: 'https://cospimps.com', parent: 'jayrock', parameters: { - useApi: true, + layout: 'api', /* Gamma scenes are out of date referer: 'https://www.21sextury.com', scene: false, @@ -9424,6 +9427,9 @@ const sites = [ url: 'https://www.wicked.com', description: 'Welcome to the new Wicked.com! Watch over 25 years of Wicked Pictures\' brand of award-winning porn for couples and women in 4k HD movies & xxx videos', independent: true, + parameters: { + layout: 'api', + }, parent: 'gamma', }, // XEMPIRE diff --git a/src/scrapers/burningangel.js b/src/scrapers/burningangel.js deleted file mode 100644 index 562acaa6..00000000 --- a/src/scrapers/burningangel.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -const { fetchApiLatest, fetchApiUpcoming, fetchScene, fetchApiProfile } = require('./gamma'); - -module.exports = { - fetchLatest: fetchApiLatest, - fetchProfile: fetchApiProfile, - fetchScene, - fetchUpcoming: fetchApiUpcoming, -}; diff --git a/src/scrapers/girlsway.js b/src/scrapers/girlsway.js deleted file mode 100644 index 518aabe4..00000000 --- a/src/scrapers/girlsway.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -const { fetchApiLatest, fetchApiUpcoming, fetchScene } = require('./gamma'); - - -module.exports = { - fetchLatest: fetchApiLatest, - fetchScene, - fetchUpcoming: fetchApiUpcoming, -}; diff --git a/src/scrapers/jayrock.js b/src/scrapers/jayrock.js index 6a9cceec..3eece4aa 100644 --- a/src/scrapers/jayrock.js +++ b/src/scrapers/jayrock.js @@ -178,10 +178,6 @@ async function fetchLatestApi(channel, page = 1) { } async function fetchLatest(channel, page = 1, options, preData) { - if (channel.parameters?.useApi) { - return fetchLatestApi(channel, page, options, preData); - } - if (channel.parameters?.useGamma) { return fetchApiLatest(channel, page, preData, options, false); } @@ -211,10 +207,6 @@ async function fetchSceneApi(url, channel, baseRelease) { } async function fetchScene(url, channel) { - if (channel.parameters?.useApi) { - return fetchSceneApi(url, channel); - } - const res = await qu.get(url); if (res.ok) { @@ -227,4 +219,8 @@ async function fetchScene(url, channel) { module.exports = { fetchLatest, fetchScene, + api: { + fetchLatest: fetchLatestApi, + fetchScene: fetchSceneApi, + }, }; diff --git a/src/scrapers/puretaboo.js b/src/scrapers/puretaboo.js deleted file mode 100644 index 9ae001f9..00000000 --- a/src/scrapers/puretaboo.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -const { fetchApiLatest, fetchApiUpcoming, fetchScene } = require('./gamma'); - -module.exports = { - fetchLatest: fetchApiLatest, - fetchScene, - fetchUpcoming: fetchApiUpcoming, -}; diff --git a/src/scrapers/scrapers.js b/src/scrapers/scrapers.js index 551cf814..d6af55a2 100644 --- a/src/scrapers/scrapers.js +++ b/src/scrapers/scrapers.js @@ -10,7 +10,6 @@ const bamvisions = require('./bamvisions'); const bang = require('./bang'); const bangbros = require('./bangbros'); const blowpass = require('./blowpass'); -const burningangel = require('./burningangel'); const cherrypimps = require('./cherrypimps'); const czechav = require('./czechav'); const ddfnetwork = require('./ddfnetwork'); @@ -24,7 +23,6 @@ const firstanalquest = require('./firstanalquest'); const fcuk = require('./fcuk'); const fullpornnetwork = require('./fullpornnetwork'); const gamma = require('./gamma'); -const girlsway = require('./girlsway'); const hitzefrei = require('./hitzefrei'); const hookuphotshot = require('./hookuphotshot'); const hush = require('./hush'); @@ -58,7 +56,6 @@ const pascalssubsluts = require('./pascalssubsluts'); // reserved keyword const pierrewoodman = require('./pierrewoodman'); const pinkyxxx = require('./pinkyxxx'); const privateNetwork = require('./private'); // reserved keyword -const puretaboo = require('./puretaboo'); const realitykings = require('./realitykings'); const score = require('./score'); const teamskeet = require('./teamskeet'); @@ -71,9 +68,7 @@ const vivid = require('./vivid'); const vixen = require('./vixen'); const vogov = require('./vogov'); const whalemember = require('./whalemember'); -const wicked = require('./wicked'); const xempire = require('./xempire'); -const zerotolerance = require('./zerotolerance'); // profiles const boobpedia = require('./boobpedia'); @@ -94,7 +89,6 @@ const scrapers = { bangbros, blowpass, brazzers: mindgeek, - burningangel, cherrypimps, czechav, pornworld: ddfnetwork, @@ -111,7 +105,6 @@ const scrapers = { fullpornnetwork, gamma, gaywire: bangbros, - girlsway, girlgirl: julesjordan, hitzefrei, hookuphotshot, @@ -149,7 +142,6 @@ const scrapers = { porncz, pornpros: whalemember, private: privateNetwork, - puretaboo, realitykings, score, sexyhub: mindgeek, @@ -165,9 +157,7 @@ const scrapers = { vixen, vogov, whalemember, - wicked, xempire, - zerotolerance, }, actors: { '21sextury': gamma, @@ -190,7 +180,7 @@ const scrapers = { boobpedia, brattysis: nubiles, brazzers: mindgeek, - burningangel, + burningangel: gamma, cherrypimps, pornworld: ddfnetwork, deeper: vixen, @@ -277,7 +267,7 @@ const scrapers = { twistys, vipsexvault: porndoe, vixen, - wicked, + wicked: gamma, wildoncam: cherrypimps, xempire, }, diff --git a/src/scrapers/wicked.js b/src/scrapers/wicked.js deleted file mode 100644 index 562acaa6..00000000 --- a/src/scrapers/wicked.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -const { fetchApiLatest, fetchApiUpcoming, fetchScene, fetchApiProfile } = require('./gamma'); - -module.exports = { - fetchLatest: fetchApiLatest, - fetchProfile: fetchApiProfile, - fetchScene, - fetchUpcoming: fetchApiUpcoming, -}; diff --git a/src/scrapers/xempire.js b/src/scrapers/xempire.js index c699931a..cbe44132 100644 --- a/src/scrapers/xempire.js +++ b/src/scrapers/xempire.js @@ -18,17 +18,9 @@ async function fetchScene(url, site, baseRelease, options) { return release; } -function getActorReleasesUrl(actorPath, page = 1) { - return `https://www.xempire.com/en/videos/xempire/latest/${page}/All-Categories/0${actorPath}`; -} - -async function networkFetchProfile(baseActor, context, include) { - return fetchProfile(baseActor, context, null, getActorReleasesUrl, include); -} - module.exports = { fetchLatest, - fetchProfile: networkFetchProfile, + fetchProfile, fetchUpcoming, fetchScene, }; diff --git a/src/scrapers/zerotolerance.js b/src/scrapers/zerotolerance.js deleted file mode 100644 index 562acaa6..00000000 --- a/src/scrapers/zerotolerance.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -const { fetchApiLatest, fetchApiUpcoming, fetchScene, fetchApiProfile } = require('./gamma'); - -module.exports = { - fetchLatest: fetchApiLatest, - fetchProfile: fetchApiProfile, - fetchScene, - fetchUpcoming: fetchApiUpcoming, -};