From c15dd3080403363cddab4aacb305f448133b4814 Mon Sep 17 00:00:00 2001
From: Filip Gralinski <filipg@amu.edu.pl>
Date: Mon, 28 Sep 2020 21:38:19 +0200
Subject: [PATCH] Fix broken view-variant when headers are set

---
 Handler/Query.hs | 13 ++++++++-----
 gonito.cabal     |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Handler/Query.hs b/Handler/Query.hs
index da4754e..d87f43c 100644
--- a/Handler/Query.hs
+++ b/Handler/Query.hs
@@ -33,9 +33,10 @@ import qualified Data.Map.Lazy as LM
 import Yesod.Form.Bootstrap3 (BootstrapFormLayout (..), renderBootstrap3)
 
 import Data.Conduit.SmartSource (lookForCompressedFiles)
-import GEval.Core (GEvalSpecification(..), ResultOrdering(..))
+import GEval.Core (GEvalSpecification(..), GEvalOptions(..), ResultOrdering(..))
 import GEval.LineByLine (runLineByLineGeneralized, runDiffGeneralized, LineRecord(..))
 import GEval.Common (FormattingOptions(..), MetricValue)
+import GEval.OptionsParser (readOptsFromConfigFile)
 import qualified Data.Conduit.List as CL
 import System.FilePath (takeFileName)
 import System.Directory (makeAbsolute)
@@ -256,7 +257,7 @@ instance Diffable SHA1 where
 
 postCompareFormR :: VariantId -> TestId -> Handler Html
 postCompareFormR variantId testId = do
-    ((result, formWidget), formEnctype) <- runFormPost outQueryForm
+    ((result, _), _) <- runFormPost outQueryForm
     case result of
       FormSuccess outQuery -> do
         (out:_) <- runDB $ rawOutQuery outQuery
@@ -370,7 +371,7 @@ data DiffLineRecord = DiffLineRecord Text Text (Diff (Text, MetricValue)) Word32
                       deriving (Show)
 
 getUniLineRecord :: LineRecord -> DiffLineRecord
-getUniLineRecord (LineRecord inp exp out lineNo val) = DiffLineRecord inp exp (OneThing (out, val)) lineNo
+getUniLineRecord (LineRecord inp expect out lineNo val) = DiffLineRecord inp expect (OneThing (out, val)) lineNo
 
 getBiLineRecord :: (LineRecord, LineRecord) -> DiffLineRecord
 getBiLineRecord ((LineRecord oldInp oldExp oldOut oldLineNo oldVal), (LineRecord newInp newExp newOut newLineNo newVal))
@@ -429,6 +430,8 @@ viewOutputWithNonDefaultTestSelected entry tests mainTest (outputHash, testSet)
 
             let testName = T.unpack testSet
 
+            Right opts <- liftIO $ readOptsFromConfigFile [] (current repoDir </> "config.txt")
+
             let spec = GEvalSpecification {
                   gesOutDirectory = current repoDir,
                   gesExpectedDirectory = Nothing,
@@ -448,8 +451,8 @@ viewOutputWithNonDefaultTestSelected entry tests mainTest (outputHash, testSet)
                   gesGonitoGitAnnexRemote = Nothing,
                   gesReferences = Nothing,
                   gesBootstrapResampling = Nothing,
-                  gesInHeader = Nothing,
-                  gesOutHeader = Nothing,
+                  gesInHeader = gesInHeader $ geoSpec opts,
+                  gesOutHeader = gesOutHeader $ geoSpec opts,
                   gesShowPreprocessed = True }
 
             case outPaths of
diff --git a/gonito.cabal b/gonito.cabal
index effdce3..b4a0b4b 100644
--- a/gonito.cabal
+++ b/gonito.cabal
@@ -130,7 +130,7 @@ library
                  , filemanip
                  , cryptohash
                  , markdown
-                 , geval >= 1.37 && < 1.38
+                 , geval >= 1.37.2 && < 1.38
                  , filepath
                  , yesod-table
                  , regex-tdfa