Skip to content
Snippets Groups Projects
Commit 2464f639 authored by stuebinm's avatar stuebinm
Browse files

small fixes

parent c74a9c7f
Branches
No related tags found
No related merge requests found
...@@ -62,12 +62,11 @@ newtype MissingAsset = MissingAsset MissingDep ...@@ -62,12 +62,11 @@ newtype MissingAsset = MissingAsset MissingDep
resultIsFatal :: LintConfig' -> DirResult -> Bool resultIsFatal :: LintConfig' -> DirResult -> Bool
resultIsFatal config res = resultIsFatal config res =
(not (null (dirresultMissingAssets res))) not (null (dirresultMissingAssets res))
&& (configMaxLintLevel config) <= maxObservedLevel && configMaxLintLevel config <= maxObservedLevel
where maxObservedLevel = maximum where maxObservedLevel = maximum
. map hintLevel . map hintLevel
. concatMap keys . concatMap (keys . mapresultLayer)
. map mapresultLayer
. elems . elems
. dirresultMaps . dirresultMaps
$ res $ res
...@@ -134,16 +133,16 @@ recursiveCheckDir :: LintConfig' -> FilePath -> FilePath -> IO DirResult ...@@ -134,16 +133,16 @@ recursiveCheckDir :: LintConfig' -> FilePath -> FilePath -> IO DirResult
recursiveCheckDir config prefix root = do recursiveCheckDir config prefix root = do
linted <- recursiveCheckDir' config prefix [root] mempty mempty linted <- recursiveCheckDir' config prefix [root] mempty mempty
mAssets <- missingAssets prefix linted mAssets <- missingAssets prefix linted
pure $ linted <> mempty { dirresultDeps = missingDeps linted pure $ linted <> mempty { dirresultDeps = missingDeps root linted
, dirresultMissingAssets = mAssets , dirresultMissingAssets = mAssets
} }
-- | Given a (partially) completed DirResult, check which local -- | Given a (partially) completed DirResult, check which local
-- maps are referenced but do not actually exist. -- maps are referenced but do not actually exist.
missingDeps :: DirResult -> [MissingDep] missingDeps :: FilePath -> DirResult -> [MissingDep]
missingDeps res = missingDeps entrypoint res =
let simple = M.insert "main.json" [] used \\ M.union defined trivial let simple = M.insert (T.pack entrypoint) [] used \\ M.union defined trivial
in M.foldMapWithKey (\f n -> [MissingDep f n]) simple in M.foldMapWithKey (\f n -> [MissingDep f n]) simple
where where
-- which maps are linked somewhere? -- which maps are linked somewhere?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment