.forgejo/workflows/release.yml

@@ -1,28 +0,0 @@
-name: Upload release
-
-on:
-  push:
-    tags:
-      - "*"
-
-jobs:
-  build:
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: |
-          npm install --platform=win32 &&
-          apt-get update &&
-          apt-get install -y zip
-
-      - name: Build the app
-        run: npm run make -- --platform=win32
-
-      - name: Create release
-        uses: akkuman/gitea-release-action@v1
-        with:
-          token: ${{ secrets.TOKEN }}
-          files: out/make/zip/win32/x64/dsr-win32-x64-${{ github.ref_name }}.zip
-          draft: true

README.md

@@ -1,54 +1,48 @@
-# Discord Video Sharing [![status-badge](https://git.mylloon.fr/Anri/dsr/badges/workflows/release.yml/badge.svg)](https://git.mylloon.fr/Anri/dsr/actions?workflow=release.yml)
+# Discord Video Sharing
 
-Tool for sharing video to Discord.
+Helper for sharing video captured by NVidia Shadowplay in Discord.
 
-> This tool was primarily made for video captured by NVidia Shadowplay.
+## Download/Install
-
-## Download/Install/Update
 
 2 choices :
 
 - Manually head to [the release page](https://git.mylloon.fr/Anri/dsr/releases/latest).
-- Download it via PowerShell:
+- <details>
+      <summary>Download it via command lines</summary>
 
-  ```powershell
+  Copy and paste this snippet into the windows command prompt:
-  irm https://git.mylloon.fr/Anri/dsr/raw/branch/main/install.ps1 | iex
+
+  ```bash
+  PowerShell -Command "" ^
+    "$releases = 'https://git.mylloon.fr/api/v1/repos/Anri/dsr/releases/latest';" ^
+    "$link = (Invoke-WebRequest $releases | ConvertFrom-Json)[0].assets.browser_download_url;" ^
+    "$archive = 'dsr.zip';" ^
+    "$outfile = Join-Path -Path $env:TEMP -ChildPath $archive;" ^
+    "Invoke-WebRequest -Uri $link -OutFile $outfile;" ^
+    "cd $env:TEMP;" ^
+    "Expand-Archive -Path $archive -DestinationPath '%LOCALAPPDATA%\DSR' -Force;" ^
+    "Move-Item -Path '%LOCALAPPDATA%\DSR\dsr-win32-x64\*' -Destination '%LOCALAPPDATA%\DSR' -Force;" ^
+    "Remove-Item '%LOCALAPPDATA%\DSR\dsr-win32-x64';'" ^
+    "$WshShell = New-Object -comObject WScript.Shell;" ^
+    "$Shortcut = $WshShell.CreateShortcut('%APPDATA%\Microsoft\Windows\Start Menu\Programs\DSR.lnk');" ^
+    "$Shortcut.TargetPath = '%LOCALAPPDATA%\DSR\dsr.exe';" ^
+    "$Shortcut.Save();" ^
+    "REG ADD 'HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\dsr' /f /v DisplayName /t REG_SZ /d 'DSR';" ^
+    "REG ADD 'HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\dsr' /f /v InstallLocation /t REG_SZ /d '%LOCALAPPDATA%\DSR'"
   ```
 
-## Available flags
+  If you have nitro, add `/nitro` flag when running DSR.
-
+  </details>
-You can add thoses flags in the `Target` field of your Windows shortcut.
-
-|               |                                                        |
-| ------------- | ------------------------------------------------------ |
-| `/nitro`      | Increase the file limit to 500Mo                       |
-| `/nitrobasic` | Increase the file limit to 50Mo                        |
-|               |                                                        |
-| `/nvenc_h264` | Enable NVenc with H.264 encoder (NVidia GPU required)  |
-| `/nvenc_h265` | Enable NVenc with H.265 encoder (NVidia GPU required)  |
-| `/amd_h264`   | Enable AMF using DX11 with H.264 encoder (for AMD GPU) |
-| `/amd_h265`   | Enable AMF using DX11 with H.265 encoder (for AMD GPU) |
-| `/h265`       | Enable the H.265 CPU encoder (slow compression)        |
-
-> NVidia and AMD hardware accelerators support is experimental, but faster
-> than CPU counterparts.
 
 ## More info
 
 - [x] KISS interface
-  - [x] Support drag&drop into the icon
+  - [x] Support drag&drop
-- [x] Keep the video under discord limitation
+- [x] Keep the video under 25mb (discord limitation)
-  - [x] Defaults to H.264 CPU encoder
   - [x] If already under the limit, the file won't be compressed
-  - [x] NVenc support
+  - [x] Nitro suppport via `/nitro` flag
-  - [x] AMD cards acceleration support
+- [x] Merge all audio files into one track, while keeping the original ones (keeping track's title too)
-  - [x] Nitro suppport
+- [x] Support multiples files
-- [x] Merge 2 audio files into one track when recorded with system audio and microphone
-      split up, while keeping the original ones (with conveniant metadata)
-  - [x] Works also with file with only one or more than 2 audio track, by doing
-        nothing
-- [x] Support multiples files at once
-- [x] Always optimize for video streaming
 
 ## Package the app for Windows
 

install.ps1

@@ -1,51 +0,0 @@
-param (
-  [switch]$Force
-)
-
-# Enable TLSv1.2 for compatibility with older windows versions
-[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
-
-$path = "$env:LOCALAPPDATA\DSR"
-$update = Test-Path -Path $path\*
-
-# Download
-$releases = "https://git.mylloon.fr/api/v1/repos/Anri/dsr/releases/latest"
-$link = (Invoke-WebRequest $releases | ConvertFrom-Json)[0].assets.browser_download_url
-$archive = "$env:TEMP\dsr.zip"
-Invoke-WebRequest -Uri $link -OutFile $archive
-Remove-Item "$path" -Recurse -ErrorAction SilentlyContinue
-
-# Close running DSR
-Stop-Process -Name "DSR" -Force -ErrorAction SilentlyContinue
-
-# Installation
-Expand-Archive -Path $archive -DestinationPath "$path" -Force
-Move-Item -Path "$path\dsr-win32-x64\*" -Destination "$path" -Force
-Remove-Item "$path\dsr-win32-x64"
-
-# Ask user to add a shortcut to the desktop
-if (-not $update -Or $Force) {
-  # Add shortcut
-  $WshShell = New-Object -comObject WScript.Shell
-  $Shortcut = $WshShell.CreateShortcut("$env:APPDATA\Microsoft\Windows\Start Menu\Programs\DSR.lnk")
-  $Shortcut.TargetPath = "$path\dsr.exe"
-  $Shortcut.Save()
-
-  # Add new app to registry
-  REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\dsr" /f /v DisplayName /t REG_SZ /d "DSR"
-  REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\dsr" /f /v InstallLocation /t REG_SZ /d "$path"
-
-  if ($Host.UI.PromptForChoice(
-    "***********************",
-    "Add a desktop shortcut?",
-    @(
-      [System.Management.Automation.Host.ChoiceDescription]::new("&Yes", "Add a shortcut to your desktop.")
-      [System.Management.Automation.Host.ChoiceDescription]::new("&No", "Skip the shortcut creation.")
-    ), 1) -eq 0) {
-    $WshShell = New-Object -comObject WScript.Shell
-    $Desktop = [Environment]::GetFolderPath("Desktop")
-    $Shortcut = $WshShell.CreateShortcut("$Desktop\DSR.lnk")
-    $Shortcut.TargetPath = "$path\dsr.exe"
-    $Shortcut.Save()
-  }
-}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsr",
-  "version": "1.11.3",
+  "version": "1.5.1",
   "description": "Discord Video Sharing",
   "main": "./dist/main.js",
   "scripts": {
@@ -18,23 +18,20 @@
   "author": "Mylloon",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@electron-forge/maker-zip": "^7.5",
+    "@electron-forge/maker-zip": "^6.4",
     "ffmpeg-static": "^5.2",
     "ffprobe-static": "^3.1",
-    "typescript": "^5.6"
+    "typescript": "^5.2"
   },
   "devDependencies": {
-    "@electron-forge/cli": "^7.5",
+    "@electron-forge/cli": "^6.4",
     "@types/ffprobe-static": "^2.0",
-    "electron": "^33.2"
+    "electron": "^27.0"
   },
   "config": {
     "forge": {
       "packagerConfig": {
-        "icon": "./image/icon.ico",
+        "icon": "./image/icon.ico"
-        "asar": {
-          "unpack": "**/node_modules/*-static/**"
-        }
       },
       "makers": [
         {

src/main.ts

@@ -1,40 +1,25 @@
-import { app, BrowserWindow, dialog, ipcMain, Notification } from "electron";
+import { BrowserWindow, app, dialog, ipcMain } from "electron";
-import { statSync, copyFileSync } from "fs";
+import { statSync } from "fs";
 import {
   deleteFile,
   deleteTwoPassFiles,
   execute,
   getNewFilename,
   getVideoDuration,
-  getNumberOfAudioTracks,
   printAndDevTool,
-  processes,
 } from "./utils/misc";
 import path = require("path");
-
+import ffmpegPath = require("ffmpeg-static");
-import ffmpeg = require("ffmpeg-static");
-const ffmpegPath = `${ffmpeg}`.replace("app.asar", "app.asar.unpacked");
-
-let error = false;
 
 const moviesFilter = {
   name: "Videos",
   extensions: ["mp4", "mkv"],
 };
 
-const metadataAudioSize = 3;
 const metadataAudio = `-metadata:s:a:0 title="System sounds and microphone" \
                        -metadata:s:a:1 title="System sounds" \
                        -metadata:s:a:2 title="Microphone"`;
 
-const shareOpt = "-movflags +faststart";
-
-/** Register a new error  */
-const registerError = (win: BrowserWindow, err: string) => {
-  error = true;
-  printAndDevTool(win, err);
-};
-
 /** Create a new window */
 const createWindow = () => {
   const win = new BrowserWindow({
@@ -52,11 +37,6 @@ const createWindow = () => {
   return win;
 };
 
-// For notification on Windows
-if (process.platform === "win32") {
-  app.setAppUserModelId(app.name);
-}
-
 /* Ready to create the window */
 app.whenReady().then(() => {
   const win = createWindow();
@@ -71,187 +51,80 @@ app.whenReady().then(() => {
 
   /** Send confirmation to user */
   const confirmation = async (message: string) => {
-    // Send notification
-    new Notification({
-      title: "Status",
-      body: message,
-    }).show();
-
-    // Open dialog
     await dialog.showMessageBox(win, { message });
   };
 
   /** Get filename of a path */
   const getFilename = (filepath: string) => path.parse(filepath).base;
 
-  /** Merge all audios track of a video into one
+  /** Merge all audios track of a video into one */
-   *  In case video doesn't have exactly two audio streams, silently pass */
   const mergeAudio = async (file: string) => {
     const tmpFile = getNewFilename(file, "TMP_");
-    let outFile;
+    const outFile = getNewFilename(file, "(merged audio) ");
 
-    let audioTracks = getNumberOfAudioTracks(file);
+    // Merge 2 audio
+    // See: https://trac.ffmpeg.org/wiki/AudioChannelManipulation#a2stereostereo
+    await execute(
+      `"${ffmpegPath}" -y \
+       -i "${file}" \
+       -filter_complex "[0:a]amerge=inputs=2[a]" -ac 2 -map 0:v -map "[a]" \
+       -c:v copy \
+       "${tmpFile}"`
+    ).catch((e) => printAndDevTool(win, e));
 
-    switch (audioTracks.length) {
+    // Add merged audio as first position to original video and make it default
-      case 2:
+    // About disposition: https://ffmpeg.org/ffmpeg.html#Main-options
-        // Merge 2 audio
+    // Also rename all tracks accordingly to what they are
-        // See: https://trac.ffmpeg.org/wiki/AudioChannelManipulation#a2stereostereo
+    await execute(
-        await execute(
+      `"${ffmpegPath}" -y \
-          `"${ffmpegPath}" -y \
+       -i "${tmpFile}" -i "${file}" \
-           -i "${file}" \
+       -map 0 -map 1:a -c:v copy \
-           -filter_complex "[0:a]amerge=inputs=2[a]" -ac 2 -map 0:v -map "[a]" \
+       -disposition:a 0 -disposition:a:0 default \
-           -c:v copy \
+       ${metadataAudio} \
-           "${tmpFile}"`
+       "${outFile}"`
-        );
+    ).catch((e) => printAndDevTool(win, e));
 
-        outFile = getNewFilename(file, "(merged audio) ");
+    // Delete the temporary video file
-
+    deleteFile(tmpFile);
-        // Add merged audio as first position to original video and make it default
-        // About disposition: https://ffmpeg.org/ffmpeg.html#Main-options
-        // Also rename all tracks accordingly to what they are
-        await execute(
-          `"${ffmpegPath}" -y \
-         -i "${tmpFile}" -i "${file}" \
-         -map 0 -map 1:a -c:v copy \
-         -disposition:a 0 -disposition:a:0 default \
-         ${metadataAudio} \
-         "${outFile}"`
-        ).catch((e) => registerError(win, e));
-
-        // Delete the temporary video file
-        deleteFile(tmpFile);
-
-        audioTracks = getNumberOfAudioTracks(outFile);
-
-        break;
-      default:
-        // Other cases: no merge needed
-        outFile = getNewFilename(file, "(nomerge) ");
-
-        // Do a copy
-        copyFileSync(file, outFile);
-        break;
-    }
 
     const duration = getVideoDuration(outFile);
     const stats = statSync(outFile);
 
-    return {
+    return { title: outFile, size: stats.size / 1024 / 1024, duration };
-      title: outFile,
-      size: stats.size / 1024 / 1024,
-      duration,
-      audioTracks,
-    };
   };
 
-  /** Reduce size of a file
+  /* Reduce size of a file */
-   * Returns an empty string in case of failing
+  const reduceSize = async (file: string, bitrate: number) => {
-   */
+    const audioBitrate = 400; // keep some room
-  const reduceSize = async (
-    file: string,
-    bitrate: number,
-    audioTracks: number[]
-  ) => {
-    const audioBitrate = Math.ceil(
-      audioTracks.reduce((sum, current) => current + sum, 50) // initial value > 0 for extra room
-    );
     const videoBitrate = bitrate - audioBitrate;
-    let finalFile;
 
-    if (videoBitrate > 0) {
+    const finalFile = getNewFilename(file, "Compressed - ");
-      finalFile = getNewFilename(file, "Compressed - ");
 
-      // Trash the output, depends on the platform
+    // Trash the output, depends on the platform
-      const nul = process.platform === "win32" ? "NUL" : "/dev/null";
+    const nul = process.platform === "win32" ? "NUL" : "/dev/null";
 
-      // Mapping of tracks for FFMPEG, adding 1 for the video stream
+    // Compress the video
-      const mappingTracks = Array(audioTracks.length + 1)
+    // Add metadata to audio's track
-        .fill("-map 0:")
-        .map((str, index) => {
-          return str + index;
-        })
-        .join(" ");
-
-      let codec = "libx264";
-      let hwAcc = "";
-
-      const argv = process.argv;
-      if (argv.includes("/nvenc_h264")) {
-        // Use NVenc H.264
-        codec = "h264_nvenc";
-        hwAcc = "-hwaccel cuda";
-      }
-
-      if (argv.includes("/amd_h264")) {
-        // Use AMF H.264
-        codec = "h264_amf";
-        hwAcc = "-hwaccel d3d11va";
-      }
-
-      if (argv.includes("/nvenc_h265")) {
-        // Use NVenc H.265
-        codec = "hevc_nvenc";
-        hwAcc = "-hwaccel cuda";
-      }
-
-      if (argv.includes("/amd_h265")) {
-        // Use AMF H.265
-        codec = "hevc_amf";
-        hwAcc = "-hwaccel d3d11va";
-      }
-
-      if (argv.includes("/h265")) {
-        // Use H.265 encoder
-        codec = "libx265";
-      }
-
-      // Compress the video
-      // Add metadata to audio's track
-      await execute(
-        `"${ffmpegPath}" -y ${hwAcc} \
-       -i "${file}" \
-       -c:v ${codec} -b:v ${videoBitrate}k -pass 1 -an -f mp4 \
-       ${nul} \
-       && \
-       "${ffmpegPath}" -y ${hwAcc} \
-       -i "${file}" \
-       -c:v ${codec} -b:v ${videoBitrate}k -pass 2 -c:a copy \
-       ${mappingTracks} -f mp4 \
-       -profile:v main \
-       ${audioTracks.length === metadataAudioSize ? metadataAudio : ""} \
-       ${shareOpt} \
-       "${finalFile}"`
-      ).catch((e) => registerError(win, e));
-
-      // Delete the 2 pass temporary files
-      deleteTwoPassFiles(process.cwd());
-    } else {
-      finalFile = "";
-    }
-
-    // Delete the old video file
-    deleteFile(file);
-
-    return finalFile;
-  };
-
-  /** Move metadata at the begenning of the file */
-  const moveMetadata = async (file: string, nbTracks: number) => {
-    const finalFile = getNewFilename(file, "Broadcastable - ");
-
-    // Optimize for streaming
     await execute(
       `"${ffmpegPath}" -y \
        -i "${file}" \
-       -map 0 -codec copy \
+       -c:v libx264 -b:v ${videoBitrate}k -pass 1 -an -f mp4 \
-       ${shareOpt} \
+       ${nul} \
-       ${nbTracks === metadataAudioSize ? metadataAudio : ""} \
+       && \
+       "${ffmpegPath}" -y \
+       -i "${file}" \
+       -c:v libx264 -b:v ${videoBitrate}k -pass 2 -c:a copy \
+       -map 0:0 -map 0:1 -map 0:2 -map 0:3 -f mp4 \
+       ${metadataAudio} \
        "${finalFile}"`
-    ).catch((e) => registerError(win, e));
+    ).catch((e) => printAndDevTool(win, e));
 
     // Delete the old video file
     deleteFile(file);
 
+    // Delete the 2 pass temporary files
+    deleteTwoPassFiles(file);
+
     return finalFile;
   };
 
@@ -261,22 +134,9 @@ app.whenReady().then(() => {
   ipcMain.handle("getFilename", (_, filepath: string) => getFilename(filepath));
   ipcMain.handle("askFiles", () => askFiles());
   ipcMain.handle("mergeAudio", (_, file: string) => mergeAudio(file));
-  ipcMain.handle(
+  ipcMain.handle("reduceSize", (_, file: string, bitrate: number) =>
-    "reduceSize",
+    reduceSize(file, bitrate)
-    (_, file: string, bitrate: number, audioTracks: number[]) =>
-      reduceSize(file, bitrate, audioTracks)
   );
-  ipcMain.handle("moveMetadata", (_, file: string, nbTracks: number) =>
+  ipcMain.handle("exit", () => app.quit());
-    moveMetadata(file, nbTracks)
-  );
-  ipcMain.handle("exit", () => (error ? {} : app.quit()));
   ipcMain.handle("confirmation", (_, text: string) => confirmation(text));
 });
-
-app.on("window-all-closed", () => {
-  processes.forEach((process) => {
-    process.stdin.write("q");
-  });
-
-  app.quit();
-});

src/preload.ts

@@ -13,10 +13,8 @@ contextBridge.exposeInMainWorld("internals", {
     ipcRenderer.invoke("getFilename", filepath),
   askFiles: () => ipcRenderer.invoke("askFiles"),
   mergeAudio: (file: string) => ipcRenderer.invoke("mergeAudio", file),
-  reduceSize: (file: string, bitrate: number, audioTracks: number[]) =>
+  reduceSize: (file: string, bitrate: number) =>
-    ipcRenderer.invoke("reduceSize", file, bitrate, audioTracks),
+    ipcRenderer.invoke("reduceSize", file, bitrate),
-  moveMetadata: (file: string, nbTracks: number) =>
-    ipcRenderer.invoke("moveMetadata", file, nbTracks),
   exit: () => ipcRenderer.invoke("exit"),
   confirmation: (text: string) => ipcRenderer.invoke("confirmation", text),
 });

src/scripts/renderer.ts

@@ -7,18 +7,10 @@ let internals: {
   getFilename: (filepath: string) => Promise<string>;
   askFiles: () => Promise<string[] | undefined>;
   exit: () => Promise<void>;
-  mergeAudio: (filename: string) => Promise<{
+  mergeAudio: (
-    title: string;
+    filename: string
-    duration: number;
+  ) => Promise<{ title: string; duration: number; size: number }>;
-    size: number;
+  reduceSize: (file: string, bitrate: number) => Promise<string>;
-    audioTracks: number[];
-  }>;
-  reduceSize: (
-    file: string,
-    bitrate: number,
-    audioTracks: number[]
-  ) => Promise<string>;
-  moveMetadata: (file: string, nbTracks: number) => Promise<string>;
   confirmation: (text: string) => Promise<void>;
 };
 
@@ -35,9 +27,7 @@ const getFiles = async () => {
     // Exit if a file isn't supported in the list
     if (
       files.filter((file) =>
-        allowedExtensions.some((ext) =>
+        allowedExtensions.some((ext) => file.endsWith(ext))
-          file.toLowerCase().endsWith(ext.toLowerCase())
-        )
       ).length !== files.length
     ) {
       await internals.exit();
@@ -56,16 +46,13 @@ const getFiles = async () => {
 /** Returns maximum allowed size for files in MB */
 const fetchMaxSize = async () => {
   const argv = await internals.argv();
-  if (argv.includes("/nitrobasic")) {
+  if (argv.includes("/nitro")) {
-    // Nitro Basic user
-    return 50;
-  } else if (argv.includes("/nitro")) {
     // Nitro user
     return 500;
-  } else {
-    // Free user
-    return 10;
   }
+
+  // Free user
+  return 25;
 };
 
 /** Either replace the message, or add some info */
@@ -103,7 +90,6 @@ const main = async () => {
   updateMessage("Récupération des fichiers...");
   const files = await getFiles();
   let processedFiles = "";
-  let numberOfUncompressableFiles = 0;
 
   // Iterate over all the retrieved files
   for (const [idx, file] of files.entries()) {
@@ -133,43 +119,18 @@ const main = async () => {
       );
 
       // Compress the video and change the title to the new one
-      finalTitle = await internals.reduceSize(
+      finalTitle = await internals.reduceSize(newFile.title, bitrate);
-        newFile.title,
-        bitrate,
-        newFile.audioTracks
-      );
-    } else {
-      updateMessage(`\nPréparation pour le partage...`, true, Mode.Append);
-
-      // Move the metadata to make it playable before everything is downloaded
-      finalTitle = await internals.moveMetadata(
-        newFile.title,
-        newFile.audioTracks.length
-      );
     }
 
     // Append title to the list of processed files
-    if (finalTitle.length > 0) {
+    processedFiles += `\n- ${finalTitle}`;
-      processedFiles += `\n- ${finalTitle}`;
+    updateMessage(`Fichier ${counter} traités.`);
-      updateMessage(`Fichier ${counter} traités.`);
-    } else {
-      processedFiles += `\n- ${file} [incompressable]`;
-      updateMessage(`Fichier ${counter} trop large pour être compressé.`);
-      numberOfUncompressableFiles++;
-    }
-  }
-
-  let errorMessage = "";
-  if (numberOfUncompressableFiles > 0) {
-    errorMessage += `\nNombre de fichier incompressable : ${numberOfUncompressableFiles}.`;
   }
 
   // Send confirmation to the user that we're done
   await internals.confirmation(
-    `${files.length} fichiers traités : ${processedFiles}` + errorMessage
+    `${files.length} fichiers traités : ${processedFiles}`
   );
-
   await internals.exit();
 };
-
 main();

src/utils/misc.ts

@@ -1,13 +1,9 @@
+import ffprobe = require("ffprobe-static");
 import child_process = require("child_process");
 import path = require("path");
 import { BrowserWindow } from "electron";
 import { existsSync, unlink } from "fs";
 
-import ffprobe = require("ffprobe-static");
-const ffprobePath = ffprobe.path.replace("app.asar", "app.asar.unpacked");
-
-export const processes: child_process.ChildProcess[] = [];
-
 /** Create a new filename from the OG one */
 export const getNewFilename = (ogFile: string, part: string) => {
   const oldFile = path.parse(ogFile);
@@ -16,20 +12,11 @@ export const getNewFilename = (ogFile: string, part: string) => {
 
 /** Return the duration of a video in second */
 export const getVideoDuration = (file: string) => {
-  const command = `"${ffprobePath}" -v error -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 "${file}"`;
+  const command = `"${ffprobe.path}" -v error -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 "${file}"`;
   const durationString = child_process.execSync(command).toString().trim();
   return parseFloat(durationString);
 };
 
-/** Return the number of audio tracks */
-export const getNumberOfAudioTracks = (file: string): number[] => {
-  const command = `"${ffprobePath}" -v error -show_entries stream=bit_rate -select_streams a -of json "${file}"`;
-  const result = child_process.execSync(command, { encoding: "utf8" });
-  return JSON.parse(result).streams.map(
-    (v: { bit_rate: string }) => Number(v.bit_rate) / 1000
-  );
-};
-
 /** Print an error to the console and open the dev tool panel */
 export const printAndDevTool = (win: BrowserWindow, err: string) => {
   win.webContents.openDevTools();
@@ -41,18 +28,13 @@ export const execute = (
   command: string
 ): Promise<{ stdout: string; stderr: string }> => {
   return new Promise((resolve, reject) => {
-    const process = child_process.exec(command, (error, stdout, stderr) => {
+    child_process.exec(command, (error, stdout, stderr) => {
       if (error) {
         reject(error);
       } else {
         resolve({ stdout, stderr });
       }
     });
-
-    processes.push(process);
-    process.on("exit", () => {
-      processes.splice(processes.indexOf(process), 1);
-    });
   });
 };
 
@@ -65,8 +47,11 @@ export const deleteFile = (file: string) => {
   });
 };
 
-/** Delete the 2pass files generated by ffmpeg */
+/** Delete the 2pass files generated by ffmpeg, we're using
-export const deleteTwoPassFiles = (directory: string) => {
+ * the file location to know in which directory they are.
+ * We're checking first if they exists where we are looking at. */
+export const deleteTwoPassFiles = (file: string) => {
+  const directory = path.parse(file).dir;
   const logFile = path.join(directory, "ffmpeg2pass-0.log");
 
   if (existsSync(logFile)) {