Compare commits

...

2 Commits

Author SHA1 Message Date
DebaucheryLibrarian 717f07a09a 1.228.24 2023-07-06 00:30:06 +02:00
DebaucheryLibrarian f6c1910be3 Added media attempt configuration, default from 3 to 2, 1 for JJ scraper. 2023-07-06 00:30:04 +02:00
6 changed files with 11 additions and 5 deletions

View File

@ -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
},

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "traxxx",
"version": "1.228.23",
"version": "1.228.24",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "traxxx",
"version": "1.228.23",
"version": "1.228.24",
"license": "ISC",
"dependencies": {
"@casl/ability": "^5.2.2",

View File

@ -1,6 +1,6 @@
{
"name": "traxxx",
"version": "1.228.23",
"version": "1.228.24",
"description": "All the latest porn releases in one place",
"main": "src/app.js",
"scripts": {

View File

@ -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',

View File

@ -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})`);

View File

@ -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;