Optimize remote image processing
This commit is contained in:
parent
374b725df5
commit
1664bc60eb
|
@ -1,10 +1,9 @@
|
||||||
import { remove, rename } from 'fs-extra'
|
import { copy, readFile, remove, rename } from 'fs-extra'
|
||||||
|
import * as Jimp from 'jimp'
|
||||||
import { extname } from 'path'
|
import { extname } from 'path'
|
||||||
import { convertWebPToJPG, processGIF } from './ffmpeg-utils'
|
import { convertWebPToJPG, processGIF } from './ffmpeg-utils'
|
||||||
import { logger } from './logger'
|
import { logger } from './logger'
|
||||||
|
|
||||||
const Jimp = require('jimp')
|
|
||||||
|
|
||||||
async function processImage (
|
async function processImage (
|
||||||
path: string,
|
path: string,
|
||||||
destination: string,
|
destination: string,
|
||||||
|
@ -23,7 +22,7 @@ async function processImage (
|
||||||
if (extension === '.gif') {
|
if (extension === '.gif') {
|
||||||
await processGIF(path, destination, newSize)
|
await processGIF(path, destination, newSize)
|
||||||
} else {
|
} else {
|
||||||
await jimpProcessor(path, destination, newSize)
|
await jimpProcessor(path, destination, newSize, extension)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (keepOriginal !== true) await remove(path)
|
if (keepOriginal !== true) await remove(path)
|
||||||
|
@ -37,11 +36,12 @@ export {
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
async function jimpProcessor (path: string, destination: string, newSize: { width: number, height: number }) {
|
async function jimpProcessor (path: string, destination: string, newSize: { width: number, height: number }, inputExt: string) {
|
||||||
let jimpInstance: any
|
let jimpInstance: Jimp
|
||||||
|
const inputBuffer = await readFile(path)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
jimpInstance = await Jimp.read(path)
|
jimpInstance = await Jimp.read(inputBuffer)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
logger.debug('Cannot read %s with jimp. Try to convert the image using ffmpeg first.', path, { err })
|
logger.debug('Cannot read %s with jimp. Try to convert the image using ffmpeg first.', path, { err })
|
||||||
|
|
||||||
|
@ -54,8 +54,34 @@ async function jimpProcessor (path: string, destination: string, newSize: { widt
|
||||||
|
|
||||||
await remove(destination)
|
await remove(destination)
|
||||||
|
|
||||||
|
// Optimization if the source file has the appropriate size
|
||||||
|
if (await skipProcessing({ jimpInstance, newSize, imageBytes: inputBuffer.byteLength, inputExt, outputExt: extname(destination) })) {
|
||||||
|
return copy(path, destination)
|
||||||
|
}
|
||||||
|
|
||||||
await jimpInstance
|
await jimpInstance
|
||||||
.resize(newSize.width, newSize.height)
|
.resize(newSize.width, newSize.height)
|
||||||
.quality(80)
|
.quality(80)
|
||||||
.writeAsync(destination)
|
.writeAsync(destination)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function skipProcessing (options: {
|
||||||
|
jimpInstance: Jimp
|
||||||
|
newSize: { width: number, height: number }
|
||||||
|
imageBytes: number
|
||||||
|
inputExt: string
|
||||||
|
outputExt: string
|
||||||
|
}) {
|
||||||
|
const { jimpInstance, newSize, imageBytes, inputExt, outputExt } = options
|
||||||
|
const { width, height } = newSize
|
||||||
|
|
||||||
|
if (jimpInstance.getWidth() > width || jimpInstance.getHeight() > height) return false
|
||||||
|
if (inputExt !== outputExt) return false
|
||||||
|
|
||||||
|
const kB = 1000
|
||||||
|
|
||||||
|
if (height >= 1000) return imageBytes <= 200 * kB
|
||||||
|
if (height >= 500) return imageBytes <= 100 * kB
|
||||||
|
|
||||||
|
return imageBytes <= 15 * kB
|
||||||
|
}
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
import chaiJsonSchema = require('chai-json-schema')
|
import { copy } from 'fs-extra'
|
||||||
import { copy, move } from 'fs-extra'
|
|
||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { ThumbnailType } from '../../shared/models/videos/thumbnail.type'
|
import { ThumbnailType } from '../../shared/models/videos/thumbnail.type'
|
||||||
import { generateImageFromVideoFile } from '../helpers/ffmpeg-utils'
|
import { generateImageFromVideoFile } from '../helpers/ffmpeg-utils'
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 16 KiB |
Binary file not shown.
After Width: | Height: | Size: 4.1 KiB |
|
@ -0,0 +1,59 @@
|
||||||
|
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
|
||||||
|
|
||||||
|
import 'mocha'
|
||||||
|
import { readFile, remove } from 'fs-extra'
|
||||||
|
import { join } from 'path'
|
||||||
|
import { processImage } from '../../../server/helpers/image-utils'
|
||||||
|
import { buildAbsoluteFixturePath, root } from '../../../shared/extra-utils'
|
||||||
|
import { expect } from 'chai'
|
||||||
|
|
||||||
|
async function checkBuffers (path1: string, path2: string, equals: boolean) {
|
||||||
|
const [ buf1, buf2 ] = await Promise.all([
|
||||||
|
readFile(path1),
|
||||||
|
readFile(path2)
|
||||||
|
])
|
||||||
|
|
||||||
|
if (equals) {
|
||||||
|
expect(buf1.equals(buf2)).to.be.true
|
||||||
|
} else {
|
||||||
|
expect(buf1.equals(buf2)).to.be.false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('Image helpers', function () {
|
||||||
|
const imageDestDir = join(root(), 'test-images')
|
||||||
|
const imageDest = join(imageDestDir, 'test.jpg')
|
||||||
|
const thumbnailSize = { width: 223, height: 122 }
|
||||||
|
|
||||||
|
it('Should skip processing if the source image is okay', async function () {
|
||||||
|
const input = buildAbsoluteFixturePath('thumbnail.jpg')
|
||||||
|
await processImage(input, imageDest, thumbnailSize, true)
|
||||||
|
|
||||||
|
await checkBuffers(input, imageDest, true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('Should not skip processing if the source image does not have the appropriate extension', async function () {
|
||||||
|
const input = buildAbsoluteFixturePath('thumbnail.png')
|
||||||
|
await processImage(input, imageDest, thumbnailSize, true)
|
||||||
|
|
||||||
|
await checkBuffers(input, imageDest, false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('Should not skip processing if the source image does not have the appropriate size', async function () {
|
||||||
|
const input = buildAbsoluteFixturePath('preview.jpg')
|
||||||
|
await processImage(input, imageDest, thumbnailSize, true)
|
||||||
|
|
||||||
|
await checkBuffers(input, imageDest, false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('Should not skip processing if the source image does not have the appropriate size', async function () {
|
||||||
|
const input = buildAbsoluteFixturePath('thumbnail-big.jpg')
|
||||||
|
await processImage(input, imageDest, thumbnailSize, true)
|
||||||
|
|
||||||
|
await checkBuffers(input, imageDest, false)
|
||||||
|
})
|
||||||
|
|
||||||
|
after(async function () {
|
||||||
|
await remove(imageDest)
|
||||||
|
})
|
||||||
|
})
|
|
@ -1,3 +1,4 @@
|
||||||
|
import './image'
|
||||||
import './core-utils'
|
import './core-utils'
|
||||||
import './comment-model'
|
import './comment-model'
|
||||||
import './request'
|
import './request'
|
||||||
|
|
Loading…
Reference in New Issue