diff --git a/src/Settings/WellKnownFiles/TH.hs b/src/Settings/WellKnownFiles/TH.hs index 9d86f0e00..5054fa835 100644 --- a/src/Settings/WellKnownFiles/TH.hs +++ b/src/Settings/WellKnownFiles/TH.hs @@ -79,14 +79,14 @@ mkWellKnown defLang wellKnownBase wellKnownLinks = do File{..} <- pure pFile guard $ name /= wellKnownLinks return $ file & _1 %~ makeRelative (wellKnownBase language) - return (Trace.trace ("### Trace language: (" ++ show language ++ ")") (Text.pack language, lContents')) + return (Text.pack language, lContents') | otherwise -> fail $ "wellKnownBase (" ++ wellKnownBase ++ ") is not a directory" fLanguages <- if | defLang `Set.member` Map.keysSet languageFiles , let languages' = Set.delete defLang $ Map.keysSet languageFiles - -> return $ Trace.trace ("### fLanguages: (" ++ show languages' ++ ")") (defLang :| Set.toList languages') + -> return $ (defLang :| Set.toList languages') | otherwise -> fail "default language is missing in wellKnownBase" @@ -94,17 +94,20 @@ mkWellKnown defLang wellKnownBase wellKnownLinks = do languageLinks <- if | Dir{contents} <- inputFiles -- -> Trace.trace ("### Trace languageLinks (outer): (" ++ show contents ++ ")") $ return . Map.fromList $ do - -> Trace.trace ("### Trace languageLinks (outer): (" ++ "...show contents..." ++ ")") $ return . Map.fromList $ do + -- -> Trace.trace ("### Trace languageLinks (outer): (" ++ "...show contents... (show contents seems to be ok and is too long to be useful?)" ++ ")") $ return . Map.fromList $ do + -> return . Map.fromList $ do (language, lContents) <- contents ^.. folded . $(multifocusL 2) _name id - Dir{} <- Trace.trace ("### Trace languageLinks (inner1): (" ++ show language ++ ")") $ pure lContents + Dir{} <- pure lContents let lContents' :: [ByteString] lContents' = Trace.traceShowId $ flip mapMaybe (flattenDir lContents) $ \pFile -> do +-- Trace.trace ("### Trace lContents' " ++ show pFile) + --File{..} <- Trace.trace ("### Trace one lContents' element " ++ show pFile) $ pure pFile File{..} <- pure pFile guard $ name == wellKnownLinks return $ file ^. _2 c <- lContents' - return (Trace.trace ("### Trace languageLinks (inner): (" ++ show language ++ ")") (Text.pack language, c)) + return (Text.pack language, c) | otherwise -> fail "wellKnownBase is not a directory" @@ -112,6 +115,8 @@ mkWellKnown defLang wellKnownBase wellKnownLinks = do | defLang `Set.member` Map.keysSet languageLinks , let languages' = Set.delete defLang $ Map.keysSet languageLinks -> return $ defLang :| Set.toList languages' + | null languageLinks + -> fail $ "no languageLinks in wellKnownBase; " ++ wellKnownLinks ++ " might be missing" | otherwise -> fail ("default language is missing in wellKnownBase" ++ "; default language is '" ++ (show defLang) ++ "' ; list of known languages is " ++ (show $ Map.keys languageLinks))