wgaffa/ffxwt - Change W65GMUVA7GT5Z5ZD5YIWSMVZK42TBY7CHQ5GQRQQ244ULZ4GF2HQC

Move JSON implementation to own module

Created by wgaffa on January 10, 2023

W65GMUVA7GT5Z5ZD5YIWSMVZK42TBY7CHQ5GQRQQ244ULZ4GF2HQC

Dependencies

In channels

main

Change contents

Replacement in src/Location.hs at line 13 [3.36]

B:BD[3.240] → [3.240:296]

-- |Location of map in FFX in the form 'Area - Section'

[3.240]

[3.296]

-- | Location of map in FFX in the form 'Area - Section'
-- | Section can be omitted

Replacement in src/Location.hs at line 18 [3.36]
B:BD[3.357] → [3.357:389]
```
    , _section :: PrintableText
```
[3.357]
[3.389]
```
    , _section :: Maybe PrintableText
```

Deletion in src/AlBhed.hs at line 18 [4.34]

B:BD[2.114] → [2.114:279]

import           Text.Casing
import           Data.Aeson
import           Data.Aeson.Encoding
import qualified Data.Scientific     as Scientific (toBoundedInteger)

Deletion in src/AlBhed.hs at line 49 [4.34]

B:BD[4.670] → [2.311:433]


instance ToJSON Volume where
    toJSON = Number . fromIntegral . (+1) . fromEnum
    toEncoding = int . (+1) . fromEnum

Deletion in src/AlBhed.hs at line 50 [4.34]

B:BD[4.671] → [2.434:737]

instance FromJSON Volume where
    parseJSON (Number x) =
        let maybeVolume = Scientific.toBoundedInteger x >>= toVolume
        in case maybeVolume of
            Just vol -> pure vol
            Nothing  -> fail "Volume number is out of bounds"
    parseJSON _ = fail "Volume must be a number"

Deletion in src/AlBhed.hs at line 57 [4.34]

B:BD[2.760] → [2.760:879]

∅:D[2.879] → [4.784:785]

B:BD[4.784] → [4.784:785]

B:BD[4.785] → [2.880:1000]

instance ToJSON Primer where
    toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camel . drop 6 }
instance FromJSON Primer where
    parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camel . drop 6 }

File addition: AlBhed (d--x------)
[5.15]

File addition: JSON.hs (----------)

[0.143]

module AlBhed.JSON
    (
    ) where
import           Data.Aeson
import           Data.Aeson.Encoding
import qualified Data.Scientific     as Scientific (toBoundedInteger)
import           Text.Casing
import           AlBhed
instance ToJSON Volume where
    toJSON = Number . fromIntegral . (+1) . fromEnum
    toEncoding = int . (+1) . fromEnum
instance FromJSON Volume where
    parseJSON (Number x) =
        let maybeVolume = Scientific.toBoundedInteger x >>= toVolume
        in case maybeVolume of
            Just vol -> pure vol
            Nothing  -> fail "Volume number is out of bounds"
    parseJSON _ = fail "Volume must be a number"
instance ToJSON Primer where
    toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camel . drop 6 }
instance FromJSON Primer where
    parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camel . drop 6 }

Insertion in ffxwt.cabal at line 28 [5.164]
[4.1413]
[3.441]
```
        , AlBhed.JSON
```