Merge pull request #67 from ShaquilleSadiq/main

README.md

@@ -45,6 +45,7 @@ Options:
 -o --output-dir <path>  path to output directory
 -n --no-get-tags        skip extracting/applying id3 tags
 -v --verify-tags        verify id3 tags fetched from itunes
+-s --silent-mode        skip console output
 -h, --help              display help for command
 ```
 

package.json

@@ -52,11 +52,11 @@
     "test:coverage": "vitest --coverage"
   },
   "dependencies": {
+    "@distube/ytdl-core": "^4.14.4",
     "axios": "^1.7.2",
     "commander": "^12.1.0",
     "ffmpeg-static": "^5.2.0",
-    "node-id3": "^0.2.6",
-    "ytdl-core": "4.11.5"
+    "node-id3": "^0.2.6"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.3.0",

src/Downloader.ts

@@ -1,9 +1,9 @@
 import os from 'os';
 import path from 'path';
 
+import ytdl from '@distube/ytdl-core';
+import type { videoInfo as VideoInfo } from '@distube/ytdl-core';
 import NodeID3 from 'node-id3';
-import ytdl from 'ytdl-core';
-import type { videoInfo as VideoInfo } from 'ytdl-core';
 
 import { FormatConverter } from './FormatConverter';
 import { SongTagsSearch } from './SongTagsSearch';
@@ -12,6 +12,7 @@ import { YtdlMp3Error, isDirectory, removeParenthesizedText } from './utils';
 export type DownloaderOptions = {
   getTags?: boolean;
   outputDir?: string;
+  silentMode?: boolean;
   verifyTags?: boolean;
 };
 
@@ -20,11 +21,13 @@ export class Downloader {
 
   getTags: boolean;
   outputDir: string;
+  silentMode: boolean;
   verifyTags: boolean;
 
-  constructor({ getTags, outputDir, verifyTags }: DownloaderOptions) {
+  constructor({ getTags, outputDir, silentMode, verifyTags }: DownloaderOptions) {
     this.outputDir = outputDir ?? Downloader.defaultDownloadsDir;
     this.getTags = Boolean(getTags);
+    this.silentMode = Boolean(silentMode);
     this.verifyTags = Boolean(verifyTags);
   }
 
@@ -42,15 +45,19 @@ export class Downloader {
     const songTagsSearch = new SongTagsSearch(videoInfo.videoDetails);
 
     const outputFile = this.getOutputFile(videoInfo.videoDetails.title);
-    const videoData = await this.downloadVideo(videoInfo);
+    const videoData = await this.downloadVideo(videoInfo).catch((error) => {
+      throw new YtdlMp3Error('Failed to download video', {
+        cause: error
+      });
+    });
 
     formatConverter.videoToAudio(videoData, outputFile);
     if (this.getTags) {
       const songTags = await songTagsSearch.search(this.verifyTags);
       NodeID3.write(songTags, outputFile);
     }
 
-    console.log(`Done! Output file: ${outputFile}`);
+    if (!this.silentMode) console.log(`Done! Output file: ${outputFile}`);
     return outputFile;
   }
 

src/SongTagsSearch.ts

@@ -1,5 +1,5 @@
+import type { MoreVideoDetails } from '@distube/ytdl-core';
 import axios, { type AxiosError } from 'axios';
-import type { MoreVideoDetails } from 'ytdl-core';
 
 import { YtdlMp3Error, removeParenthesizedText, userInput } from './utils';
 

src/__tests__/Downloader.test.ts

@@ -2,10 +2,10 @@ import fs from 'fs';
 import path from 'path';
 import { PassThrough } from 'stream';
 
+import ytdl from '@distube/ytdl-core';
 import NodeID3 from 'node-id3';
 import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 import type { Mock } from 'vitest';
-import ytdl from 'ytdl-core';
 
 import { Downloader } from '../Downloader';
 import { FormatConverter } from '../FormatConverter';

src/main.ts

@@ -14,6 +14,7 @@ export async function main() {
   program.option('-o --output-dir <path>', 'path to output directory', Downloader.defaultDownloadsDir);
   program.option('-n --no-get-tags', 'skip extracting/applying id3 tags');
   program.option('-v --verify-tags', 'verify id3 tags fetched from itunes');
+  program.option('-s --silent-mode', 'skip console output');
   program.option('--verbose', 'enable verbose mode');
   program.parse();