From 9778c4f7ec98714a7a2ccccb93f0edd4154ef710 Mon Sep 17 00:00:00 2001 From: Flummi Date: Sun, 11 Sep 2016 22:12:03 +0200 Subject: [PATCH] thumbnailfix --- src/lib.js | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/lib.js b/src/lib.js index fd7dbf6..ac5d088 100644 --- a/src/lib.js +++ b/src/lib.js @@ -110,21 +110,29 @@ Lib.prototype.generateThumbs = () => { case "audio/mpeg": case "audio/ogg": case "image/gif": - cmd = 'ffmpeg -ss 2 -i '+e.dest+' -vframes 1 -filter "scale=-1:256,crop=128:128" '+thumbnail; + exec('ffmpegthumbnailer -i'+e.dest+' -s1024 -o'+thumbnail, (error) => { + if(error) { + Lib.prototype.log('failed thumbnail for '+e.id+' ('+e.mime+')'); + fs.copySync('./s/mp3.png', thumbnail); // copy standardthumbnail + } + else { + exec('convert '+thumbnail+' -resize "128x128^" -gravity center -crop 128x128+0+0 +repage '+thumbnail, (error) => { + if(error) + Lib.prototype.log('failed thumbnail for '+e.id+' ('+e.mime+') 2'); + else + Lib.prototype.log("generated thumbnail for "+e.id+" ("+e.mime+")"); + }); + } + }); break; case "image/png": case "image/jpeg": - cmd = 'convert '+e.dest+' -resize "200x200^" -gravity center -crop 128x128+0+0 +repage '+thumbnail; + exec('convert '+e.dest+' -resize "200x200^" -gravity center -crop 128x128+0+0 +repage '+thumbnail, (error) => { + Lib.prototype.log((error)?'failed thumbnail for '+e.id+' ('+e.mime+')':'generated thumbnail for '+e.id+' ('+e.mime+')'); + }); break; } - exec(cmd, (error) => { - if(error) { - Lib.prototype.log('failed thumbnail for '+e.id+' ('+e.mime+') '+JSON.stringify(error)); - fs.copySync('./s/mp3.png', thumbnail); // copy standardthumbnail - } - else - Lib.prototype.log("generated thumbnail for "+e.id+" ("+e.mime+")"); - }); + } }); });