Mirror/filesafe
1
0
Fork 0
mirror of https://github.com/BobbyWibowo/lolisafe.git synced 2025-01-19 09:41:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'patch-3' of https://github.com/camjac251/lolisafe into camjac251-patch-3

Browse Source
This commit is contained in:
Bobby Wibowo 2020-06-06 19:34:46 +07:00
commit 46c84db64f
No known key found for this signature in database
GPG Key ID: 51C3A1E1E22D26CF
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.sample.js
View File

@ -418,7 +418,8 @@ module.exports = {
generateThumbs: { generateThumbs: {
image: true, image: true,
video: false, video: false,
placeholder: null placeholder: null,
size: 200
}, },
/* /*

8
controllers/utilsController.js
View File

@ -28,7 +28,7 @@ const self = {
imageExts: ['.gif', '.jpeg', '.jpg', '.png', '.svg', '.tif', '.tiff', '.webp'], imageExts: ['.gif', '.jpeg', '.jpg', '.png', '.svg', '.tif', '.tiff', '.webp'],
videoExts: ['.3g2', '.3gp', '.asf', '.avchd', '.avi', '.divx', '.evo', '.flv', '.h264', '.h265', '.hevc', '.m2p', '.m2ts', '.m4v', '.mk3d', '.mkv', '.mov', '.mp4', '.mpeg', '.mpg', '.mxf', '.ogg', '.ogv', '.ps', '.qt', '.rmvb', '.ts', '.vob', '.webm', '.wmv'], videoExts: ['.3g2', '.3gp', '.asf', '.avchd', '.avi', '.divx', '.evo', '.flv', '.h264', '.h265', '.hevc', '.m2p', '.m2ts', '.m4v', '.mk3d', '.mkv', '.mov', '.mp4', '.mpeg', '.mpg', '.mxf', '.ogg', '.ogv', '.ps', '.qt', '.rmvb', '.ts', '.vob', '.webm', '.wmv'],
thumbSize: config.uploads.generateThumbs.size || 200,
ffprobe: promisify(ffmpeg.ffprobe), ffprobe: promisify(ffmpeg.ffprobe),
albumsCache: {}, albumsCache: {},
@ -219,8 +219,8 @@ self.generateThumbs = async (name, extname, force) => {
// If image extension // If image extension
if (self.imageExts.includes(extname)) { if (self.imageExts.includes(extname)) {
const resizeOptions = { const resizeOptions = {
width: 200, width: ${self.thumbSize},
height: 200, height: ${self.thumbSize},
fit: 'contain', fit: 'contain',
background: { background: {
r: 0, r: 0,
@ -270,7 +270,7 @@ self.generateThumbs = async (name, extname, force) => {
}, },
{ {
filter: 'scale', filter: 'scale',
options: '200:200:force_original_aspect_ratio=decrease' options: `${self.thumbSize}:${self.thumbSize}:force_original_aspect_ratio=decrease`
} }
]) ])
.output(thumbname) .output(thumbname)