Merge pull request #262 from phyzical/feature/add-logging-to-ffmpeg-l…

…oader

attempt to log the error when ffmpeg fails

lib/setup.js

@@ -9,38 +9,27 @@ import versionChecker from '../util/version-checker.js';
 import { logFailure } from '../util/log-helper.js';
 
 const ffmpegSetup = function (platform_name) {
-  switch (platform_name) {
-    case 'win32': {
-      try {
-        const ffmpeg_paths = execSync('where ffmpeg');
-        if (ffmpeg_paths.includes('Could not find file')) {
+  try {
+    switch (platform_name) {
+      case 'win32': {
+        if (execSync('where ffmpeg').includes('Could not find file')) {
           process.env.PATH = path.resolve(__dirname, 'bin;') + process.env.PATH;
         }
         break;
-      } catch (err) {
-        logFailure("Couldn't find ffmpeg. Please install https://ffmpeg.org");
       }
-      break;
-    }
-    case 'linux':
-    case 'android':
-    case 'darwin':
-      try {
-        const ffmpeg_paths = execSync('which ffmpeg');
-        if (ffmpeg_paths == null) {
-          logFailure(
-            "ERROR: Cannot find ffmpeg! Install it first, \
-           why don't you read README.md on git!"
-          );
-          process.exit(-1);
-        } else {
+      case 'linux':
+      case 'android':
+      case 'darwin':
+        if (execSync('which ffmpeg')) {
           execSync('export FFMPEG_PATH=$(which ffmpeg)');
+        } else {
+          process.exit(-1);
         }
-
         break;
-      } catch (error) {
-        logFailure("Couldn't find ffmpeg. Please install https://ffmpeg.org");
-      }
+    }
+  } catch (err) {
+    logFailure(`Couldn't find ffmpeg. Please install https://ffmpeg.org (Error:${err.message})`);
+    process.exit(-1);
   }
 };
 
@@ -289,7 +278,7 @@ export function cliInputs() {
       alias: 'oft',
       default: flagsConfig.outputFileType,
       type: 'string',
-      choices: ['mp3','flac', 'wav', 'aac'],
+      choices: ['mp3', 'flac', 'wav', 'aac'],
       helpText: [
         '--output-file-type or --oft',
         '* lets you decide what type of file to output as',

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@swapnilsoni1999/spotify-dl",
   "productName": "Spotify Downloader",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Spotify Songs, Playlist & Album Downloader",
   "main": "app.js",
   "bin": {