DebaucheryLibrarian/traxxx
2
1
Fork 1
Code Issues 39 Pull Requests 1 Releases Wiki Activity

Improved animated image handling.

Browse Source
This commit is contained in:
DebaucheryLibrarian
2021-02-11 01:46:11 +01:00
parent 42a2fd8800
commit a14227b588
106 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/media.js
View File

@@ -319,7 +319,7 @@ async function storeImageFile(media, hashDir, hashSubDir, filename, filedir, fil
fsPromises.mkdir(path.join(config.media.path, lazydir), { recursive: true }),
]);
const image = sharp(media.file.path);
const image = sharp(media.file.path, { pages: -1 });
const isProcessed = media.meta.subtype !== 'jpeg' || media.process;
const [info, stats] = await Promise.all([
@@ -344,10 +344,17 @@ async function storeImageFile(media, hashDir, hashSubDir, filename, filedir, fil
}
if (isProcessed) {
// convert to JPEG and write to permanent location
await image
.jpeg()
.toFile(path.join(config.media.path, filepath));
if (info.pages) {
// convert animated image to WebP and write to permanent location
await image
.webp()
.toFile(path.join(config.media.path, filepath));
} else {
// convert to JPEG and write to permanent location
await image
.jpeg()
.toFile(path.join(config.media.path, filepath));
}
}
// generate thumbnail and lazy
@@ -424,7 +431,7 @@ async function storeFile(media, options) {
}
}
if (media.meta.type === 'image' && media.meta.subtype !== 'gif') {
if (media.meta.type === 'image') {
return storeImageFile(media, hashDir, hashSubDir, filename, filedir, filepath, options);
}