function processGIF (
path: string,
destination: string,
- newSize: { width: number, height: number },
- keepOriginal = false
+ newSize: { width: number, height: number }
): Promise<void> {
- return new Promise<void>(async (res, rej) => {
- if (path === destination) {
- throw new Error('FFmpeg needs an input path different that the output path.')
- }
-
- logger.debug('Processing gif %s to %s.', path, destination)
+ const command = ffmpeg(path)
+ .fps(20)
+ .size(`${newSize.width}x${newSize.height}`)
+ .output(destination)
- try {
- const command = ffmpeg(path)
- .fps(20)
- .size(`${newSize.width}x${newSize.height}`)
- .output(destination)
-
- command.on('error', (err, stdout, stderr) => {
- logger.error('Error in ffmpeg gif resizing process.', { stdout, stderr })
- return rej(err)
- })
- .on('end', async () => {
- if (keepOriginal !== true) await remove(path)
- res()
- })
- .run()
- } catch (err) {
- return rej(err)
- }
- })
+ return runCommand(command)
}
async function generateImageFromVideoFile (fromPath: string, folder: string, imageName: string, size: { width: number, height: number }) {
-import { extname } from 'path'
import { remove, rename } from 'fs-extra'
+import { extname } from 'path'
import { convertWebPToJPG, processGIF } from './ffmpeg-utils'
import { logger } from './logger'
) {
const extension = extname(path)
+ if (path === destination) {
+ throw new Error('Jimp/FFmpeg needs an input path different that the output path.')
+ }
+
+ logger.debug('Processing image %s to %s.', path, destination)
+
// Use FFmpeg to process GIF
if (extension === '.gif') {
- return processGIF(path, destination, newSize, keepOriginal)
+ await processGIF(path, destination, newSize)
+ } else {
+ await jimpProcessor(path, destination, newSize)
}
- if (path === destination) {
- throw new Error('Jimp needs an input path different that the output path.')
- }
+ if (keepOriginal !== true) await remove(path)
+}
- logger.debug('Processing image %s to %s.', path, destination)
+// ---------------------------------------------------------------------------
+export {
+ processImage
+}
+
+// ---------------------------------------------------------------------------
+
+async function jimpProcessor (path: string, destination: string, newSize: { width: number, height: number }) {
let jimpInstance: any
try {
.resize(newSize.width, newSize.height)
.quality(80)
.writeAsync(destination)
-
- if (keepOriginal !== true) await remove(path)
-}
-
-// ---------------------------------------------------------------------------
-
-export {
- processImage
}
expect(user.account.description).to.be.null
})
- it('Should be able to update my avatar', async function () {
- const fixture = 'avatar.png'
+ it('Should be able to update my avatar with a gif', async function () {
+ const fixture = 'avatar.gif'
await updateMyAvatar({
url: server.url,
const res = await getMyUserInformation(server.url, accessTokenUser)
const user = res.body
- await testImage(server.url, 'avatar-resized', user.account.avatar.path, '.png')
+ await testImage(server.url, 'avatar-resized', user.account.avatar.path, '.gif')
+ })
+
+ it('Should be able to update my avatar with a gif, and then a png', async function () {
+ for (const extension of [ '.png', '.gif' ]) {
+ const fixture = 'avatar' + extension
+
+ await updateMyAvatar({
+ url: server.url,
+ accessToken: accessTokenUser,
+ fixture
+ })
+
+ const res = await getMyUserInformation(server.url, accessTokenUser)
+ const user = res.body
+
+ await testImage(server.url, 'avatar-resized', user.account.avatar.path, extension)
+ }
})
it('Should be able to update my display name', async function () {