Add isDone variable instead of removing operations from running operations

Author: ComputerElite

QuestAppVersionSwitcher/Assets/html/script.js

@@ -222,6 +222,7 @@ var otherPermissions = []
 function UpdateModsAndLibs() {
     fetch(`/mods/mods`).then(res => {
         res.json().then(res => {
+            res.operations = res.operations.filter(x => !x.isDone)
             operationsOngoing = res.operations.length > 0
             var mods = ``
             if(!operationsOngoing) {

QuestAppVersionSwitcher/Mods/QAVSModManager.cs

@@ -36,6 +36,7 @@ public class QAVSOperation
         public QAVSOperationType type { get; set; } = QAVSOperationType.ModInstall;
         public string name { get; set; } = "";
         public int operationId { get; set; } = 0;
+        public bool isDone { get; set; } = false;
     }
 
     public class QAVSModManager
@@ -97,7 +98,7 @@ public QueuedMod(string path, string filename, int operationId)
         public static void InstallFirstModFromQueue()
         {
             if (installingMod || installQueue.Count <= 0) return;
-            runningOperations.Remove(installQueue[0].queuedOperationId);
+            runningOperations[installQueue[0].queuedOperationId].isDone = true;
             installingMod = true;
             int operationId = operations;
             operations++;
@@ -108,7 +109,7 @@ public static void InstallFirstModFromQueue()
                 File.Move(installQueue[0].path, Path.GetDirectoryName(installQueue[0].path) + Path.DirectorySeparatorChar + installQueue[0].filename);
                 installQueue[0].path = Path.GetDirectoryName(installQueue[0].path) + Path.DirectorySeparatorChar + installQueue[0].filename;
                 CoreVars.cosmetics.InstallCosmetic(CoreService.coreVars.currentApp, Path.GetExtension(installQueue[0].filename), installQueue[0].path, true);
-                runningOperations.Remove(operationId);
+                runningOperations[operationId].isDone = true;
                 installQueue.RemoveAt(0);
                 installingMod = false;
                 InstallFirstModFromQueue();
@@ -118,10 +119,10 @@ public static void InstallFirstModFromQueue()
             {
                 IMod mod = modManager.TryParseMod(installQueue[0].path).Result;
                 mod.Install().Wait();
-                runningOperations.Remove(operationId);
+                runningOperations[operationId].isDone = true;
             } catch (Exception e)
             {
-                runningOperations.Remove(operationId);
+                runningOperations[operationId].isDone = true;
                 operationId = operations;
                 operations++;
                 runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.Error, name = "Error installing mod: " + e.Message + "\n\nTo remove this message restart QuestAppVersionSwitcher", operationId = operationId });
@@ -158,7 +159,7 @@ public static void UninstallMod(string id)
             }
 
             // {"success": true, "msg": "Success/Error: blah blah"}
-            runningOperations.Remove(operationId);
+            runningOperations[operationId].isDone = true;
         }
 
         public static void DeleteMod(string id)
@@ -175,7 +176,7 @@ public static void DeleteMod(string id)
                     break;
                 }
             }
-            runningOperations.Remove(operationId);
+            runningOperations[operationId].isDone = true;
         }
 
         public static void InstallModFromUrl(string url)
@@ -193,15 +194,15 @@ public static void InstallModFromUrl(string url)
                 //CoreService.browser.EvaluateJavascript("ShowToast('Downloaded, now installing', '#FFFFFF', '#222222')", null);
                 Thread t = new Thread(() =>
                 {
-                    runningOperations.Remove(operationId);
+                    runningOperations[operationId].isDone = true;
                     InstallMod(modPath, Path.GetFileName(modPath));
                     FileManager.DeleteFileIfExisting(modPath);
                 });
                 t.Start();
             };
             m.DownloadCanceled += manager =>
             {
-                runningOperations.Remove(operationId);
+                runningOperations[operationId].isDone = true;
             };
             m.StartDownload(url, modPath);
             QAVSWebserver.managers.Add(m);
@@ -221,10 +222,10 @@ public static void EnableMod(string id)
 					{
 						m.Install().Wait();
 						modManager.ForceSave();
-						runningOperations.Remove(operationId);
+                        runningOperations[operationId].isDone = true;
 					} catch(Exception e)
 					{
-						runningOperations.Remove(operationId);
+                        runningOperations[operationId].isDone = true;
 						operationId = operations;
 						operations++;
 						runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.Error, name = "Error enabling mod: " + e.Message + "\n\nTo remove this message restart QuestAppVersionSwitcher", operationId = operationId });
