From 697c6cb803aad38b40b677dad6faacd13dbc6dd9 Mon Sep 17 00:00:00 2001
From: Daniel Haller <zerotwofa@proton.me>
Date: Tue, 30 Apr 2024 18:14:44 +0200
Subject: [PATCH] fixed design and ffmpeg input for dev

---
 package.json                              |  1 +
 pages/index.vue                           |  8 +++++---
 pnpm-lock.yaml                            |  3 +++
 src/api/routes/service/service.service.ts |  2 ++
 src/api/services/audio.ts                 |  1 +
 src/api/services/ffmpeg.ts                | 10 ++++++++--
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c2cfb49..271a04b 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "@pinia/nuxt": "^0.4.11",
     "@types/express": "^4.17.21",
     "concurrently": "^8.2.2",
+    "dotenv": "^16.4.5",
     "electron": "^30.0.1",
     "electron-builder": "^24.13.3",
     "eslint": "^8.57.0",
diff --git a/pages/index.vue b/pages/index.vue
index 0696978..c1efee2 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -55,8 +55,10 @@
               <div class="text-xs uppercase">{{ p.format }}</div>
               <div class="text-xs">Dubs: {{ p.dub.map((t) => t.name).join(', ') }}</div>
               <div class="text-xs">Subs: {{ p.sub.length !== 0 ? p.sub.map((t) => t.name).join(', ') : '-' }}</div>
-              <div v-if="p.partsleft && p.status === 'downloading'" class="text-xs ml-auto">{{ p.partsdownloaded }}/{{ p.partsleft }}</div>
-              <div v-if="p.downloadspeed && p.status === 'downloading'" class="text-xs">{{ p.downloadspeed }} MB/s</div>
+              <div class="flex flex-col ml-auto gap-0.5">
+                <div v-if="p.partsleft && p.status === 'downloading'" class="text-xs ml-auto">{{ p.partsdownloaded }}/{{ p.partsleft }}</div>
+                <div v-if="p.downloadspeed && p.status === 'downloading'" class="text-xs">{{ p.downloadspeed }} MB/s</div>
+              </div>
             </div>
           </div>
         </div>
@@ -68,7 +70,7 @@
 <script lang="ts" setup>
 import type { ADNEpisode } from '~/components/ADN/Types'
 import type { CrunchyEpisode } from '~/components/Episode/Types'
-import Updater from '~/components/Updater.vue';
+import Updater from '~/components/Updater.vue'
 
 const playlist = ref<
   Array<{
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 24440ff..474f895 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -84,6 +84,9 @@ importers:
       concurrently:
         specifier: ^8.2.2
         version: 8.2.2
+      dotenv:
+        specifier: ^16.4.5
+        version: 16.4.5
       electron:
         specifier: ^30.0.1
         version: 30.0.1
diff --git a/src/api/routes/service/service.service.ts b/src/api/routes/service/service.service.ts
index a2e4d60..6168c7f 100644
--- a/src/api/routes/service/service.service.ts
+++ b/src/api/routes/service/service.service.ts
@@ -638,6 +638,7 @@ async function mergeParts(parts: { filename: string; url: string }[], downloadID
     await concatenateTSFiles(list, concatenatedFile)
 
     return new Promise((resolve, reject) => {
+      if (!ffmpegP.ffmpeg || !ffmpegP.ffprobe) return
       Ffmpeg()
         .setFfmpegPath(ffmpegP.ffmpeg)
         .setFfprobePath(ffmpegP.ffprobe)
@@ -684,6 +685,7 @@ async function mergeVideoFile(video: string, audios: Array<string>, subs: Array<
   ]
 
   return new Promise((resolve, reject) => {
+    if (!ffmpegP.ffmpeg || !ffmpegP.ffprobe) return
     var output = Ffmpeg().setFfmpegPath(ffmpegP.ffmpeg).setFfprobePath(ffmpegP.ffprobe)
     var ffindex = 1
     output.addInput(video)
diff --git a/src/api/services/audio.ts b/src/api/services/audio.ts
index aa49df1..7fec889 100644
--- a/src/api/services/audio.ts
+++ b/src/api/services/audio.ts
@@ -70,6 +70,7 @@ async function mergePartsAudio(parts: { filename: string; url: string }[], tmp:
     await concatenateTSFiles(list, concatenatedFile)
 
     return new Promise((resolve, reject) => {
+      if (!ffmpegP.ffmpeg || !ffmpegP.ffprobe) return
       Ffmpeg()
         .setFfmpegPath(ffmpegP.ffmpeg)
         .setFfprobePath(ffmpegP.ffprobe)
diff --git a/src/api/services/ffmpeg.ts b/src/api/services/ffmpeg.ts
index 8ad4d63..9d096a0 100644
--- a/src/api/services/ffmpeg.ts
+++ b/src/api/services/ffmpeg.ts
@@ -5,11 +5,17 @@ const isDev = process.env.NODE_ENV === 'development'
 const appPath = app.getAppPath()
 const resourcesPath = path.dirname(appPath)
 const ffmpegPath = path.join(resourcesPath, 'ffmpeg')
+if (isDev) {
+  require('dotenv').config()
+}
 
 export function getFFMPEGPath() {
   if (isDev) {
-    const ffmpeg = '../../../ffmpeg/ffmpeg.exe'
-    const ffprobe = '../../../ffmpeg/ffprobe.exe'
+    const ffmpeg = process.env.FFMPEG_PATH
+    const ffprobe = process.env.FFPROBE_PATH
+
+    console.log(ffmpeg)
+    console.log(ffprobe)
 
     return { ffmpeg: ffmpeg, ffprobe: ffprobe }
   } else {