feat: cancellable running process

Pip-Manager · Apr 11, 2024 · f3590d6 · f3590d6
1 parent 47d48cc
commit f3590d6
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 40 deletions.
diff --git a/src/PipManager/Languages/Lang.Designer.cs b/src/PipManager/Languages/Lang.Designer.cs
diff --git a/src/PipManager/Languages/Lang.resx b/src/PipManager/Languages/Lang.resx
@@ -702,8 +702,8 @@
   <data name="Action_OperationCanceled_Success" xml:space="preserve">
     <value>Action Cancelled</value>
   </data>
-  <data name="Action_OperationCanceled_AlreadyRunning" xml:space="preserve">
-    <value>Action Already Running</value>
+  <data name="Action_OperationCanceled_Failed" xml:space="preserve">
+    <value>Failed to cancel</value>
   </data>
   <data name="Action_Operation_Cancel" xml:space="preserve">
     <value>Cancel</value>

diff --git a/src/PipManager/Languages/Lang.zh-cn.resx b/src/PipManager/Languages/Lang.zh-cn.resx
@@ -702,8 +702,8 @@
   <data name="Action_OperationCanceled_Success" xml:space="preserve">
     <value>任务已取消</value>
   </data>
-  <data name="Action_OperationCanceled_AlreadyRunning" xml:space="preserve">
-    <value>任务已运行</value>
+  <data name="Action_OperationCanceled_Failed" xml:space="preserve">
+    <value>任务终止失败</value>
   </data>
   <data name="Action_Operation_Cancel" xml:space="preserve">
     <value>取消</value>

diff --git a/src/PipManager/Services/Action/ActionService.cs b/src/PipManager/Services/Action/ActionService.cs
@@ -22,15 +22,15 @@ public void AddOperation(ActionListItem actionListItem)
         ActionList.Add(actionListItem);
     }
 
-    public string TryCancelOperation(string operationId)
+    public bool TryCancelOperation(string operationId)
     {
         var targetAction = ActionList.ToList().FindIndex(action => action.OperationId == operationId);
         if (ActionList[targetAction].OperationStatus != Lang.Action_CurrentStatus_WaitingInQueue)
         {
-            return Lang.Action_OperationCanceled_AlreadyRunning;
+            return environmentService.TryKillProcess();
         }
         ActionList.Remove(ActionList[targetAction]);
-        return Lang.Action_OperationCanceled_Success;
+        return true;
     }
 
     private static void ConsoleOutputUpdater(ref bool currentActionRunning, ref ActionListItem currentAction, string? data)

diff --git a/src/PipManager/Services/Action/IActionService.cs b/src/PipManager/Services/Action/IActionService.cs
@@ -11,7 +11,7 @@ public interface IActionService
 
     public void AddOperation(ActionListItem actionListItem);
 
-    public string? TryCancelOperation(string operationId);
+    public bool TryCancelOperation(string operationId);
 
     public void Runner();
 }
diff --git a/src/PipManager/Services/Environment/EnvironmentService.cs b/src/PipManager/Services/Environment/EnvironmentService.cs
@@ -252,6 +252,48 @@ public async Task<GetVersionsResponse> GetVersions(string packageName)
             return new GetVersionsResponse { Status = 1, Versions = [] };
         }
     }
+
+    private Process? BasicCommandProcess { get; set; }
+
+    public bool TryKillProcess()
+    {
+        if (BasicCommandProcess is null) return false;
+        try
+        {
+            BasicCommandProcess.Kill();
+            return true;
+        }
+        catch (Exception)
+        {
+            return false;
+        }
+    }
+
+    private ActionResponse RaiseProcess(string arguments, DataReceivedEventHandler consoleOutputCallback,
+        string[]? extraParameters = null)
+    {
+        string? extra = extraParameters != null ? string.Join(" ", extraParameters) : null;
+        BasicCommandProcess = new Process
+        {
+            StartInfo = new ProcessStartInfo
+            {
+                FileName = configurationService.AppConfig.CurrentEnvironment!.PythonPath,
+                Arguments = $"{arguments} {extra}",
+                UseShellExecute = false,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                CreateNoWindow = true
+            }
+        };
+        BasicCommandProcess.OutputDataReceived += consoleOutputCallback;
+        BasicCommandProcess.Start();
+        BasicCommandProcess.BeginOutputReadLine();
+        var error = BasicCommandProcess.StandardError.ReadToEnd();
+        BasicCommandProcess.WaitForExit();
+        BasicCommandProcess.Close();
+        BasicCommandProcess.Dispose();
+        return new ActionResponse { Success = string.IsNullOrEmpty(error), Exception = ExceptionType.Process_Error, Message = error };
+    }
 
     #region Basic Command
 
@@ -283,32 +325,6 @@ public ActionResponse Uninstall(string packageName, DataReceivedEventHandler con
 
     #endregion
 
-    private ActionResponse RaiseProcess(string arguments, DataReceivedEventHandler consoleOutputCallback,
-        string[]? extraParameters = null)
-    {
-        string? extra = extraParameters != null ? string.Join(" ", extraParameters) : null;
-        var process = new Process
-        {
-            StartInfo = new ProcessStartInfo
-            {
-                FileName = configurationService.AppConfig.CurrentEnvironment!.PythonPath,
-                Arguments = $"{arguments} {extra}",
-                UseShellExecute = false,
-                RedirectStandardOutput = true,
-                RedirectStandardError = true,
-                CreateNoWindow = true
-            }
-        };
-        process.OutputDataReceived += consoleOutputCallback;
-        process.Start();
-        process.BeginOutputReadLine();
-        var error = process.StandardError.ReadToEnd();
-        process.WaitForExit();
-        process.Close();
-        process.Dispose();
-        return new ActionResponse { Success = string.IsNullOrEmpty(error), Exception = ExceptionType.Process_Error, Message = error };
-    }
-
     #region Package Version Validation
 
     [GeneratedRegex("[-_.]+", RegexOptions.IgnoreCase)]

diff --git a/src/PipManager/Services/Environment/IEnvironmentService.cs b/src/PipManager/Services/Environment/IEnvironmentService.cs
@@ -16,6 +16,7 @@ public interface IEnvironmentService
     public Task<List<PackageItem>?> GetLibraries();
 
     public Task<GetVersionsResponse> GetVersions(string packageName);
+    public bool TryKillProcess();
 
     public ActionResponse Install(string packageName, DataReceivedEventHandler consoleOutputCallback, string[]? extraParameters = null);
 

diff --git a/src/PipManager/ViewModels/Pages/Action/ActionViewModel.cs b/src/PipManager/ViewModels/Pages/Action/ActionViewModel.cs
@@ -59,10 +59,9 @@ private void CancelAction(string? operationId)
             return;
         }
 
-        var result = _actionService.TryCancelOperation(operationId);
-        if(result == Lang.Action_OperationCanceled_AlreadyRunning)
+        if(!_actionService.TryCancelOperation(operationId))
         {
-            _toastService.Error(Lang.Action_OperationCanceled_AlreadyRunning);
+            _toastService.Error(Lang.Action_OperationCanceled_Failed);
             Log.Warning("[Action] Operation cancellation failed (already running): {OperationId}", operationId);
         }
         else