From e9cbf5dab24f425fa6cd080cfdb9ec54bad234f9 Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <moonloop.adult@protonmail.com>
Date: Sun, 24 Jan 2021 23:31:28 +0100
Subject: [PATCH] Added Woodman Casting X and WUNF update and scene scraper.
 Fixed actor and fallback media arrays being merged in deep scraper.

---
 assets/components/releases/release.vue |  2 +-
 config/default.js                      |  6 ++++++
 seeds/01_networks.js                   |  5 +++++
 seeds/02_sites.js                      | 20 ++++++++++++++++++++
 src/deep.js                            |  3 ++-
 src/scrapers/scrapers.js               |  2 ++
 6 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/assets/components/releases/release.vue b/assets/components/releases/release.vue
index ecf9b3db..2ae4268e 100644
--- a/assets/components/releases/release.vue
+++ b/assets/components/releases/release.vue
@@ -6,7 +6,7 @@
 		<Scroll
 			v-slot="slotProps"
 			class="scroll-light banner"
-			:style="{ 'background-image': `url(/media/${release.poster.thumbnail})` }"
+			:style="{ 'background-image': release.poster && `url(/media/${release.poster.thumbnail})` }"
 			:expandable="false"
 		>
 			<Banner
diff --git a/config/default.js b/config/default.js
index aa53bc8b..562025d3 100644
--- a/config/default.js
+++ b/config/default.js
@@ -215,6 +215,12 @@ module.exports = {
 			'sthw-trailer-blacked.ssl-cdn.com',
 			'sthw-trailer-blackedraw.ssl-cdn.com',
 			'sthw-trailer-deeper.ssl-cdn.com',
+			'streamhw-trailer-vixen.ssl-cdn.com',
+			'streamhw-trailer-tushy.ssl-cdn.com',
+			'streamhw-trailer-tushyraw.ssl-cdn.com',
+			'streamhw-trailer-blacked.ssl-cdn.com',
+			'streamhw-trailer-blackedraw.ssl-cdn.com',
+			'streamhw-trailer-deeper.ssl-cdn.com',
 		],
 	},
 	limits: {
diff --git a/seeds/01_networks.js b/seeds/01_networks.js
index 1ae34de6..2372d3f7 100644
--- a/seeds/01_networks.js
+++ b/seeds/01_networks.js
@@ -516,6 +516,11 @@ const networks = [
 		url: 'https://www.vixen.com',
 		description: 'Vixen.com features the world’s finest cinematic adult films with 4K quality and high-end erotic photography.',
 	},
+	{
+		slug: 'pierrewoodman',
+		name: 'Pierre Woodman',
+		url: 'http://www.pierrewoodman.com',
+	},
 	{
 		slug: 'xempire',
 		name: 'XEmpire',
diff --git a/seeds/02_sites.js b/seeds/02_sites.js
index f3ca12b1..6eddb277 100644
--- a/seeds/02_sites.js
+++ b/seeds/02_sites.js
@@ -5833,6 +5833,26 @@ const sites = [
 			tourId: 9,
 		},
 	},
+	// PIERRE WOODMAN
+	{
+		slug: 'woodmancastingx',
+		name: 'Woodman Casting X',
+		url: 'https://www.woodmancastingx.com',
+		parent: 'pierrewoodman',
+		parameters: {
+			latest: 'https://www.woodmancastingx.com/videos/',
+		},
+	},
+	{
+		slug: 'wakeupnfuck',
+		name: 'Wake Up \'N Fuck',
+		url: 'https://www.wakeupnfuck.com',
+		alias: ['wunf'],
+		parent: 'pierrewoodman',
+		parameters: {
+			latest: 'https://www.wakeupnfuck.com/scene',
+		},
+	},
 	// PIMP XXX
 	{
 		slug: 'drilledxxx',
diff --git a/src/deep.js b/src/deep.js
index bbc4a300..31882c39 100644
--- a/src/deep.js
+++ b/src/deep.js
@@ -138,12 +138,13 @@ async function scrapeRelease(baseRelease, entities, type = 'scene') {
 		logger.verbose(`Fetching ${type} ${baseRelease.url}`);
 
 		const scrapedRelease = type === 'scene'
-			? await fetchScene(scraper, baseRelease.url, entity, baseRelease, include, null)
+			? await fetchScene(layoutScraper, baseRelease.url, entity, baseRelease, include, null)
 			: await layoutScraper.fetchMovie(baseRelease.url, entity, baseRelease, include, null);
 
 		const mergedRelease = {
 			...merge(baseRelease, scrapedRelease, {
 				dedupeStringsInArrayValues: true,
+				hardMergeKeys: ['actors', 'poster', 'trailer', 'teaser'],
 			}),
 			deep: !!scrapedRelease,
 			entity,
diff --git a/src/scrapers/scrapers.js b/src/scrapers/scrapers.js
index e8d85e9a..362ad3ec 100644
--- a/src/scrapers/scrapers.js
+++ b/src/scrapers/scrapers.js
@@ -57,6 +57,7 @@ const pervcity = require('./pervcity');
 const porncz = require('./porncz');
 const pornhub = require('./pornhub');
 const pascalssubsluts = require('./pascalssubsluts'); // reserved keyword
+const pierrewoodman = require('./pierrewoodman');
 const pinkyxxx = require('./pinkyxxx');
 const privateNetwork = require('./private'); // reserved keyword
 const puretaboo = require('./puretaboo');
@@ -150,6 +151,7 @@ const scrapers = {
 		pascalssubsluts,
 		perfectgonzo,
 		pervcity,
+		pierrewoodman,
 		pimpxxx: cherrypimps,
 		pinkyxxx,
 		porncz,