Go back to JSON encoding

src/Dodge/Save.hs

@@ -6,52 +6,25 @@ module Dodge.Save (
     writeSaveSlot,
     readSaveSlot,
     reloadLevelStart,
-    toJSONSaveSlot,
-    fromJSONSaveSlot,
 ) where
 
-import Data.Binary
-import Flat
+--import Flat
 import Dodge.Concurrent
 import Control.Lens
 import Dodge.Data.SaveSlot
 import Data.Aeson
 import qualified Data.Aeson.Encode.Pretty as AEP
 import qualified Data.ByteString.Lazy as BS
-import qualified Data.ByteString as BSS
+--import qualified Data.ByteString as BSS
 import Dodge.Data.Universe
 --import qualified Data.Set as S
 import System.Directory
 
+
 writeSaveSlot :: SaveSlot -> Universe -> IO (Universe -> Maybe Universe)
 writeSaveSlot ss u = do
     putStrLn $ "Saving " ++ saveSlotPath ss
     createDirectoryIfMissing True "saveSlot"
---    BSS.writeFile (saveSlotPath ss) $
---        flat
---            (u ^. uvWorld . cWorld)
-    return Just
-
-readSaveSlot :: SaveSlot -> IO (Universe -> Maybe Universe)
-readSaveSlot ss = do
-    fExists <- doesFileExist $ saveSlotPath ss
---    if fExists
---        then do
---            bsstr <- BSS.readFile $ saveSlotPath ss
---            let cwstr = unflat bsstr
---            case cwstr of
---                Left _ -> putStrLn "loadSaveSlot failed to read saved file" >> return removescreenlayers
---                Right cw -> return $ \uv -> Just $ uv & uvWorld . cWorld .~ cw
---                    & uvScreenLayers .~ []
---        else putStrLn "loadSaveSlot failed to find saved file" >> return removescreenlayers
-    return Just
-  where
-    removescreenlayers = Just . (uvScreenLayers .~ [])
-
-toJSONSaveSlot :: SaveSlot -> Universe -> IO (Universe -> Maybe Universe)
-toJSONSaveSlot 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)
@@ -59,8 +32,8 @@ toJSONSaveSlot ss u = do
     return Just
 
 
-fromJSONSaveSlot :: SaveSlot -> IO (Universe -> Maybe Universe)
-fromJSONSaveSlot ss = do
+readSaveSlot :: SaveSlot -> IO (Universe -> Maybe Universe)
+readSaveSlot ss = do
     fExists <- doesFileExist $ saveSlotPath ss
     if fExists
         then do