@@ -243,6 +244,12 @@ public static string GetMods()
                 operations = runningOperations.Values.ToList()
             });
         }
+        
+
+        public static string GetOperations()
+        {
+            return JsonSerializer.Serialize(runningOperations);
+        }
 
         public static byte[] GetModCover(string id)
         {

QuestAppVersionSwitcher/Mods/QPMod.cs

@@ -258,7 +258,7 @@ private async Task PrepareDependency(Dependency dependency, List<string> install
                     dependMessage += $"{installedInBranch[i]} depends on ";
                 }
                 dependMessage += dependency.Id;
-                QAVSModManager.runningOperations.Remove(operationId);
+                QAVSModManager.runningOperations[operationId].isDone = true;
                 throw new InstallationException($"Recursive dependency detected: {dependMessage}");
             }
 
@@ -274,7 +274,7 @@ private async Task PrepareDependency(Dependency dependency, List<string> install
                         Logger.Log($"Installing dependency {dependency.Id} . . .");
                         await existing.Install(installedInBranch);
                     }
-                    QAVSModManager.runningOperations.Remove(operationId);
+                    QAVSModManager.runningOperations[operationId].isDone = true;
                     return;
                 }
 
@@ -284,13 +284,13 @@ private async Task PrepareDependency(Dependency dependency, List<string> install
                 }
                 else
                 {
-                    QAVSModManager.runningOperations.Remove(operationId);
+                    QAVSModManager.runningOperations[operationId].isDone = true;
                     throw new InstallationException($"Dependency with ID {dependency.Id} is already installed but with an incorrect version ({existing.Version} does not intersect {dependency.VersionRange}). Upgrading was not possible as there was no download link provided");
                 }
             }
             else if (dependency.DownloadUrlString == null)
             {
-                QAVSModManager.runningOperations.Remove(operationId);
+                QAVSModManager.runningOperations[operationId].isDone = true;
                 throw new InstallationException($"Dependency {dependency.Id} is not installed, and the mod depending on it does not specify a download path if missing");
             }
 
@@ -304,7 +304,7 @@ private async Task PrepareDependency(Dependency dependency, List<string> install
             catch (WebException ex)
             {
                 // Print a nicer error message
-                QAVSModManager.runningOperations.Remove(operationId);
+                QAVSModManager.runningOperations[operationId].isDone = true;
                 throw new InstallationException($"Failed to download dependency from URL {dependency.DownloadIfMissing}: {ex.Message}", ex);
             }
 
@@ -318,17 +318,17 @@ private async Task PrepareDependency(Dependency dependency, List<string> install
             if (dependency.Id != installedDependency.Id)
             {
                 await _provider.DeleteMod(installedDependency);
-                QAVSModManager.runningOperations.Remove(operationId);
+                QAVSModManager.runningOperations[operationId].isDone = true;
                 throw new InstallationException($"Downloaded dependency had ID {installedDependency.Id}, whereas the dependency stated ID {dependency.Id}");
             }
 
             if (!dependency.VersionRange.IsSatisfied(installedDependency.Version))
             {
                 await _provider.DeleteMod(installedDependency);
-                QAVSModManager.runningOperations.Remove(operationId);
+                QAVSModManager.runningOperations[operationId].isDone = true;
                 throw new InstallationException($"Downloaded dependency {installedDependency.Id} v{installedDependency.Version} was not within the version range stated in the dependency info ({dependency.VersionRange})");
             }
-            QAVSModManager.runningOperations.Remove(operationId);
+            QAVSModManager.runningOperations[operationId].isDone = true;
         }
     }
 }

QuestAppVersionSwitcher/WebServer.cs

@@ -205,6 +205,11 @@ public void Start()
                 request.SendString(QAVSModManager.GetMods(), "application/json");
                 return true;
             }));
+            server.AddRoute("GET", "/mods/operations", new Func<ServerRequest, bool>(request =>
+            {
+                request.SendString(QAVSModManager.GetOperations(), "application/json");
+                return true;
+            }));
             server.AddRoute("DELETE", "/mods/operation", new Func<ServerRequest, bool>(request =>
             {
                 int operation = int.Parse(request.bodyString);