Fix service

Author: NeoCoderMatrix86

AudioCuesheetEditor.Tests/Services/UI/ApplicationOptionsTimeSpanParserTests.cs

@@ -43,7 +43,6 @@ public async Task TimespanTextChanged_ValidInput_SetsPropertyCorrectly()
                 .Setup(p => p.GetOptionsAsync<ApplicationOptions>())
                 .ReturnsAsync(options);
             var parser = new ApplicationOptionsTimeSpanParser(mockOptionsProvider.Object);
-            await Task.Delay(50);
             var track = new Track();
             // Act
             await parser.TimespanTextChanged(track, x => x.Begin, "92:12");
@@ -66,7 +65,6 @@ public async Task TimespanTextChanged_InvalidInput_SetsNull()
                 .Setup(p => p.GetOptionsAsync<ApplicationOptions>())
                 .ReturnsAsync(options);
             var parser = new ApplicationOptionsTimeSpanParser(mockOptionsProvider.Object);
-            await Task.Delay(50);
             var track = new Track();
             // Act
             await parser.TimespanTextChanged(track, x => x.End, "not a time");
@@ -75,7 +73,7 @@ public async Task TimespanTextChanged_InvalidInput_SetsNull()
         }
 
         [TestMethod()]
-        public async Task GetTimespanFormatted_ValidFormat_ReturnsCorrectString()
+        public void GetTimespanFormatted_ValidFormat_ReturnsCorrectString()
         {
             // Arrange
             var options = new ApplicationOptions()
@@ -87,15 +85,14 @@ public async Task GetTimespanFormatted_ValidFormat_ReturnsCorrectString()
                 .Setup(p => p.GetOptionsAsync<ApplicationOptions>())
                 .ReturnsAsync(options);
             var parser = new ApplicationOptionsTimeSpanParser(mockOptionsProvider.Object);
-            await Task.Delay(50);
             // Act
             var result = parser.GetTimespanFormatted(new TimeSpan(0, 1, 30, 27, 200, 103));
             // Assert
             Assert.AreEqual("01:30:27", result);
         }
 
         [TestMethod()]
-        public async Task GetTimespanFormatted_InvalidFormat_FallbackToDefault()
+        public void GetTimespanFormatted_InvalidFormat_FallbackToDefault()
         {
             // Arrange
             var options = new ApplicationOptions()
@@ -107,7 +104,6 @@ public async Task GetTimespanFormatted_InvalidFormat_FallbackToDefault()
                 .Setup(p => p.GetOptionsAsync<ApplicationOptions>())
                 .ReturnsAsync(options);
             var parser = new ApplicationOptionsTimeSpanParser(mockOptionsProvider.Object);
-            await Task.Delay(50);
             // Act
             var result = parser.GetTimespanFormatted(new TimeSpan(0, 1, 30, 27, 200, 103));
             // Assert

AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs

@@ -26,13 +26,14 @@ public class ApplicationOptionsTimeSpanParser
         private readonly ILocalStorageOptionsProvider _localStorageOptionsProvider;
 
         private ApplicationOptions? applicationOptions;
+        private Task? _initTask;
         private bool disposedValue;
 
         public ApplicationOptionsTimeSpanParser(ILocalStorageOptionsProvider localStorageOptionsProvider)
         {
             _localStorageOptionsProvider = localStorageOptionsProvider;
             _localStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
-            Task.Run(InitAsync);
+            _initTask = InitAsync();
         }
 
         public async Task TimespanTextChanged<T, TProperty>(T entity, Expression<Func<T, TProperty>> expression, String value)
@@ -41,10 +42,7 @@ public async Task TimespanTextChanged<T, TProperty>(T entity, Expression<Func<T,
             {
                 throw new ArgumentException("'expression' should be a member expression");
             }
-            if (applicationOptions == null)
-            {
-                await InitAsync();
-            }
+            await EnsureInitializedAsync();
             TimeSpan? result = TimeSpanUtility.ParseTimeSpan(value, applicationOptions?.TimeSpanFormat);
             switch (memberExpression.Member.MemberType)
             {
@@ -59,6 +57,7 @@ public async Task TimespanTextChanged<T, TProperty>(T entity, Expression<Func<T,
         public string? GetTimespanFormatted(TimeSpan? timeSpan)
         {
             string? formatted = null;
+            EnsureInitializedAsync().GetAwaiter().GetResult();
             if (timeSpan.HasValue)
             {
                 try
@@ -92,6 +91,14 @@ private async Task InitAsync()
             applicationOptions ??= await _localStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
         }
 
+        private async Task EnsureInitializedAsync()
+        {
+            if (_initTask != null)
+            {
+                await _initTask;
+            }
+        }
+
         private void LocalStorageOptionsProvider_OptionSaved(object? sender, IOptions options)
         {
             if (options is ApplicationOptions applicationOption)