Minor Text / Style change

FNZCM/FNZCM.BlazorWasm/Helpers/ApiClient.cs

@@ -55,7 +55,7 @@ namespace FNZCM.BlazorWasm.Helpers
             var obj = new Dictionary<string, Library>();
             while (true)
             {
-                await progress[0].SetProgress((float)jsonStream.Position / jsonStream.Length, $"Loading fileset {jsonStream.Position.BytesToFileSize()}/{jsonStream.Length.BytesToFileSize()}");
+                await progress[0].SetProgress((float)jsonStream.Position / jsonStream.Length, $"Loading fileset {jsonStream.Position.BytesToFileSize()}/{jsonStream.Length.BytesToFileSize()}...");
 
                 if (!jsonReader.Read()) throw new JsonException($"Deserialization failed at line {jsonReader.LineNumber} position {jsonReader.LinePosition}.");
                 if (jsonReader.TokenType == JsonToken.EndObject) break;
@@ -67,7 +67,7 @@ namespace FNZCM.BlazorWasm.Helpers
                 if (jsonReader.TokenType != JsonToken.StartObject) throw new JsonException($"Deserialization failed at line {jsonReader.LineNumber} position {jsonReader.LinePosition}.");
                 obj[key] = serializer.Deserialize<Library>(jsonReader);
             }
-            await progress[0].ForceUpdate();
+            await progress[0].SetProgress((float)jsonStream.Position / jsonStream.Length, $"Loading fileset {jsonStream.Position.BytesToFileSize()}/{jsonStream.Length.BytesToFileSize()}...OK", true);
             return obj;
         }
 
@@ -94,7 +94,7 @@ namespace FNZCM.BlazorWasm.Helpers
             var obj = new Dictionary<string, MediaTag>();
             while (true)
             {
-                await progress[1].SetProgress((float)jsonStream.Position / jsonStream.Length, $"Loading tags {jsonStream.Position.BytesToFileSize()}/{jsonStream.Length.BytesToFileSize()}");
+                await progress[1].SetProgress((float)jsonStream.Position / jsonStream.Length, $"Loading tags {jsonStream.Position.BytesToFileSize()}/{jsonStream.Length.BytesToFileSize()}...");
 
                 if (!jsonReader.Read()) throw new JsonException($"Deserialization failed at line {jsonReader.LineNumber} position {jsonReader.LinePosition}.");
                 if (jsonReader.TokenType == JsonToken.EndObject) break;
@@ -107,7 +107,8 @@ namespace FNZCM.BlazorWasm.Helpers
                 obj[key] = serializer.Deserialize<MediaTag>(jsonReader);
             }
 
-            await progress[1].ForceUpdate();
+            await progress[1].SetProgress((float)jsonStream.Position / jsonStream.Length, $"Loading tags {jsonStream.Position.BytesToFileSize()}/{jsonStream.Length.BytesToFileSize()}...OK", true);
+
 
             return obj;
         }

FNZCM/FNZCM.BlazorWasm/Helpers/FnzDataSetHelper.cs

@@ -49,7 +49,7 @@ namespace FNZCM.BlazorWasm.Helpers
                 var lstDiscOfLib = new List<FeDisc>();
                 foreach (var disc in lib.Value.Discs.OrderByDescending(p => p.Key))
                 {
-                    await progress[2].SetProgress(((float)(currentDisc++)) / numberOfDisc, $"Parsing model {currentDisc}/{numberOfDisc}");
+                    await progress[2].SetProgress(((float)(currentDisc++)) / numberOfDisc, $"Parsing model {currentDisc}/{numberOfDisc}...");
 
                     var feDisc = new FeDisc
                     {
@@ -173,6 +173,7 @@ namespace FNZCM.BlazorWasm.Helpers
                     }
                     feDisc.TrackSets = lstTrackSetOfDisc.ToArray();
                 }// end foreach disc
+
                 feLib.Discs = lstDiscOfLib.ToArray();
 
                 var lstCatalogOfLib = new List<FeLibraryCatalog>();
