Add second stage to Progress type

Author: hedgehog1029

BaboonAPI/api-post/TrackReloader.fs

@@ -6,22 +6,26 @@ open BaboonAPI.Internal
 open BaboonAPI.Utility
 
 /// <summary>Reload the list of tracks and collections asynchronously.</summary>
+/// <param name="onProgress">Progress callback, will receive all progress events</param>
 /// <returns>A YieldTask that must be started using StartCoroutine.</returns>
 let reloadAll (onProgress: Progress -> unit) = Unity.task {
     match! TrackAccessor.loadAsyncWithProgress onProgress with
     | Ok () ->
-        do! TrackAccessor.loadCollectionsAsync()
+        do! TrackAccessor.loadCollectionsAsyncWithProgress onProgress
         return Ok ()
     | Error e ->
         return Error e
 }
 
 /// <summary>Reload the list of tracks and collections asynchronously.</summary>
+/// <param name="onProgress">Progress callback, will receive all progress events</param>
 /// <remarks>C# Action variant.</remarks>
 /// <returns>A YieldTask that must be started using StartCoroutine.</returns>
 let ReloadAll (onProgress: Progress Action) = reloadAll (FuncConvert.FromAction onProgress)
 
 /// <summary>Reload the list of tracks asynchronously, then update existing collections with the new tracks.</summary>
+/// <remarks>The <paramref name="onProgress"/> callback will only be called up to FirstStageDone.</remarks>
+/// <param name="onProgress">Progress callback, will received events up to FirstStageDone</param>
 /// <returns>A YieldTask that must be started using StartCoroutine.</returns>
 let reloadTracks (onProgress: Progress -> unit) = Unity.task {
     match! TrackAccessor.loadAsyncWithProgress onProgress with
@@ -33,6 +37,7 @@ let reloadTracks (onProgress: Progress -> unit) = Unity.task {
 }
 
 /// <summary>Reload the list of tracks asynchronously, then update existing collections with the new tracks.</summary>
+/// <param name="onProgress">Progress callback, will received events up to FirstStageDone</param>
 /// <remarks>C# Action variant.</remarks>
 /// <returns>A YieldTask that must be started using StartCoroutine.</returns>
 let ReloadTracks (onProgress: Progress Action) = reloadTracks (FuncConvert.FromAction onProgress)

BaboonAPI/api/TrackRegistry.fs

@@ -163,7 +163,9 @@ type TracksLoadedInfo =
 type Progress =
     | LoadingTracks of ProgressUpdate
     | LoadingCollections of ProgressUpdate
-    | Done of TracksLoadedInfo
+    | FirstStageDone of TracksLoadedInfo
+    | ResolvingCollections of ProgressUpdate
+    | SecondStageDone of ProgressUpdate
 
 /// <summary>
 /// Event-based API for registering new tracks.

BaboonAPI/internal/TrackAccessor.fs

@@ -134,7 +134,7 @@ type TrackLoader() =
 
     member _.LoadTracks onProgress =
         let info = makeTrackLoader onProgress |> onTracksLoaded
-        onProgress (Done info)
+        onProgress (FirstStageDone info)
 
     member _.LoadTracksAsync onProgress =
         Unity.task {
@@ -146,7 +146,7 @@ type TrackLoader() =
 
             if task.IsCompletedSuccessfully then
                 let info = onTracksLoaded task.Result
-                onProgress (Done info)
+                onProgress (FirstStageDone info)
                 return Ok ()
             elif task.IsFaulted then
                 return Error (task.Exception :> exn)
@@ -155,15 +155,16 @@ type TrackLoader() =
         }
 
     /// Resolve all track collections asynchronously and update base game about it
-    member _.ResolveCollections () =
+    member _.ResolveCollections onProgress =
         Unity.task {
             GlobalVariables.all_track_collections.Clear()
 
             for index, collection in Seq.indexed collections do
                 let! resolved = collection.Resolve(index)
+                onProgress (ResolvingCollections { loaded = index + 1 })
                 GlobalVariables.all_track_collections.Add resolved
 
-            ()
+            onProgress (SecondStageDone { loaded = GlobalVariables.all_track_collections.Count })
         }
 
     /// Update all track collections without doing a full async resolve
@@ -217,7 +218,10 @@ let loadAsyncWithProgress onProgress =
     trackLoader.LoadTracksAsync onProgress
 
 let loadCollectionsAsync () =
-    trackLoader.ResolveCollections()
+    trackLoader.ResolveCollections ignore
+
+let loadCollectionsAsyncWithProgress onProgress =
+    trackLoader.ResolveCollections onProgress
 
 let updateCollections () =
     trackLoader.UpdateCollections()