From d6133fc748226406601b67bb6ee12ccddd67e4ae Mon Sep 17 00:00:00 2001 From: Bruno Date: Tue, 18 Aug 2020 10:18:20 -0300 Subject: [PATCH] promise when there's no argument --- README.md | 4 ++-- lib/downloader.js | 4 ++++ lib/downloaderPromise.js | 8 -------- scripts/download.js | 9 +++++---- 4 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 lib/downloaderPromise.js diff --git a/README.md b/README.md index 874eb23..7435d46 100644 --- a/README.md +++ b/README.md @@ -354,10 +354,10 @@ This script parses a couple of flags from `argv`: ### Update (promise version) -If you are using promises there's now a promise version. +If you are using promises there's now a promise version, if you don't pass a function as second argument: ``` js -const downloader = require('youtube-dl/lib/downloaderPromise') +const downloader = require('youtube-dl/lib/downloader') downloader('path/to-binary') .then((message) => { diff --git a/lib/downloader.js b/lib/downloader.js index 567772b..1268afa 100644 --- a/lib/downloader.js +++ b/lib/downloader.js @@ -4,6 +4,7 @@ const request = require('request') const mkdirp = require('mkdirp') const path = require('path') const fs = require('fs') +const util = require('util') const [, , ...flags] = process.argv @@ -77,6 +78,9 @@ function downloader (binDir, callback) { callback = binDir binDir = null } + else if (!callback) { + return util.promisify(downloader)(binDir) + } createBase(binDir) diff --git a/lib/downloaderPromise.js b/lib/downloaderPromise.js deleted file mode 100644 index 8b183d2..0000000 --- a/lib/downloaderPromise.js +++ /dev/null @@ -1,8 +0,0 @@ -'use strict' - -const util = require('util') -const downloader = require('./downloader') - -const downloaderPromise = util.promisify(downloader) - -module.exports = downloaderPromise diff --git a/scripts/download.js b/scripts/download.js index 71f208c..830b917 100644 --- a/scripts/download.js +++ b/scripts/download.js @@ -1,6 +1,7 @@ var downloader = require('../lib/downloader') -downloader(function error (err, done) { - if (err) return console.log(err.stack) - console.log(done) -}) +downloader().then((message) => { + console.log(message); +}).catch((err) => { + console.error(err) +});