Refactor, try to limit dependencies

src/Dodge/Save.hs

@@ -1,62 +1,62 @@
-module Dodge.Save
-    ( saveWorldInEmptySlot
-    , loadSaveSlot
-    , doQuicksave
-    , saveLevelStartSlot
-    , writeSaveSlot
-    , readSaveSlot
-    ) where
-import Dodge.Data
+module Dodge.Save (
+    saveWorldInEmptySlot,
+    loadSaveSlot,
+    doQuicksave,
+    saveLevelStartSlot,
+    writeSaveSlot,
+    readSaveSlot,
+) where
+import Control.Lens
 import Data.Aeson
 import qualified Data.Aeson.Encode.Pretty as AEP
 import qualified Data.ByteString.Lazy as BS
---import Text.Read (readMaybe)
 import qualified Data.Map.Strict as M
---import Data.Maybe
-import Control.Lens
+import Dodge.Data.Universe
 --import qualified Data.Set as S
 import System.Directory
 
 writeSaveSlot :: SaveSlot -> Universe -> IO ()
 writeSaveSlot ss u = do
     createDirectoryIfMissing True "saveSlot"
-    BS.writeFile (saveSlotPath ss) 
-        $ AEP.encodePretty' 
-            (AEP.Config (AEP.Spaces 2) compare AEP.Generic False) 
+    BS.writeFile (saveSlotPath ss) $
+        AEP.encodePretty'
+            (AEP.Config (AEP.Spaces 2) compare AEP.Generic False)
             (u ^. uvWorld . cWorld)
-    --writeFile (saveSlotPath ss) (show $ u ^. uvWorld . cWorld)
+
+--writeFile (saveSlotPath ss) (show $ u ^. uvWorld . cWorld)
 
 readSaveSlot :: SaveSlot -> Universe -> IO Universe
 readSaveSlot ss uv = do
     fExists <- doesFileExist $ saveSlotPath ss
     if fExists
-    then do
-        --cwstr <- readFile $ saveSlotPath ss
-        --case readMaybe cwstr of
-        cwstr <- decodeFileStrict $ saveSlotPath ss
-        case cwstr of
-            Nothing -> putStrLn "loadSaveSlot failed to read saved file" >> return uv
-            Just cw -> return $ uv & uvWorld . cWorld .~ cw
-    else putStrLn "loadSaveSlot failed to find saved file" >> return uv
+        then do
+            --cwstr <- readFile $ saveSlotPath ss
+            --case readMaybe cwstr of
+            cwstr <- decodeFileStrict $ saveSlotPath ss
+            case cwstr of
+                Nothing -> putStrLn "loadSaveSlot failed to read saved file" >> return uv
+                Just cw -> return $ uv & uvWorld . cWorld .~ cw
+        else putStrLn "loadSaveSlot failed to find saved file" >> return uv
 
 saveSlotPath :: SaveSlot -> String
 saveSlotPath (SaveSlotNum i) = "saveSlot/" ++ show i
 saveSlotPath QuicksaveSlot = "saveSlot/QuickSave"
 saveSlotPath LevelStartSlot = "saveSlot/LevelStartSave"
 
-
 saveWorldInEmptySlot :: SaveSlot -> Universe -> Universe
 saveWorldInEmptySlot slot w = case M.lookup slot $ _savedWorlds w of
     Nothing -> w & savedWorlds %~ M.insert slot (clearKeys (_uvWorld w))
-    _       -> w
+    _ -> w
 
 saveWorldInSlot :: SaveSlot -> Universe -> Universe
 saveWorldInSlot slot u = u & savedWorlds %~ M.insert slot (clearKeys (_uvWorld u))
 
 loadSaveSlot :: SaveSlot -> Universe -> Universe
-loadSaveSlot slot u = maybe u 
-    (\w -> u & menuLayers .~ [] & uvWorld .~ w) 
-    $ M.lookup slot (_savedWorlds u) 
+loadSaveSlot slot u =
+    maybe
+        u
+        (\w -> u & menuLayers .~ [] & uvWorld .~ w)
+        $ M.lookup slot (_savedWorlds u)
 
 doQuicksave :: Universe -> Universe
 doQuicksave = saveWorldInSlot QuicksaveSlot
@@ -67,4 +67,5 @@ clearKeys = (keys .~ mempty) . (mouseButtons .~ mempty)
 saveLevelStartSlot :: Universe -> Universe
 --saveLevelStartSlot = id
 saveLevelStartSlot = saveWorldInSlot LevelStartSlot
+
 --saveLevelStartSlot = sideEffects %~ (fmap  (undefined) . )