Merge pull request #7 from thoemmi/start-async-with-return-type

adds StartAsync with return type
mayuki · Nov 10, 2020 · 5b4f65d · 5b4f65d
2 parents 059dae1 + a8c2f54
commit 5b4f65d
Showing 1 changed file with 33 additions and 1 deletion.
diff --git a/Kurukuru/Spinner.cs b/Kurukuru/Spinner.cs
@@ -6,7 +6,7 @@ namespace Kurukuru
 {
     public class Spinner : IDisposable
     {
-        private CancellationTokenSource _cancellationTokenSource;
+        private readonly CancellationTokenSource _cancellationTokenSource;
         private Task _task;
         private Pattern _pattern;
         private Pattern _fallbackPattern;
@@ -198,5 +198,37 @@ public static async Task StartAsync(string text, Func<Spinner, Task> action, Pat
                 }
             }
         }
+
+        public static Task<TResult> StartAsync<TResult>(string text, Func<Task<TResult>> action, Pattern pattern = null, Pattern fallbackPattern = null)
+        {
+            return StartAsync(text, _ => action(), pattern, fallbackPattern);
+        }
+
+        public static async Task<TResult> StartAsync<TResult>(string text, Func<Spinner, Task<TResult>> action, Pattern pattern = null, Pattern fallbackPattern = null)
+        {
+            using (var spinner = new Spinner(text, pattern, fallbackPattern: fallbackPattern))
+            {
+                spinner.Start();
+
+                try
+                {
+                    var result = await action(spinner);
+                    if (!spinner.Stopped)
+                    {
+                        spinner.Succeed();
+                    }
+
+                    return result;
+                }
+                catch
+                {
+                    if (!spinner.Stopped)
+                    {
+                        spinner.Fail();
+                    }
+                    throw;
+                }
+            }
+        }
     }
 }