terse read/show instances for Performance

2 files changed, 16 insertions, 5 deletions

diff --git a/package.yaml b/package.yaml
index 8fe8bbc..441c46e 100644
--- a/package.yaml
+++ b/package.yaml
@@ -13,6 +13,8 @@ dependencies:
 - brick
 - format-numbers
 - text
+- generic-data
+- pretty-simple
 
 executables:
   repgoal:
diff --git a/repgoal.hs b/repgoal.hs
index 86fba80..de0ca68 100755
--- a/repgoal.hs
+++ b/repgoal.hs
@@ -12,6 +12,8 @@
 {-# language TemplateHaskell #-}
 {-# language ViewPatterns #-}
 {-# language OverloadedStrings #-}
+{-# language DeriveGeneric #-}
+{-# language DerivingVia #-}
 import Rebase.Prelude hiding (toList, on, (<+>), Max)
 import qualified Rebase.Prelude as Prelude
 import Control.Lens hiding ((<|))
@@ -63,19 +65,24 @@ import Brick.AttrMap as A
 import Brick.Util (fg, bg, on, clamp)
 import Brick.Widgets.Core
 import Brick.Widgets.Table
+import Text.Pretty.Simple (pPrint)
+
+import GHC.Generics (Generic)
+import Generic.Data
+import Generic.Data.Microsurgery
 
 data Performance = Achieved {
   achievedReps :: Integer,
   achievedWeight :: Rational
-}
+} deriving Generic deriving (Read, Show) via Surgery Derecordify Performance
 
 data LiftRecord = LiftRecord {
   liftName :: Text,
   stats :: [Performance]
-}
+} deriving Generic deriving (Read, Show) via Surgery Derecordify LiftRecord
 
-initial :: [LiftRecord]
-initial =
+initial' :: [LiftRecord]
+initial' =
   [
     LiftRecord "Squat"    [Achieved 6 270, Achieved 8 255, Achieved 5 285, Achieved 10 255, Achieved 7 280],
     LiftRecord "Bench"    [Achieved 7 190, Achieved 9 180, Achieved 4 205, Achieved 11 180, Achieved 8 200],
@@ -195,10 +202,12 @@ powerClean = clean * 80 / 100
 pushPress = press * 100 / 75
 jerk = pushPress / 100 * 85
 
-main :: IO ()
+main, main' :: IO ()
+main' = pPrint initial'
 main = do
     let buildVty = V.mkVty V.defaultConfig
     vty <- buildVty
     -- liftIO $ setMode (outputIface vty) Mouse True
     chan <- newBChan 10
+    initial <- read <$> readFile "targets.dat" :: IO [LiftRecord]
     void $ customMain vty buildVty (Just chan) (theApp) (St initial Week1)