@@ -205,7 +206,7 @@ namespace FNZCM.BlazorWasm.Helpers
                 feLib.Catalogs = lstCatalogOfLib.ToArray();
             }// end foreach lib
 
-            await progress[2].ForceUpdate();
+            await progress[2].SetProgress(((float)(currentDisc++)) / numberOfDisc, $"Parsing model {currentDisc}/{numberOfDisc}...OK", true);
 
             dataSet.AllTracks = lstAllTrack.ToArray();
             dataSet.AllTracksSet = lstAllTrackSet.ToArray();

FNZCM/FNZCM.BlazorWasm/UI/Components/ProgressBar.razor

@@ -18,11 +18,11 @@
 
     private DateTime _point = DateTime.Now;
 
-    public async Task SetProgress(float ratio, string display)
+    public async Task SetProgress(float ratio, string display, bool forceUpdate = false)
     {
         Percent = ratio * 100;
         Display = display;
-        if ((DateTime.Now - _point).TotalMilliseconds >= Throttle)
+        if (forceUpdate || (DateTime.Now - _point).TotalMilliseconds >= Throttle)
         {
             StateHasChanged();
             await Task.Delay(5);

FNZCM/FNZCM.BlazorWasm/UI/Views/Default/App.razor

@@ -97,12 +97,14 @@
         StateHasChanged();
         await Task.Delay(10);
 
-        await ProgressBar1.SetProgress(0, "Waiting server ready");
-        await ProgressBar2.SetProgress(0, "Pending load fileset");
-        await ProgressBar3.SetProgress(0, "Pending load tags");
-        await ProgressBar4.SetProgress(0, "Pending parse models");
+        await ProgressBar1.SetProgress(0, "Waiting server ready...", true);
+        await ProgressBar2.SetProgress(0, "Pending load fileset...", true);
+        await ProgressBar3.SetProgress(0, "Pending load tags...", true);
+        await ProgressBar4.SetProgress(0, "Pending parse models...", true);
+        
         StateHasChanged();
         await Task.Delay(10);
+
         try
         {
             do
@@ -111,8 +113,7 @@
                 await ProgressBar1.SetProgress((float)r.LoadedTags / r.TotalTrackCount, $"Waiting server ready {r.LoadedTags}/{r.TotalTrackCount}");
                 if (r?.IsLoading == false)
                 {
-                    await ProgressBar1.SetProgress(100, "Server ready");
-                    await ProgressBar1.ForceUpdate();
+                    await ProgressBar1.SetProgress(100, "Waiting server ready...OK", true);
                     break;
                 }
                 await Task.Delay(1000);

FNZCM/FNZCM.BlazorWasm/UI/Views/Default/Playlist/PlaylistExportDialog.razor

@@ -23,15 +23,19 @@
         </div>
         <div class="input-group mb-3">
             <div class="input-group-text">
-                <input class="form-check-input mt-0" type="checkbox" checked="@ExportDomainCheck" @bind-value="ExportDomainCheck">
-                &nbsp;Host
+                <label>
+                    <input class="form-check-input mt-0 align-middle" type="checkbox" checked="@ExportDomainCheck" @bind-value="ExportDomainCheck">
+                    <span class="align-middle">-Host</span>
+                </label>
             </div>
             <InputText class="form-control" ValueExpression="()=>ExportDomain" Value="@ExportDomain"></InputText>
         </div>
         <div class="input-group mb-3">
             <div class="input-group-text">
-                <input class="form-check-input mt-0" type="checkbox" checked="@ExportDateCheck" @bind-value="ExportDateCheck">
-                &nbsp;Date
+                <label>
+                    <input class="form-check-input mt-0 align-middle" type="checkbox" checked="@ExportDateCheck" @bind-value="ExportDateCheck">
+                    <span class="align-middle">-Date</span>
+                </label>
             </div>
             <InputText class="form-control" ValueExpression="()=>ExportDate" Value="@ExportDate"></InputText>
         </div>