wgaffa/deck-delta - Change A5WEQR35VYRX4XL5DWHFJPW3BGMIHIWFNCKG767LLNPMOIJ557MQC

Move some util functions into Util

For now these resides in Util module until they find a more proper home

Created by wgaffa on March 24, 2024

A5WEQR35VYRX4XL5DWHFJPW3BGMIHIWFNCKG767LLNPMOIJ557MQC

Dependencies

In channels

main

Change contents

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

[7.157]

module Util (
    NonEmptyText (..),
    PositiveNumber (..),
    toText
) where
import Control.Monad
import qualified Data.ByteString.Char8 as BS
import Data.Csv (FromField (..), ToField (..))
import Data.Text (Text)
import Data.Text.Encoding (decodeUtf8Lenient)
import Refined
import Numeric.Natural
newtype NonEmptyText = NonEmptyText {runText :: Refined NonEmpty Text}
    deriving (Show, Eq, Ord)
newtype PositiveNumber = PositiveNumber {runNumber :: Refined Positive Natural}
    deriving (Show, Eq, Ord)
instance FromField NonEmptyText where
    parseField s = NonEmptyText <$> (refineFail . decodeUtf8Lenient $ s)
instance FromField PositiveNumber where
    parseField s =
        maybe
            mzero
            ((fmap PositiveNumber . refineFail) . fromIntegral . fst)
            (BS.readInt s)
instance ToField NonEmptyText where
    toField = toField . unrefine . runText
instance ToField PositiveNumber where
    toField = toField . unrefine . runNumber
toText :: NonEmptyText -> Text
toText = unrefine . runText

Deletion in src/Deck.hs at line 15 [7.191]
B:BD[8.43] → [8.43:57]
```
    Category,
```
Insertion in src/Deck.hs at line 18 [7.191]
[9.48]
[10.16]
```
    CategoryName,
    Copies,
```

Insertion in src/Deck.hs at line 32 [7.191]

[11.36]

[12.11]

    find,
    mkCard,
    -- Lenses
    categories,
    name,

Deletion in src/Deck.hs at line 40 [7.191]
B:BD[13.86] → [11.37:58]
```
import Control.Monad
```

Deletion in src/Deck.hs at line 41 [7.191]

∅:D[11.59] → [14.135:249]

B:BD[13.86] → [14.135:249]

import qualified Data.ByteString.Char8 as BS
import Data.Csv (FromField (..), FromRecord, ToField (..), ToRecord)

Replacement in src/Deck.hs at line 45 [7.191]
B:BD[13.129] → [14.250:296]
```
import Data.Text.Encoding (decodeUtf8Lenient)
```
[13.129]
[15.20]
```
import Control.Lens.TH
import Control.Lens
```
Replacement in src/Deck.hs at line 53 [7.191]
B:BD[13.146] → [11.116:135]
∅:D[11.135] → [14.320:351]
B:BD[13.170] → [14.320:351]
B:BD[14.351] → [2.0:71]
∅:D[2.71] → [14.424:453]
B:BD[14.424] → [14.424:453]
```
import GHC.Natural
import GHC.Generics (Generic)
newtype NonEmptyText = NonEmptyText {runText :: Refined NonEmpty Text}
    deriving (Show, Eq, Ord)
```
[13.146]
[4.0]
```
import Util
```
Deletion in src/Deck.hs at line 55 [7.191]
∅:D[4.1] → [14.453:482]
B:BD[14.453] → [14.453:482]
```
type Category = NonEmptyText
```

Insertion in src/Deck.hs at line 56 [7.191]

[14.511]

[5.119]

type Copies = PositiveNumber
type CategoryName = NonEmptyText

Deletion in src/Deck.hs at line 59 [7.191]
B:BD[5.120] → [5.120:253]
∅:D[5.253] → [14.511:512]
B:BD[14.511] → [14.511:512]
B:BD[14.512] → [2.72:152]
∅:D[2.152] → [14.594:623]
B:BD[14.594] → [14.594:623]
∅:D[14.623] → [13.246:247]
B:BD[13.246] → [13.246:247]
```
mainboard, sideboard :: Category
mainboard = NonEmptyText $$(refineTH "Mainboard")
sideboard = NonEmptyText $$(refineTH "Sideboard")
newtype PositiveNumber = PositiveNumber {runNumber :: Refined Positive Natural}
    deriving (Show, Eq, Ord)
```

Replacement in src/Deck.hs at line 61 [7.191]

B:BD[13.264] → [16.0:50]

B:BD[16.50] → [14.624:658]

∅:D[14.658] → [16.96:204]

