From d480efb53b1f8d19da6c75ca671ea1a5fe190579 Mon Sep 17 00:00:00 2001 From: Kiko Beats Date: Mon, 18 Dec 2023 12:58:37 +0100 Subject: [PATCH] refactor(media-provider): remove unnecessary dependency --- packages/metascraper-media-provider/package.json | 1 - .../src/get-media/provider/generic.js | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/metascraper-media-provider/package.json b/packages/metascraper-media-provider/package.json index 737f731e5..60792a15f 100644 --- a/packages/metascraper-media-provider/package.json +++ b/packages/metascraper-media-provider/package.json @@ -29,7 +29,6 @@ "debug-logfmt": "~1.0.4", "got": "~11.8.6", "lodash": "~4.17.21", - "p-do-whilst": "~1.1.0", "p-reflect": "~2.1.0", "p-retry": "~4.6.1", "p-timeout": "~4.1.0", diff --git a/packages/metascraper-media-provider/src/get-media/provider/generic.js b/packages/metascraper-media-provider/src/get-media/provider/generic.js index bc90e9bae..99a2f39fc 100644 --- a/packages/metascraper-media-provider/src/get-media/provider/generic.js +++ b/packages/metascraper-media-provider/src/get-media/provider/generic.js @@ -6,7 +6,6 @@ const debug = require('debug-logfmt')( const { serializeError } = require('serialize-error') const youtubedl = require('youtube-dl-exec') const { get, constant } = require('lodash') -const pDoWhilst = require('p-do-whilst') const pTimeout = require('p-timeout') const RE_UNSUPORTED_URL = /Unsupported URL/ @@ -53,16 +52,19 @@ module.exports = ({ const userAgent = get(gotOpts, 'headers.user-agent') const task = async () => { - await pDoWhilst(async () => { + do { try { const proxy = getProxy({ url, retryCount: retryCount++ }) const flags = getFlags({ url, proxy, userAgent, cacheDir }) data = await youtubedl(url, flags, { timeout, ...props }) } catch (error) { - if (condition()) { debug('getInfo:error', { retryCount }, serializeError(error)) } + if (condition()) { + debug('getInfo:error', { retryCount }, serializeError(error)) + } isSupportedURL = !RE_UNSUPORTED_URL.test(error.stderr) + console.log('catch', { isSupportedURL }) } - }, condition) + } while (condition()) return data }