add Kill function to Operation

Author: zilch

Editor/EditorShell.cs

@@ -117,7 +117,13 @@ public static Operation Execute(string cmd,Options options = null){
                     start.RedirectStandardInput = true;
                     start.StandardOutputEncoding = options.encoding;
                     start.StandardErrorEncoding = options.encoding;
+
+                    if(operation.isKillRequested){
+                        return;
+                    }
+
                     p = Process.Start(start);
+                    operation.BindProcess(p);
 
                     p.ErrorDataReceived += delegate(object sender, DataReceivedEventArgs e) {
                         UnityEngine.Debug.LogError(e.Data);
@@ -135,12 +141,11 @@ public static Operation Execute(string cmd,Options options = null){
                             break;
                         }
                         line = line.Replace("\\","/");
-                            
                         Enqueue(delegate() {
                             operation.FeedLog(LogType.Log,line);
                         });
-
                     }while(true);
+
                     while(true){
                         string error = p.StandardError.ReadLine();
                         if(string.IsNullOrEmpty(error)){
@@ -179,6 +184,15 @@ public class Options{
         public class Operation{
             public event UnityAction<LogType,string> onLog;
             public event UnityAction<int> onExit;
+
+            private Process _process;
+
+            private bool _killRequested = false;
+
+            internal void BindProcess(Process process){
+                _process = process;
+            }
+
             internal void FeedLog(LogType logType,string log){
                 if(onLog != null){
                     onLog(logType,log);
@@ -187,6 +201,26 @@ internal void FeedLog(LogType logType,string log){
                     this.hasError = true;
                 }
             }
+
+            public bool isKillRequested{
+                get{
+                    return _killRequested;
+                }
+            }
+
+            public void Kill(){
+                if(_killRequested){
+                    return;
+                }
+                _killRequested = true;
+                if(_process != null){
+                    _process.Kill();
+                    _process = null;
+                }else{
+                    FireDone(137);
+                }
+            }
+
             public bool hasError{
                 get;private set;
             }

Tests/EditorShellTests.cs

@@ -40,6 +40,26 @@ public IEnumerator ExitWithCode1Async(){
             Assert.True(task.Result == 1);
         }
 
+        [UnityTest]
+        public IEnumerator KillAsyncOperation(){
+            var operation = EditorShell.Execute("sleep 5",new EditorShell.Options());
+            KillAfter1Second(operation);
+            var task = GetOperationTask(operation);
+            yield return new TaskYieldable<int>(task);
+            Debug.Log("exit with code = " + task.Result);
+            Assert.True(task.Result == 137);
+        }
+
+        private async void KillAfter1Second(EditorShell.Operation operation){
+            await Task.Delay(1000);
+            operation.Kill();
+        }
+
+        private async Task<int> GetOperationTask(EditorShell.Operation operation){
+            int code = await operation; 
+            return code;
+        }
+
         private async Task<int> ExecuteShellAsync(string cmd){
             var task = EditorShell.Execute(cmd,new EditorShell.Options());
             int code = await task;