refactor: remove util.promisify calls

This commit is contained in:
Barış Soner Uşaklı
2020-08-14 00:05:03 -04:00
parent 45c8de129c
commit 0189945996
18 changed files with 50 additions and 108 deletions

View File

@@ -1,7 +1,6 @@
'use strict';
const fs = require('fs');
const util = require('util');
const path = require('path');
const winston = require('winston');
@@ -12,9 +11,6 @@ const Data = module.exports;
const basePath = path.join(__dirname, '../../');
const readFileAsync = util.promisify(fs.readFile);
const statAsync = util.promisify(fs.stat);
Data.getPluginPaths = async function () {
let plugins = await db.getSortedSetRange('plugins:active', 0, -1);
plugins = plugins.filter(plugin => plugin && typeof plugin === 'string')
@@ -26,8 +22,8 @@ Data.getPluginPaths = async function () {
Data.loadPluginInfo = async function (pluginPath) {
const [packageJson, pluginJson] = await Promise.all([
readFileAsync(path.join(pluginPath, 'package.json'), 'utf8'),
readFileAsync(path.join(pluginPath, 'plugin.json'), 'utf8'),
fs.promises.readFile(path.join(pluginPath, 'package.json'), 'utf8'),
fs.promises.readFile(path.join(pluginPath, 'plugin.json'), 'utf8'),
]);
let pluginData;
@@ -96,7 +92,7 @@ Data.getStaticDirectories = async function (pluginData) {
const dirPath = path.join(pluginData.path, pluginData.staticDirs[route]);
try {
const stats = await statAsync(dirPath);
const stats = await fs.promises.stat(dirPath);
if (!stats.isDirectory()) {
winston.warn('[plugins/' + pluginData.id + '] Mapped path \'' +
route + ' => ' + dirPath + '\' is not a directory.');

View File

@@ -11,8 +11,6 @@ const util = require('util');
const user = require('../user');
const posts = require('../posts');
const readdirAsync = util.promisify(fs.readdir);
var app;
var middleware;
@@ -253,7 +251,7 @@ Plugins.normalise = async function (apiReturn) {
Plugins.nodeModulesPath = path.join(__dirname, '../../node_modules');
Plugins.showInstalled = async function () {
const dirs = await readdirAsync(Plugins.nodeModulesPath);
const dirs = await fs.promises.readdir(Plugins.nodeModulesPath);
let pluginPaths = await findNodeBBModules(dirs);
pluginPaths = pluginPaths.map(dir => path.join(Plugins.nodeModulesPath, dir));

View File

@@ -12,8 +12,6 @@ const db = require('../database');
const meta = require('../meta');
const pubsub = require('../pubsub');
const statAsync = util.promisify(fs.stat);
const supportedPackageManagerList = require('../cli/package-install').supportedPackageManager; // load config from src/cli/package-install.js
const packageManager = supportedPackageManagerList.indexOf(nconf.get('package_manager')) >= 0 ? nconf.get('package_manager') : 'npm';
let packageManagerExecutable = packageManager;
@@ -121,7 +119,7 @@ module.exports = function (Plugins) {
Plugins.isInstalled = async function (id) {
const pluginDir = path.join(__dirname, '../../node_modules', id);
try {
const stats = await statAsync(pluginDir);
const stats = await fs.promises.stat(pluginDir);
return stats.isDirectory();
} catch (err) {
return false;