Compare commits

...

3 Commits

Author SHA1 Message Date
DebaucheryLibrarian 7372b560b2 1.207.0 2022-02-12 17:16:26 +01:00
DebaucheryLibrarian 9d638c685c 1.206.12 2022-02-12 17:16:23 +01:00
DebaucheryLibrarian 5da1acc38d Added media resize. 2022-02-12 17:16:20 +01:00
4 changed files with 18 additions and 10 deletions

View File

@ -320,6 +320,8 @@ module.exports = {
}, },
media: { media: {
path: './media', path: './media',
maxSize: 1000,
quality: 80,
thumbnailSize: 320, // width for 16:9 will be exactly 576px thumbnailSize: 320, // width for 16:9 will be exactly 576px
thumbnailQuality: 100, thumbnailQuality: 100,
lazySize: 90, lazySize: 90,

4
package-lock.json generated
View File

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

View File

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

View File

@ -345,12 +345,13 @@ async function writeImage(image, media, info, filepath, isProcessed) {
return; return;
} }
if (isProcessed) {
// convert to JPEG and write to permanent location
await image await image
.jpeg() .resize({
height: config.media.maxSize,
withoutEnlargement: true,
})
.jpeg({ quality: config.media.quality })
.toFile(path.join(config.media.path, filepath)); .toFile(path.join(config.media.path, filepath));
}
} }
async function writeThumbnail(image, thumbpath) { async function writeThumbnail(image, thumbpath) {
@ -416,12 +417,14 @@ async function storeImageFile(media, hashDir, hashSubDir, filename, filedir, fil
}); });
} }
await writeImage(image, media, info, filepath, isProcessed);
await Promise.all([ await Promise.all([
writeImage(image, media, info, filepath, isProcessed),
writeThumbnail(image, thumbpath), writeThumbnail(image, thumbpath),
writeLazy(image, lazypath), writeLazy(image, lazypath),
]); ]);
/*
if (isProcessed) { if (isProcessed) {
// file already stored, remove temporary file // file already stored, remove temporary file
await fsPromises.unlink(media.file.path); await fsPromises.unlink(media.file.path);
@ -429,6 +432,9 @@ async function storeImageFile(media, hashDir, hashSubDir, filename, filedir, fil
// image not processed, simply move temporary file to final location // image not processed, simply move temporary file to final location
await fsPromises.rename(media.file.path, path.join(config.media.path, filepath)); await fsPromises.rename(media.file.path, path.join(config.media.path, filepath));
} }
*/
await fsPromises.unlink(media.file.path);
if (config.s3.enabled) { if (config.s3.enabled) {
await Promise.all([ await Promise.all([