diff options
author | stuebinm | 2022-03-19 20:20:20 +0100 |
---|---|---|
committer | stuebinm | 2022-03-19 20:21:14 +0100 |
commit | 80cc9d0f70e98ff9b8aa78c86891d4a9bb4759d5 (patch) | |
tree | 0c0151ebfa7b7b87b4906532b93452afb1dd39a8 /lib/CheckDir.hs | |
parent | dbf2253dc4256809b255767cbf4ae9c236f18542 (diff) |
unbreak a very, very long rebase
Diffstat (limited to '')
-rw-r--r-- | lib/CheckDir.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/CheckDir.hs b/lib/CheckDir.hs index 49b3774..eaf9aee 100644 --- a/lib/CheckDir.hs +++ b/lib/CheckDir.hs @@ -27,6 +27,7 @@ import CheckMap (MapResult (..), Optional, import Control.Monad.Extra (mapMaybeM) import Data.Aeson (ToJSON, (.=)) import qualified Data.Aeson as A +import Data.List (partition) import qualified Data.Map as M import Data.Map.Strict (mapKeys, mapWithKey, (\\)) import Data.Text (isInfixOf) @@ -124,7 +125,7 @@ instance ToJSON (DirResult a) where . foldr aggregateSameResults [] . M.toList $ dirresultMaps res) - , "exitGraph" .= showDot (dirresultGraph res) + , "exitGraph" .= dirresultGraph res ] , "severity" .= maximumLintLevel res , "mapInfo" .= fmap (\tm -> A.object [ "badges" .= mapresultBadges tm ]) @@ -133,8 +134,8 @@ instance ToJSON (DirResult a) where where aggregateSameResults (path,res) acc = case partition (\(_,res') -> res == res') acc of - ([],_) -> ([T.pack path], res):acc - ((paths,_):_,acc') -> (T.pack path:paths, res) : acc' + ([],_) -> ([toText path], res):acc + ((paths,_):_,acc') -> (toText path:paths, res) : acc' instance ToJSON MissingAsset where toJSON (MissingAsset md) = A.object |