From f6c1910be3715ca94e635a2198b6dfb273181221 Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <moonloop.adult@protonmail.com>
Date: Thu, 6 Jul 2023 00:30:04 +0200
Subject: [PATCH] Added media attempt configuration, default from 3 to 2, 1 for
 JJ scraper.

---
 config/default.js           | 1 +
 src/argv.js                 | 5 +++++
 src/media.js                | 2 +-
 src/scrapers/julesjordan.js | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/default.js b/config/default.js
index ea95d9652..01f57b726 100755
--- a/config/default.js
+++ b/config/default.js
@@ -358,6 +358,7 @@ module.exports = {
 		lazyQuality: 90,
 		trailerQuality: [480, 540, 360, 720, 960, 1080, 320, 1440, 1600, 1920, 2160, 270, 240, 180],
 		limit: 25, // max number of photos per release
+		attempts: 2,
 		fetchStreams: true,
 		streamConcurrency: 2, // max number of video streams (m3u8 etc.) to fetch and process at once
 	},
diff --git a/src/argv.js b/src/argv.js
index 78633b9b8..ff2bc4b69 100755
--- a/src/argv.js
+++ b/src/argv.js
@@ -192,6 +192,11 @@ const { argv } = yargs
 		type: 'number',
 		default: config.media.limit,
 	})
+	.option('media-attempts', {
+		describe: 'Maximum amount of retries per URL',
+		type: 'number',
+		default: config.media.attempts,
+	})
 	.option('images', {
 		describe: 'Include any photos, posters or covers',
 		type: 'boolean',
diff --git a/src/media.js b/src/media.js
index 467bec303..b3164ad5e 100755
--- a/src/media.js
+++ b/src/media.js
@@ -655,7 +655,7 @@ streamQueue.define('fetchStreamSource', async ({ source, tempFileTarget, hashStr
 });
 
 async function fetchSource(source, baseMedia) {
-	const maxAttempts = source.attempts || argv.mediaAttempts || 3;
+	const maxAttempts = source.attempts || argv.mediaAttempts;
 
 	logger.silly(`Fetching media from ${source.src}`);
 	logger.debug(`Memory usage before media fetch: ${process.memoryUsage.rss() / 1000000} MB (${source.src})`);
diff --git a/src/scrapers/julesjordan.js b/src/scrapers/julesjordan.js
index a2b80ea0a..6bef11737 100755
--- a/src/scrapers/julesjordan.js
+++ b/src/scrapers/julesjordan.js
@@ -183,7 +183,7 @@ function getPhotos(query, release, context) {
 			.flatMap((quality) => [
 				`https://thumbs.${context.entity.slug}.com/trial/content//upload/dl03/${context.entity.slug}/${path}/${quality}/${actorSlug}_${context.entity.slug}_com-${index + 1}.jpg`,
 				`https://thumbs.${context.entity.slug}.com/trial/content//upload/dl03/${context.entity.slug}/${path}/${quality}/${actorSlug}_${context.entity.slug}.com-${index + 1}.jpg`, // .com instead of _com
-			]));
+			]).map((src) => ({ src, attempts: 1 })));
 	}
 
 	return null;