Save time upon finishing scenario

- closes #1111

src/Swarm/TUI/Controller.hs

@@ -427,19 +427,25 @@ handleModalEvent = \case
    where
     refreshList lw = nestEventM' lw $ handleListEventWithSeparators ev shouldSkipSelection
 
--- | Write the @ScenarioInfo@ out to disk when exiting a game.
-saveScenarioInfoOnQuit :: (MonadIO m, MonadState AppState m) => m ()
-saveScenarioInfoOnQuit = do
+getNormalizedCurrentScenarioPath :: (MonadIO m, MonadState AppState m) => m (Maybe FilePath)
+getNormalizedCurrentScenarioPath =
+  -- the path should be normalized and good to search in scenario collection
+  use (gameState . currentScenarioPath) >>= \case
+    Nothing -> return Nothing
+    Just p' -> do
+      gs <- use $ gameState . scenarios
+      Just <$> liftIO (normalizeScenarioPath gs p')
+
+-- | Write the @ScenarioInfo@ out to disk when finishing a game (i.e. on winning or exit).
+saveScenarioInfoOnFinish :: (MonadIO m, MonadState AppState m) => m ()
+saveScenarioInfoOnFinish = do
   -- Don't save progress if we are in cheat mode
   cheat <- use $ uiState . uiCheatMode
   unless cheat $ do
     -- the path should be normalized and good to search in scenario collection
-    mp' <- use $ gameState . currentScenarioPath
-    case mp' of
+    getNormalizedCurrentScenarioPath >>= \case
       Nothing -> return ()
-      Just p' -> do
-        gs <- use $ gameState . scenarios
-        p <- liftIO $ normalizeScenarioPath gs p'
+      Just p -> do
         t <- liftIO getZonedTime
         wc <- use $ gameState . winCondition
         let won = case wc of
@@ -461,6 +467,16 @@ saveScenarioInfoOnQuit = do
               _ -> return ()
             liftIO $ saveScenarioInfo p si
 
+-- | Write the @ScenarioInfo@ out to disk when exiting a game.
+saveScenarioInfoOnQuit :: (MonadIO m, MonadState AppState m) => m ()
+saveScenarioInfoOnQuit = do
+  saveScenarioInfoOnFinish
+  -- Don't save progress if we are in cheat mode
+  cheat <- use $ uiState . uiCheatMode
+  unless cheat $ do
+    getNormalizedCurrentScenarioPath >>= \case
+      Nothing -> return ()
+      Just p -> do
         -- See what scenario is currently focused in the menu.  Depending on how the
         -- previous scenario ended (via quit vs. via win), it might be the same as
         -- currentScenarioPath or it might be different.
@@ -777,13 +793,13 @@ doGoalUpdates = do
       -- This clears the "flag" that the Lose dialog needs to pop up
       gameState . winCondition .= WinConditions (Unwinnable True) x
       openModal LoseModal
-
+      saveScenarioInfoOnFinish
       return True
     WinConditions (Won False) x -> do
       -- This clears the "flag" that the Win dialog needs to pop up
       gameState . winCondition .= WinConditions (Won True) x
       openModal WinModal
-
+      saveScenarioInfoOnFinish
       -- We do NOT advance the New Game menu to the next item here (we
       -- used to!), because we do not know if the user is going to
       -- select 'keep playing' or 'next challenge'.  We maintain the
@@ -818,7 +834,8 @@ doGoalUpdates = do
 
         -- The "uiGoal" field is necessary at least to "persist" the data that is needed
         -- if the player chooses to later "recall" the goals dialog with CTRL+g.
-        uiState . uiGoal
+        uiState
+          . uiGoal
           .= GoalDisplay
             newGoalTracking
             (GR.makeListWidget newGoalTracking)