From 97c36d11d4e52a8f33d48e382467b6c6068bb6ad Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Fri, 27 Mar 2020 01:09:09 +0100
Subject: Use a TimeSpan instead of ms and support providing a custom
 CancellationToken

---
 .../Extensions/ProcessExtensions.cs                | 23 +++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.Common/Extensions/ProcessExtensions.cs')

diff --git a/MediaBrowser.Common/Extensions/ProcessExtensions.cs b/MediaBrowser.Common/Extensions/ProcessExtensions.cs
index 9fa0efdff..938ced106 100644
--- a/MediaBrowser.Common/Extensions/ProcessExtensions.cs
+++ b/MediaBrowser.Common/Extensions/ProcessExtensions.cs
@@ -36,9 +36,23 @@ namespace MediaBrowser.Common.Extensions
         /// Asynchronously wait for the process to exit.
         /// </summary>
         /// <param name="process">The process to wait for.</param>
-        /// <param name="timeMs">A timeout, in milliseconds, after which to stop waiting for the task.</param>
+        /// <param name="timeout">The duration to wait before cancelling waiting for the task.</param>
         /// <returns>True if the task exited normally, false if the timeout elapsed before the process exited.</returns>
-        public static async Task<bool> WaitForExitAsync(this Process process, int timeMs)
+        public static async Task<bool> WaitForExitAsync(this Process process, TimeSpan timeout)
+        {
+            using (var cancelTokenSource = new CancellationTokenSource(timeout))
+            {
+                return await WaitForExitAsync(process, cancelTokenSource.Token);
+            }
+        }
+
+        /// <summary>
+        /// Asynchronously wait for the process to exit.
+        /// </summary>
+        /// <param name="process">The process to wait for.</param>
+        /// <param name="cancelToken">A <see cref="CancellationToken"/> to observe while waiting for the process to exit.</param>
+        /// <returns>True if the task exited normally, false if cancelled before the process exited.</returns>
+        public static async Task<bool> WaitForExitAsync(this Process process, CancellationToken cancelToken)
         {
             if (!process.EnableRaisingEvents)
             {
@@ -55,9 +69,8 @@ namespace MediaBrowser.Common.Extensions
                 return true;
             }
 
-            // Add an additional timeout then await
-            using (var cancelTokenSource = new CancellationTokenSource(Math.Max(0, timeMs)))
-            using (var cancelRegistration = cancelTokenSource.Token.Register(() => tcs.TrySetResult(process.HasExitedSafe())))
+            // Register with the cancellation token then await
+            using (var cancelRegistration = cancelToken.Register(() => tcs.TrySetResult(process.HasExitedSafe())))
             {
                 return await tcs.Task.ConfigureAwait(false);
             }
-- 
cgit v1.2.3