B:BD[16.96] → [16.96:204]

    { name :: !CardName
    -- ^ Name of the card
    , quantity :: !PositiveNumber
    -- ^ Number of cards in a deck
    , category :: !Category
    -- ^ Main category of the card in a deck

[13.264]

[13.357]

    { _name :: !CardName
    , _categories :: Map Text Copies

Replacement in src/Deck.hs at line 64 [7.191]

B:BD[13.363] → [14.659:719]

    deriving (Show, Eq, Ord, Generic, FromRecord, ToRecord)

[13.363]

[14.719]

    deriving (Show, Eq, Ord)

Replacement in src/Deck.hs at line 66 [7.191]

B:BD[14.720] → [14.720:758]

B:BD[14.758] → [2.153:226]

instance FromField NonEmptyText where
    parseField s = NonEmptyText <$> (refineFail . decodeUtf8Lenient $ s)

[14.720]

[14.840]

makeLenses ''Card

Replacement in src/Deck.hs at line 68 [7.191]

B:BD[14.841] → [14.841:932]

B:BD[14.932] → [2.227:324]

instance FromField PositiveNumber where
    parseField s =
        maybe
            mzero
            ((fmap PositiveNumber . refineFail) . fromIntegral . fst)
            (BS.readInt s)

[14.841]

[14.1043]

mainboard, sideboard :: CategoryName
mainboard = NonEmptyText $$(refineTH "Mainboard")
sideboard = NonEmptyText $$(refineTH "Sideboard")

Replacement in src/Deck.hs at line 72 [7.191]

B:BD[14.1044] → [14.1044:1080]

B:BD[14.1080] → [3.0:43]

instance ToField NonEmptyText where
    toField = toField . unrefine . runText

[14.1044]

[7.213]

mkCard :: CardName -> CategoryName -> Copies -> Card
mkCard cardName primary copies =
    let categoryName = toText primary
     in Card {_name = cardName, _categories = Map.singleton categoryName copies}

Deletion in src/Deck.hs at line 77 [7.191]
B:BD[7.214] → [14.1121:1159]
B:BD[14.1159] → [3.44:89]
∅:D[3.89] → [14.1199:1200]
B:BD[14.1199] → [14.1199:1200]
```
instance ToField PositiveNumber where
    toField = toField . unrefine . runNumber
```

Replacement in src/Deck.hs at line 84 [7.191]

B:BD[17.250] → [17.250:292]

B:BD[17.292] → [11.196:248]

    let t = unrefine . runText . name $ a
     in DeckList . Map.insert t a . runDeckList $ b

[17.250]

[17.350]

    let key = toText $ a ^. Deck.name
     in DeckList . Map.insert key a . runDeckList $ b

Deletion in src/Deck.hs at line 93 [7.191]

B:BD[17.576] → [17.576:806]

B:BD[17.806] → [18.82:98]

∅:D[18.98] → [17.818:865]

B:BD[17.818] → [17.818:865]

B:BD[17.865] → [19.0:43]

∅:D[19.43] → [17.1045:1108]

B:BD[17.1045] → [17.1045:1108]

B:BD[17.1108] → [19.44:74]

∅:D[19.74] → [18.139:164]

B:BD[17.1129] → [18.139:164]

B:BD[18.164] → [19.75:137]

{- | Update a `Card` in a `DeckList`. @`update` f a b@ applies the function @f@ on the card
| if it exists, otherwise it leaves the `DeckList` unchanged.
-}
update ::
    ((Category, PositiveNumber) -> (Category, PositiveNumber))
    -> CardName
    -> DeckList
    -> DeckList
update f a b =
    let tuple x = (category x, quantity x)
        toCard (category, quantity) x = x {category, quantity}
     in case Deck.find a b of
            Nothing -> b
            Just y -> insert (flip toCard y . f $ tuple y) b

Insertion in mtg.cabal at line 19 [7.249]
[9.97]
[9.97]
```
        Util,
```
Deletion in mtg.cabal at line 33 [7.249]
B:BD[9.132] → [6.7217:7234]
```
        comonad,
```
Insertion in mtg.cabal at line 34 [7.249]
[6.7247]
[7.563]
```
        lens,
```

Move some util functions into Util

Dependencies

In channels

Change contents

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

Deletion in src/Deck.hs at line 15 [7.191]

Insertion in src/Deck.hs at line 18 [7.191]

Insertion in src/Deck.hs at line 32 [7.191]

Deletion in src/Deck.hs at line 40 [7.191]

Deletion in src/Deck.hs at line 41 [7.191]

Replacement in src/Deck.hs at line 45 [7.191]

Replacement in src/Deck.hs at line 53 [7.191]

Deletion in src/Deck.hs at line 55 [7.191]

Insertion in src/Deck.hs at line 56 [7.191]

Deletion in src/Deck.hs at line 59 [7.191]

Replacement in src/Deck.hs at line 61 [7.191]

Replacement in src/Deck.hs at line 64 [7.191]

Replacement in src/Deck.hs at line 66 [7.191]

Replacement in src/Deck.hs at line 68 [7.191]

Replacement in src/Deck.hs at line 72 [7.191]

Deletion in src/Deck.hs at line 77 [7.191]

Replacement in src/Deck.hs at line 84 [7.191]

Deletion in src/Deck.hs at line 93 [7.191]

Insertion in mtg.cabal at line 19 [7.249]

Deletion in mtg.cabal at line 33 [7.249]

Insertion in mtg.cabal at line 34 [7.249]