construct match from score and shooter stream

Author: piq9117

src/Practiscore/CLI.hs

@@ -16,6 +16,13 @@ import Options.Applicative
     showHelpOnError,
     strOption,
   )
+import Practiscore.USPSA.CLI (streamRawReport)
+import Practiscore.Parser.Shooter (toUspsaMemberId)
+import Conduit qualified
+import Conduit ((.|), MonadThrow, MonadUnliftIO)
+import Practiscore.Parser.Report qualified
+import Control.Exception (throwIO)
+import Practiscore.USPSA.Match (getShooterMatch, encodeMatch)
 
 data CLI = CLI
   { uspsaMemberId :: Text,
@@ -50,10 +57,19 @@ data CliParseErrors
 
 instance Exception CliParseErrors
 
-parseCLI :: IO ()
+parseCLI :: (MonadUnliftIO m, MonadThrow m) => m ()
 parseCLI = do
-  _cli <- showHelpOnErrorOnExecParser (info (helper <*> cli) fullDesc)
-  pure ()
+  cli <- liftIO $ showHelpOnErrorOnExecParser (info (helper <*> cli) fullDesc)
+
+  Conduit.runConduitRes $  do
+    let stream = streamRawReport cli.reportPath
+    shooters <- lift $ Practiscore.Parser.Report.toShooters stream
+    scores <- lift $ Practiscore.Parser.Report.toScores stream
+    case toUspsaMemberId cli.uspsaMemberId of
+      Nothing -> liftIO $ throwIO (InvalidUspsaMemberId $ cli.uspsaMemberId <> " is not valid")
+      Just uspsaMemberId -> 
+        Conduit.yield (toStrict $ encodeMatch $ getShooterMatch uspsaMemberId shooters scores)
+          .| Conduit.sinkFile cli.output
 
 showHelpOnErrorOnExecParser :: ParserInfo a -> IO a
 showHelpOnErrorOnExecParser = customExecParser (prefs showHelpOnError)

src/Practiscore/Parser/Report.hs

@@ -91,14 +91,14 @@ toShooters reportFieldsStream = do
           (currentHeader, [(header, line)])
     shooterStepParser _ currentHeader = (currentHeader, [])
 
-toScores :: (MonadUnliftIO m) => ConduitT () ReportFields (ResourceT m) () -> m ()
+toScores :: (MonadUnliftIO m) => ConduitT () ReportFields (ResourceT m) () -> m [Score]
 toScores reportFieldsStream =
   Conduit.runConduitRes $
     reportFieldsStream
       .| scoreParser
       .| scoreWithFieldNames
       .| decodeScore
-      .| Conduit.mapM_C (print @String <<< show)
+      .| Conduit.sinkList
   where
     scoreParser = Conduit.concatMapAccumC scoreStepParser Nothing
 

src/Practiscore/USPSA/Match.hs

@@ -2,7 +2,7 @@
 
 module Practiscore.USPSA.Match
   ( Match (..),
-    getShooterFromReport,
+    getShooterMatch,
     encodeMatch,
   )
 where
@@ -15,8 +15,6 @@ import Data.Csv
     namedRecord,
     (.=),
   )
-import Practiscore.Parser.Report (Report)
-import Practiscore.Parser.Report qualified
 import Practiscore.Parser.Score qualified
 import Practiscore.Parser.Shooter qualified
 import Practiscore.USPSA (UspsaMemberId (..))
@@ -79,19 +77,20 @@ instance ToNamedRecord Match where
         "stage_place" .= export.score.stagePlace
       ]
 
-getShooterFromReport ::
+getShooterMatch :: 
   UspsaMemberId ->
-  Report ->
+  [Practiscore.Parser.Shooter.Shooter] -> 
+  [Practiscore.Parser.Score.Score] ->
   [Match]
-getShooterFromReport memberId report = do
-  case find (\shooter -> shooter.uspsa == Just memberId) report.shooters of
+getShooterMatch memberId shooters scores =
+  case find (\shooter -> shooter.uspsa == Just memberId) shooters of
     Nothing -> []
-    Just shooter ->
+    Just shooter -> 
       [ Match
           { shooter,
             score
           }
-        | score <- (filter (\score -> score.comp == shooter.comp) report.scores)
+        | score <- filter (\score -> score.comp == shooter.comp) scores
       ]
 
 encodeMatch :: [Match] -> LByteString