From 01ebd56caf8068f9781060b6ea0d35fdf51d9423 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Thu, 23 Jan 2025 16:18:52 +0200
Subject: [PATCH] Show installation progress in the DownloadMonitor correclty

---
 src/pages/DownloadMonitor.vue | 46 +++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/pages/DownloadMonitor.vue b/src/pages/DownloadMonitor.vue
index 491eb8889..52c9ffdf5 100644
--- a/src/pages/DownloadMonitor.vue
+++ b/src/pages/DownloadMonitor.vue
@@ -19,19 +19,39 @@
                         <div class="border-at-bottom pad pad--sides">
                             <div class="card is-shadowless">
                                 <p><strong>{{ downloadObject.initialMods.join(", ") }}</strong></p>
-                                <p v-if="downloadObject.failed">Downloading failed</p>
-                                <p v-if="downloadObject.progress < 100 && !downloadObject.failed">Downloading: {{ downloadObject.modName }}</p>
-                                <p v-if="!downloadObject.failed">{{Math.min(Math.floor(downloadObject.progress), 100)}}% complete</p>
-                                <Progress v-if="!downloadObject.failed"
-                                    :max='100'
-                                    :value='downloadObject.progress'
-                                    :className="['is-info']"
-                                />
-                                <Progress v-else-if="downloadObject.failed"
-                                    :max='100'
-                                    :value='100'
-                                    :className="['is-danger']"
-                                />
+
+                                <div v-if="!downloadObject.failed && downloadObject.downloadProgress < 100">
+                                    <p>Downloading: {{ downloadObject.modName }}</p>
+                                    <p>{{Math.min(Math.floor(downloadObject.downloadProgress), 100)}}% complete</p>
+                                    <Progress
+                                        :max='100'
+                                        :value='downloadObject.downloadProgress'
+                                        :className="['is-info']"
+                                    />
+                                </div>
+
+                                <div v-else-if="!downloadObject.failed && downloadObject.installationProgress < 100">
+                                    <p v-if="downloadObject.installationProgress < 100">Installing: {{ downloadObject.modName }}</p>
+                                    <p>{{Math.min(Math.floor(downloadObject.installationProgress), 100)}}% complete</p>
+                                    <Progress
+                                        :max='100'
+                                        :value='downloadObject.installationProgress'
+                                        :className="['is-info']"
+                                    />
+                                </div>
+
+                                <div v-else-if="downloadObject.failed">
+                                    <p>{{downloadObject.failed ? "Download failed" : `${Math.min(Math.floor(downloadObject.installationProgress), 100)}% complete`}}</p>
+                                    <Progress
+                                        :max='100'
+                                        :value='100'
+                                        :className="['is-danger']"
+                                    />
+                                </div>
+
+                                <div v-else>
+                                    <p>Status unknown</p>
+                                </div>
                             </div>
                         </div>
                     </div>