mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-10 07:55:46 +01:00
Async refactor in place (#7736)
* feat: allow both callback&and await
* feat: ignore async key
* feat: callbackify and promisify in same file
* Revert "feat: callbackify and promisify in same file"
This reverts commit cea206a9b8.
* feat: no need to store .callbackify
* feat: change getTopics to async
* feat: remove .async
* fix: byScore
* feat: rewrite topics/index and social with async/await
* fix: rewrite topics/data.js
fix issue with async.waterfall, only pass result if its not undefined
* feat: add callbackify to redis/psql
* feat: psql use await
* fix: redis 🌋
* feat: less returns
* feat: more await rewrite
* fix: redis tests
* feat: convert sortedSetAdd
rewrite psql transaction to async/await
* feat: 🐶
* feat: test
* feat: log client and query
* feat: log bind
* feat: more logs
* feat: more logs
* feat: check perform
* feat: dont callbackify transaction
* feat: remove logs
* fix: main functions
* feat: more logs
* fix: increment
* fix: rename
* feat: remove cls
* fix: remove console.log
* feat: add deprecation message to .async usage
* feat: update more dbal methods
* fix: redis :voodoo:
* feat: fix redis zrem, convert setObject
* feat: upgrade getObject methods
* fix: psql getObjectField
* fix: redis tests
* feat: getObjectKeys
* feat: getObjectValues
* feat: isObjectField
* fix: add missing return
* feat: delObjectField
* feat: incrObjectField
* fix: add missing await
* feat: remove exposed helpers
* feat: list methods
* feat: flush/empty
* feat: delete
* fix: redis delete all
* feat: get/set
* feat: incr/rename
* feat: type
* feat: expire
* feat: setAdd
* feat: setRemove
* feat: isSetMember
* feat: getSetMembers
* feat: setCount, setRemoveRandom
* feat: zcard,zcount
* feat: sortedSetRank
* feat: isSortedSetMember
* feat: zincrby
* feat: sortedSetLex
* feat: processSortedSet
* fix: add mising await
* feat: debug psql
* fix: psql test
* fix: test
* fix: another test
* fix: test fix
* fix: psql tests
* feat: remove logs
* feat: user arrow func
use builtin async promises
* feat: topic bookmarks
* feat: topic.delete
* feat: topic.restore
* feat: topics.purge
* feat: merge
* feat: suggested
* feat: topics/user.js
* feat: topics modules
* feat: topics/follow
* fix: deprecation msg
* feat: fork
* feat: topics/posts
* feat: sorted/recent
* feat: topic/teaser
* feat: topics/tools
* feat: topics/unread
* feat: add back node versions
disable deprecation notice
wrap async controllers in try/catch
* feat: use db directly
* feat: promisify in place
* fix: redis/psql
* feat: deprecation message
logs for psql
* feat: more logs
* feat: more logs
* feat: logs again
* feat: more logs
* fix: call release
* feat: restore travis, remove logs
* fix: loops
* feat: remove .async. usage
This commit is contained in:
committed by
GitHub
parent
43ce5f8af3
commit
805dcd7ca2
48
src/image.js
48
src/image.js
@@ -6,6 +6,8 @@ var path = require('path');
|
||||
var crypto = require('crypto');
|
||||
var async = require('async');
|
||||
var winston = require('winston');
|
||||
const util = require('util');
|
||||
const readFileAsync = util.promisify(fs.readFile);
|
||||
|
||||
var file = require('./file');
|
||||
var plugins = require('./plugins');
|
||||
@@ -22,43 +24,31 @@ function requireSharp() {
|
||||
return sharp;
|
||||
}
|
||||
|
||||
image.resizeImage = function (data, callback) {
|
||||
image.resizeImage = async function (data) {
|
||||
if (plugins.hasListeners('filter:image.resize')) {
|
||||
plugins.fireHook('filter:image.resize', {
|
||||
await plugins.fireHook('filter:image.resize', {
|
||||
path: data.path,
|
||||
target: data.target,
|
||||
width: data.width,
|
||||
height: data.height,
|
||||
quality: data.quality,
|
||||
}, function (err) {
|
||||
callback(err);
|
||||
});
|
||||
} else {
|
||||
var sharpImage;
|
||||
async.waterfall([
|
||||
function (next) {
|
||||
fs.readFile(data.path, next);
|
||||
},
|
||||
function (buffer, next) {
|
||||
var sharp = requireSharp();
|
||||
sharpImage = sharp(buffer, {
|
||||
failOnError: true,
|
||||
});
|
||||
sharpImage.metadata(next);
|
||||
},
|
||||
function (metadata, next) {
|
||||
sharpImage.rotate(); // auto-orients based on exif data
|
||||
sharpImage.resize(data.hasOwnProperty('width') ? data.width : null, data.hasOwnProperty('height') ? data.height : null);
|
||||
|
||||
if (data.quality && metadata.format === 'jpeg') {
|
||||
sharpImage.jpeg({ quality: data.quality });
|
||||
}
|
||||
|
||||
sharpImage.toFile(data.target || data.path, next);
|
||||
},
|
||||
], function (err) {
|
||||
callback(err);
|
||||
const sharp = requireSharp();
|
||||
const buffer = await readFileAsync(data.path);
|
||||
const sharpImage = sharp(buffer, {
|
||||
failOnError: true,
|
||||
});
|
||||
const metadata = await sharpImage.metadata();
|
||||
|
||||
sharpImage.rotate(); // auto-orients based on exif data
|
||||
sharpImage.resize(data.hasOwnProperty('width') ? data.width : null, data.hasOwnProperty('height') ? data.height : null);
|
||||
|
||||
if (data.quality && metadata.format === 'jpeg') {
|
||||
sharpImage.jpeg({ quality: data.quality });
|
||||
}
|
||||
|
||||
await sharpImage.toFile(data.target || data.path);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -189,3 +179,5 @@ image.uploadImage = function (filename, folder, image, callback) {
|
||||
},
|
||||
], callback);
|
||||
};
|
||||
|
||||
require('./promisify')(image);
|
||||
|
||||
Reference in New Issue
Block a user