Add running operation id to request, add delete running operation to remove errors from the list

Author: ComputerElite

QuestAppVersionSwitcher/Mods/QAVSModManager.cs

@@ -35,6 +35,7 @@ public class QAVSOperation
     {
         public QAVSOperationType type { get; set; } = QAVSOperationType.ModInstall;
         public string name { get; set; } = "";
+        public int operationId { get; set; } = 0;
     }
 
     public class QAVSModManager
@@ -100,7 +101,7 @@ public static void InstallFirstModFromQueue()
             installingMod = true;
             int operationId = operations;
             operations++;
-            runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.ModInstall, name = "Installing " + installQueue[0].filename });
+            runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.ModInstall, name = "Installing " + installQueue[0].filename, operationId = operationId});
 
             if(!SupportsFormat(Path.GetExtension(installQueue[0].filename)))
             {
@@ -123,7 +124,7 @@ public static void InstallFirstModFromQueue()
                 runningOperations.Remove(operationId);
                 operationId = operations;
                 operations++;
-                runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.Error, name = "Error installing mod: " + e.Message + "\n\nTo remove this message restart QuestAppVersionSwitcher" });
+                runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.Error, name = "Error installing mod: " + e.Message + "\n\nTo remove this message restart QuestAppVersionSwitcher", operationId = operationId });
             }
             modManager.ForceSave();
             installQueue.RemoveAt(0);
@@ -135,7 +136,7 @@ public static void InstallMod(string path, string fileName)
         {
             int operationId = operations;
             operations++;
-            runningOperations.Add(operationId, new QAVSOperation {type = QAVSOperationType.Other, name = "Mod install queued: " + fileName});
+            runningOperations.Add(operationId, new QAVSOperation {type = QAVSOperationType.Other, name = "Mod install queued: " + fileName, operationId = operationId});
             installQueue.Add(new QueuedMod(path, fileName, operationId));
             InstallFirstModFromQueue();
         }
@@ -144,7 +145,7 @@ public static void UninstallMod(string id)
         {
             int operationId = operations;
             operations++;
-            runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.ModUninstall, name = "Unnstalling " + id });
+            runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.ModUninstall, name = "Unnstalling " + id, operationId = operationId });
 
             foreach (IMod m in modManager.AllMods)
             {
@@ -164,7 +165,7 @@ public static void DeleteMod(string id)
         {
             int operationId = operations;
             operations++;
-            runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.ModDelete, name = "Deleting " + id });
+            runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.ModDelete, name = "Deleting " + id, operationId = operationId });
             foreach (IMod m in modManager.AllMods)
             {
                 if (m.Id == id)
@@ -186,7 +187,7 @@ public static void InstallModFromUrl(string url)
             DownloadManager m = new DownloadManager();
             int operationId = operations;
             operations++;
-            runningOperations.Add(operationId, new QAVSOperation {type = QAVSOperationType.ModDownload, name = "Downloading mod: " + Path.GetFileName(url.Split('?')[0])});
+            runningOperations.Add(operationId, new QAVSOperation {type = QAVSOperationType.ModDownload, name = "Downloading mod: " + Path.GetFileName(url.Split('?')[0]), operationId = operationId});
             m.DownloadFinishedEvent += (manager) =>
             {
                 //CoreService.browser.EvaluateJavascript("ShowToast('Downloaded, now installing', '#FFFFFF', '#222222')", null);
@@ -210,7 +211,7 @@ public static void EnableMod(string id)
         {
             int operationId = operations;
             operations++;
-            runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.ModInstall, name = "Installing " + id });
+            runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.ModInstall, name = "Installing " + id, operationId = operationId });
 
             foreach (IMod m in modManager.AllMods)
             {
@@ -226,7 +227,7 @@ public static void EnableMod(string id)
 						runningOperations.Remove(operationId);
 						operationId = operations;
 						operations++;
-						runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.Error, name = "Error enabling mod: " + e.Message + "\n\nTo remove this message restart QuestAppVersionSwitcher" });
+						runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.Error, name = "Error enabling mod: " + e.Message + "\n\nTo remove this message restart QuestAppVersionSwitcher", operationId = operationId });
 					}
                     break;
                 }

QuestAppVersionSwitcher/Mods/QPMod.cs

@@ -247,7 +247,7 @@ private async Task PrepareDependency(Dependency dependency, List<string> install
         {
             int operationId = QAVSModManager.operations;
             QAVSModManager.operations++;
-            QAVSModManager.runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.DependencyDownload, name = "Downloading Dependency " + dependency.Id });
+            QAVSModManager.runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.DependencyDownload, name = "Downloading Dependency " + dependency.Id, operationId = operationId });
             Logger.Log($"Preparing dependency of {dependency.Id} version {dependency.VersionRange}");
             int existingIndex = installedInBranch.FindIndex(downloadedDep => downloadedDep == dependency.Id);
             if (existingIndex != -1)

QuestAppVersionSwitcher/WebServer.cs

@@ -205,6 +205,19 @@ public void Start()
                 request.SendString(QAVSModManager.GetMods(), "application/json");
                 return true;
             }));
+            server.AddRoute("DELETE", "/mods/operation", new Func<ServerRequest, bool>(request =>
+            {
+                int operation = int.Parse(request.bodyString);
+                if (!QAVSModManager.runningOperations.ContainsKey(operation))
+                {
+                    request.SendString("A operation with the key " + operation + " does not exist", "text/plain", 400);
+                    return true;
+                }
+
+                QAVSModManager.runningOperations.Remove(operation);
+                request.SendString("Removed operation " + operation + " from running Operations", "application/json");
+                return true;
+            }));
             server.AddRoute("GET", "/patching/getpatchoptions", new Func<ServerRequest, bool>(request =>
             {
                 request.SendString(JsonSerializer.Serialize(CoreService.coreVars.patchingPermissions), "application/json");