wgaffa/deck-delta - Change IOHZMH4DV2QFBNQZTI456DJXL2AUMV2EUTDQUTXMMLNT64QM4AGQC

Refactor diff to work with new api

Created by wgaffa on March 24, 2024

IOHZMH4DV2QFBNQZTI456DJXL2AUMV2EUTDQUTXMMLNT64QM4AGQC

Dependencies

In channels

main

Change contents

Insertion in src/Diff.hs at line 8 [4.3955]
[3.2218]
[4.4081]
```
    diff,
```

Replacement in src/Diff.hs at line 58 [4.3955]

B:BD[4.4821] → [4.4821:4895]

diff :: (HunkSYM repr, DeckSYM repr) => DeckList -> DeckList -> [repr ()]

[4.4722]

[4.4895]

diff :: (HunkSYM repr, DeckSYM repr) => Map Text Card -> Map Text Card -> [repr (DeckRep repr) -> repr (DeckRep repr)]

Replacement in src/Diff.hs at line 60 [4.3955]

B:BD[4.4913] → [2.0:57]

    let deckSort = map snd . Map.toAscList . runDeckList

[4.4913]

[4.4971]

    let deckSort = map snd . Map.toAscList

Replacement in src/Diff.hs at line 63 [4.3955]

B:BD[4.5030] → [4.5030:5115]

    go :: (HunkSYM repr, DeckSYM repr) => [repr ()] -> [Card] -> [Card] -> [repr ()]

[4.5030]

[4.5115]

    go :: (HunkSYM repr, DeckSYM repr) => [repr (DeckRep repr) -> repr (DeckRep repr)] -> [Card] -> [Card] -> [repr (DeckRep repr) -> repr (DeckRep repr)]

Replacement in src/Diff.hs at line 65 [4.3955]

B:BD[4.5138] → [4.5138:5224]

    go acc xs [] = acc ++ map (remove . name) xs
    go acc [] ys = acc ++ map add ys

[4.5138]

[4.5224]

    go acc xs [] = acc ++ map (\x -> Diff.delete (x ^. name)) xs
    go acc [] ys = acc ++ map Diff.insert ys

Replacement in src/Diff.hs at line 68 [4.3955]

B:BD[4.5259] → [4.5259:5320]

B:BD[4.5320] → [2.58:109]

∅:D[2.109] → [4.5371:5515]

B:BD[4.5371] → [4.5371:5515]

B:BD[4.5515] → [5.239:582]

B:BD[5.582] → [2.110:308]

        | name x < name y = go (remove (name x) : acc) xs ly
        | name x > name y = go (add y : acc) lx ys
        | otherwise =
            case (partialEqCard quantity x y, partialEqCard category x y) of
                (True, True) -> go acc xs ys
                (False, False) ->
                    go
                        ( chunk
                            (name x)
                            [modifyCopies (const $ quantity y), modifyCategory (const . category $ y)]
                            : acc
                        )
                        xs
                        ys
                (False, _) -> go (chunk (name x) [modifyCopies (const $ quantity y)] : acc) xs ys
                (_, False) -> go (chunk (name x) [modifyCategory (const $ category y)] : acc) xs ys

[4.5259]

        | x ^. name < y ^. name = go (Diff.delete (x ^. name) : acc) xs ly
        | x ^. name > y ^. name = go (Diff.insert y : acc) lx ys
        | otherwise = undefined -- Need a new algorithm here
            -- case (partialEqCard quantity x y, partialEqCard category x y) of
            --     (True, True) -> go acc xs ys
            --     (False, False) ->
            --         go
            --             ( chunk
            --                 (name x)
            --                 [modifyCopies (const $ quantity y), modifyCategory (const . category $ y)]
            --                 : acc
            --             )
            --             xs
            --             ys
            --     (False, _) -> go (chunk (name x) [modifyCopies (const $ quantity y)] : acc) xs ys
            --     (_, False) -> go (chunk (name x) [modifyCategory (const $ category y)] : acc) xs ys