Work on saving/loading concurrently

src/Dodge/Save.hs

@@ -7,6 +7,7 @@ module Dodge.Save (
     readSaveSlot,
     reloadLevelStart,
 ) where
+import Dodge.Concurrent
 import Control.Lens
 import Dodge.Data.SaveSlot
 import Data.Aeson
@@ -16,27 +17,29 @@ import Dodge.Data.Universe
 --import qualified Data.Set as S
 import System.Directory
 
-writeSaveSlot :: SaveSlot -> Universe -> IO (Universe -> Universe)
+writeSaveSlot :: SaveSlot -> Universe -> IO (Universe -> Maybe Universe)
 writeSaveSlot ss u = do
+    putStrLn $ "Saving " ++ saveSlotPath ss
     createDirectoryIfMissing True "saveSlot"
     BS.writeFile (saveSlotPath ss) $
         AEP.encodePretty'
             (AEP.Config (AEP.Spaces 2) compare AEP.Generic False)
             (u ^. uvWorld . cWorld)
-    return id
+    return Just
 
---writeFile (saveSlotPath ss) (show $ u ^. uvWorld . cWorld)
-
-readSaveSlot :: SaveSlot -> IO (Universe -> Universe)
+readSaveSlot :: SaveSlot -> IO (Universe -> Maybe Universe)
 readSaveSlot ss = do
     fExists <- doesFileExist $ saveSlotPath ss
     if fExists
         then do
             cwstr <- decodeFileStrict $ saveSlotPath ss
             case cwstr of
-                Nothing -> putStrLn "loadSaveSlot failed to read saved file" >> return id
-                Just cw -> return $ \uv -> uv & uvWorld . cWorld .~ cw
-        else putStrLn "loadSaveSlot failed to find saved file" >> return id
+                Nothing -> putStrLn "loadSaveSlot failed to read saved file" >> return removescreenlayers
+                Just cw -> return $ \uv -> Just $ uv & uvWorld . cWorld .~ cw
+                    & uvScreenLayers .~ []
+        else putStrLn "loadSaveSlot failed to find saved file" >> return removescreenlayers
+  where
+    removescreenlayers = Just . (uvScreenLayers .~ [])
 
 saveSlotPath :: SaveSlot -> String
 saveSlotPath (SaveSlotNum i) = "saveSlot/" ++ show i
@@ -44,21 +47,13 @@ saveSlotPath QuicksaveSlot = "saveSlot/QuickSave"
 saveSlotPath (LevelStartSlot i) = "saveSlot/LevelStart" ++ show i
 
 saveWorldInSlot :: SaveSlot -> Universe -> Universe
-saveWorldInSlot slot u = u & uvConcEffects ?~
-    writeSaveSlot slot u
+saveWorldInSlot slot u = tryConcEffect False "ASDF" (writeSaveSlot slot u) u
     
 reloadLevelStart :: Universe -> Universe
-reloadLevelStart u = case u ^. uvWorld . gameSlot of
-    GameNum i -> loadSaveSlot (LevelStartSlot i) u
-    _ -> u
+reloadLevelStart = loadSaveSlot (LevelStartSlot 0)
 
 loadSaveSlot :: SaveSlot -> Universe -> Universe
-loadSaveSlot slot = (uvConcEffects ?~ readSaveSlot slot)
-    . (uvWorld . gameSlot .~ GameLoading slot)
---    maybe
---        u
---        (\w -> u & menuLayers .~ [] & uvWorld .~ w)
---        $ M.lookup slot (_savedWorlds u)
+loadSaveSlot slot = tryConcEffect True "LOADING" (readSaveSlot slot)
 
 doQuicksave :: Universe -> Universe
 doQuicksave = saveWorldInSlot QuicksaveSlot