commands/utility/download.js

@@ -129,13 +129,13 @@ async function download(url, interaction, originalInteraction) {
 	utils.downloadVideo(url, interaction.id, format)
 		.then(async () => {
 			const file = fs.readdirSync(os.tmpdir()).filter(fn => fn.startsWith(interaction.id));
-			let output = `${os.tmpdir()}/${file}`;
+			const output = `${os.tmpdir()}/${file}`;
 
 			const fileStat = fs.statSync(output);
 			const fileSize = fileStat.size / 1000000.0;
 			const compressInteraction = originalInteraction ? originalInteraction : interaction;
 			if (compressInteraction.doCompress) {
-				const presets = [ 'Social 8 MB 3 Minutes 360p30', 'Social 50 MB 10 Minutes 480p30', 'Social 50 MB 5 Minutes 720p30', 'Social 100 MB 5 Minutes 1080p30' ];
+				const presets = [ 'Discord Tiny 5 Minutes 240p30', 'Discord Small 2 Minutes 360p30', 'Discord Nitro Small 10-20 Minutes 480p30', 'Discord Nitro Medium 5-10 Minutes 720p30', 'Discord Nitro Large 3-6 Minutes 1080p30' ];
 				const options = [];
 
 				presets.forEach(p => {
@@ -167,17 +167,6 @@ async function download(url, interaction, originalInteraction) {
 				return;
 			}
 
-			// If the video format is not one compatible with Discord, reencode it.
-			const bannedFormats = ['hevc'];
-			const codec = await utils.getVideoCodec(output);
-
-			if (bannedFormats.includes(codec)) {
-				console.log('Reencoding video');
-				const oldOutput = output;
-				output = `${os.tmpdir()}/264${file}`;
-				await utils.ffmpeg(`-i ${oldOutput} -vcodec libx264 -acodec aac ${output}`);
-			}
-
 			if (fileSize > 100) {
 				await interaction.deleteReply();
 				await interaction.followUp('Uh oh! The video you tried to download is too big!', { ephemeral: true });
@@ -205,8 +194,6 @@ async function download(url, interaction, originalInteraction) {
 
 async function compress(input, interaction, embed) {
 	const output = `compressed${input}.mp4`;
-	// Delete the file as it apparently don't overwrite?
-	fs.rmSync(output);
 	utils.compressVideo(`${os.tmpdir()}/${input}`, output, interaction.values[0])
 		.then(async () => {
 			const fileStat = fs.statSync(`${os.tmpdir()}/${output}`);

prereq.cjs

@@ -0,0 +1,29 @@
+const fs = require('node:fs');
+const https = require('node:https');
+
+console.log('Downloading latest version of yt-dlp');
+
+const downloadUrl = 'https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp';
+download(downloadUrl);
+
+function download(url) {
+	https.get(url, (res) => {
+		if (res.statusCode === 301 || res.statusCode === 302) {
+			console.log(`yt-dlp download url: ${res.headers.location}`);
+			return download(res.headers.location);
+		}
+
+		const path = './bin/yt-dlp';
+		const filePath = fs.createWriteStream(path);
+		res.pipe(filePath);
+		filePath.on('finish', () => {
+			filePath.close();
+			fs.chmodSync('./bin/yt-dlp', '755');
+			console.log('yt-dlp download finished.');
+		});
+		filePath.on('error', (err) => {
+			filePath.close();
+			console.error(err.message);
+		});
+	});
+}

readme.md

@@ -11,8 +11,8 @@ These instructions will get you a copy of the project up and running on your loc
 You need to install the following
 
 
-* ffmpeg (Optional but very recommanded: for yt-dlp to merge video/audio formats and Handbrake to compress videos.)
-* yt-dlp ([a file can download it for you](scripts/updateytdlp.js))
+* ffmpeg (Optional but very recommanded: for yt-dlp to merge video/audio formats)
+* yt-dlp ([a file can download it for you](prereq.cjs))
 * HandBrakeCLI (For [download](commands/utility/download.js))
 * gifsicle (For [vid2gif](commands/utility/vid2gif.js))
 * gifki (For [vid2gif](commands/utility/vid2gif.js))

scripts/downloadutils.js

@@ -1,34 +0,0 @@
-import fs from 'node:fs';
-import https from 'node:https';
-
-export default {
-	download,
-};
-
-async function download(url, output) {
-	return new Promise((resolve, reject) => {
-		https.get(url, (res) => {
-			if (res.statusCode === 301 || res.statusCode === 302) {
-				console.log(`${output} download url: ${res.headers.location}`);
-				return download(res.headers.location, output);
-			}
-
-			const path = output;
-			const tmpPath = `${output}.new`;
-
-			const filePath = fs.createWriteStream(tmpPath);
-			res.pipe(filePath);
-			filePath.on('finish', () => {
-				filePath.close();
-				fs.renameSync(tmpPath, path);
-				fs.chmodSync(path, '755');
-				console.log(`${url} download finished.`);
-				resolve(true);
-			});
-			filePath.on('error', (err) => {
-				filePath.close();
-				reject(err);
-			});
-		});
-	});
-}

scripts/updateytdlp.js

@@ -1,4 +1,5 @@
-import utils from './downloadutils.js';
+import fs from 'node:fs';
+import https from 'node:https';
 
 if (process.platform !== 'linux' && process.argv[2] !== '-f') {
 	console.error('This script only download the linux version of yt-dlp. If you want to download anyway try again with -f');
@@ -10,4 +11,31 @@ else if (process.platform !== 'linux' && process.argv[2] === '-f') {
 
 const downloadUrl = 'https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp';
 
-utils.download(downloadUrl, './bin/yt-dlp');
+download(downloadUrl);
+
+async function download(url) {
+	return new Promise((resolve, reject) => {
+		https.get(url, (res) => {
+			if (res.statusCode === 301 || res.statusCode === 302) {
+				console.log(`yt-dlp download url: ${res.headers.location}`);
+				return download(res.headers.location);
+			}
+
+			const tmpPath = './bin/yt-dlp.new';
+			const path = './bin/yt-dlp';
+			const filePath = fs.createWriteStream(tmpPath);
+			res.pipe(filePath);
+			filePath.on('finish', () => {
+				filePath.close();
+				fs.renameSync(tmpPath, path);
+				fs.chmodSync('./bin/yt-dlp', '755');
+				console.log('yt-dlp download finished.');
+				resolve(true);
+			});
+			filePath.on('error', (err) => {
+				filePath.close();
+				reject(err);
+			});
+		});
+	});
+}

utils/videos.js

@@ -8,7 +8,6 @@ export default {
 	ffmpeg,
 	stringIsAValidurl,
 	compressVideo,
-	getVideoCodec,
 };
 async function downloadVideo(urlArg, output, format = 'bestvideo*+bestaudio/best') {
 	await new Promise((resolve, reject) => {
@@ -78,16 +77,3 @@ async function compressVideo(input, output, preset) {
 		});
 	});
 }
-async function getVideoCodec(input) {
-	return await new Promise((resolve, reject) => {
-		exec(`ffprobe -v error -select_streams v:0 -show_entries stream=codec_name -of default=noprint_wrappers=1:nokey=1 ${input}`, (err, stdout, stderr) => {
-			if (err) {
-				reject(stderr);
-			}
-			if (stderr) {
-				console.error(stderr);
-			}
-			resolve(stdout.trim());
-		});
-	});
-}