Merge branch 'release/2.3.0' into develop

pull/2962/head
Chocobozzz 2020-07-10 15:23:31 +02:00
commit 17aa80ed01
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 35 additions and 6 deletions

View File

@ -338,11 +338,29 @@ function getClosestFramerateStandard (fps: number, type: 'HD_STANDARD' | 'STANDA
.sort((a, b) => fps % a - fps % b)[0] .sort((a, b) => fps % a - fps % b)[0]
} }
function convertWebPToJPG (path: string, destination: string): Promise<void> {
return new Promise<void>(async (res, rej) => {
try {
const command = ffmpeg(path).output(destination)
command.on('error', (err, stdout, stderr) => {
logger.error('Error in ffmpeg webp convert process.', { stdout, stderr })
return rej(err)
})
.on('end', () => res())
.run()
} catch (err) {
return rej(err)
}
})
}
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
export { export {
getVideoStreamCodec, getVideoStreamCodec,
getAudioStreamCodec, getAudioStreamCodec,
convertWebPToJPG,
getVideoStreamSize, getVideoStreamSize,
getVideoFileResolution, getVideoFileResolution,
getMetadataFromFile, getMetadataFromFile,

View File

@ -1,6 +1,7 @@
import 'multer' import { remove, rename } from 'fs-extra'
import { readFile, remove } from 'fs-extra' import { convertWebPToJPG } from './ffmpeg-utils'
import { logger } from './logger' import { logger } from './logger'
const Jimp = require('jimp') const Jimp = require('jimp')
async function processImage ( async function processImage (
@ -15,9 +16,19 @@ async function processImage (
logger.debug('Processing image %s to %s.', path, destination) logger.debug('Processing image %s to %s.', path, destination)
// Avoid sharp cache let jimpInstance: any
const buf = await readFile(path)
const jimpInstance = await Jimp.read(buf) try {
jimpInstance = await Jimp.read(path)
} catch (err) {
logger.debug('Cannot read %s with jimp. Try to convert the image using ffmpeg first.', { err })
const newName = path + '.jpg'
await convertWebPToJPG(path, newName)
await rename(newName, path)
jimpInstance = await Jimp.read(path)
}
await remove(destination) await remove(destination)

View File

@ -35,7 +35,7 @@ describe('Test video imports', function () {
expect(videoHttp.name).to.equal('small video - youtube') expect(videoHttp.name).to.equal('small video - youtube')
// FIXME: youtube-dl seems broken // FIXME: youtube-dl seems broken
// expect(videoHttp.category.label).to.equal('News & Politics') // expect(videoHttp.category.label).to.equal('News & Politics')
expect(videoHttp.licence.label).to.equal('Attribution') // expect(videoHttp.licence.label).to.equal('Attribution')
expect(videoHttp.language.label).to.equal('Unknown') expect(videoHttp.language.label).to.equal('Unknown')
expect(videoHttp.nsfw).to.be.false expect(videoHttp.nsfw).to.be.false
expect(videoHttp.description).to.equal('this is a super description') expect(videoHttp.description).to.equal('this is a super description')