summaryrefslogtreecommitdiff
path: root/tiled/Data
diff options
context:
space:
mode:
authorstuebinm2022-04-08 14:12:00 +0200
committerstuebinm2022-04-08 14:12:00 +0200
commitdb2bd423a00e582dd966d040df70d6994122b7ff (patch)
tree9123c53c11287c8b4cc6c4efda817f745995e68a /tiled/Data
parentbbc5b557838c750e66759602b6a48d23da780c24 (diff)
linter: don't fail on missing maps
turns out eitherDecodeFile' doesn't have the semantics I thought it did (who writes functions returning either that can still fail??)
Diffstat (limited to 'tiled/Data')
-rw-r--r--tiled/Data/Tiled.hs9
1 files changed, 6 insertions, 3 deletions
diff --git a/tiled/Data/Tiled.hs b/tiled/Data/Tiled.hs
index d3ccb26..3e6c737 100644
--- a/tiled/Data/Tiled.hs
+++ b/tiled/Data/Tiled.hs
@@ -24,6 +24,7 @@ import Data.Aeson hiding (Object)
import qualified Data.Aeson as A
import Data.Aeson.Types (typeMismatch)
import Data.Char (toLower)
+import Control.Exception (IOException)
-- | options for Aeson's generic encoding and parsing functions
@@ -382,6 +383,8 @@ instance ToJSON Tiledmap where
-- | Load a Tiled map from the given 'FilePath'.
loadTiledmap :: FilePath -> IO (Either String Tiledmap)
-loadTiledmap path = eitherDecodeFileStrict' path >>= \case
- Left err -> pure $ Left err
- Right !tiledmap -> evaluateNF tiledmap <&> Right
+loadTiledmap path = catch
+ (eitherDecodeFileStrict' path >>= \case
+ Left err -> pure $ Left err
+ Right !tiledmap -> evaluateNF tiledmap <&> Right)
+ (\(_ :: IOException) -> pure (Left $ "Failed to read this file."))