Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-10 16:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #6801

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-10-04 11:38:42 -04:00
parent 7bc69e9182
commit 13a1497617
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/image.js
View File

@@ -6,17 +6,20 @@ var path = require('path');
var crypto = require('crypto'); var crypto = require('crypto');
var async = require('async'); var async = require('async');
var sharp = require('sharp');
if (os.platform() === 'win32') {
// https://github.com/lovell/sharp/issues/1259
sharp.cache(false);
}
var file = require('./file'); var file = require('./file');
var plugins = require('./plugins'); var plugins = require('./plugins');
var image = module.exports; var image = module.exports;
function requireSharp() {
var sharp = require('sharp');
if (os.platform() === 'win32') {
// https://github.com/lovell/sharp/issues/1259
sharp.cache(false);
}
return sharp;
}
image.resizeImage = function (data, callback) { image.resizeImage = function (data, callback) {
if (plugins.hasListeners('filter:image.resize')) { if (plugins.hasListeners('filter:image.resize')) {
plugins.fireHook('filter:image.resize', { plugins.fireHook('filter:image.resize', {
@@ -34,6 +37,7 @@ image.resizeImage = function (data, callback) {
fs.readFile(data.path, next); fs.readFile(data.path, next);
}, },
function (buffer, next) { function (buffer, next) {
var sharp = requireSharp();
var sharpImage = sharp(buffer, { var sharpImage = sharp(buffer, {
failOnError: true, failOnError: true,
}); });
@@ -60,6 +64,7 @@ image.normalise = function (path, extension, callback) {
callback(err, path + '.png'); callback(err, path + '.png');
}); });
} else { } else {
var sharp = requireSharp();
sharp(path, { failOnError: true }).png().toFile(path + '.png', function (err) { sharp(path, { failOnError: true }).png().toFile(path + '.png', function (err) {
callback(err, path + '.png'); callback(err, path + '.png');
}); });
@@ -74,6 +79,7 @@ image.size = function (path, callback) {
callback(err, image ? { width: image.width, height: image.height } : undefined); callback(err, image ? { width: image.width, height: image.height } : undefined);
}); });
} else { } else {
var sharp = requireSharp();
sharp(path, { failOnError: true }).metadata(function (err, metadata) { sharp(path, { failOnError: true }).metadata(function (err, metadata) {
callback(err, metadata ? { width: metadata.width, height: metadata.height } : undefined); callback(err, metadata ? { width: metadata.width, height: metadata.height } : undefined);
}); });