Merge pull request #441 from mayeaux/yt-dlp

use yt-dlp if its installed

Author: mayeaux

lib/uploading/importer.js

@@ -5,7 +5,7 @@ const webp = require('webp-converter');
 const youtubedl = require('youtube-dl');
 const spawn = require('child_process').spawn;
 const mongoose = require('mongoose');
-
+const which = require('which')
 
 const redisClient = require('../../config/redis');
 
@@ -43,7 +43,11 @@ const ffmpegPath = require('@ffmpeg-installer/ffmpeg').path;
 
 console.log(`ffmpeg path: ${ffmpegPath}`);
 
-const youtubeBinaryFilePath = youtubedl.getYtdlBinary();
+let youtubeBinaryFilePath = youtubedl.getYtdlBinary();
+const ytdlpPath = which.sync('yt-dlp', {nothrow: true})
+if(ytdlpPath){
+  youtubeBinaryFilePath = ytdlpPath
+}
 
 console.log(`youtube-dl binary path: ${youtubeBinaryFilePath}`);
 

package-lock.json

@@ -127,6 +127,7 @@
     "web-push": "^3.4.4",
     "webhook-discord": "^3.5.1",
     "webp-converter": "^2.3.0",
+    "which": "^2.0.2",
     "winston": "^3.2.1",
     "ws": "^3.3.3",
     "youtube-dl": "github:mayeaux/workingyoutubedl",