joshuaclayton/unused
1
1
Fork 0
mirror of https://github.com/joshuaclayton/unused.git synced 2024-08-16 08:10:55 +03:00
Code Issues Projects Releases Wiki Activity

Make reading files safer

Browse Source
This commit is contained in:
Joshua Clayton 2016-06-27 05:55:11 -04:00
parent 87d773c126
commit 8828f65cb7
No known key found for this signature in database
GPG Key ID: 5B6558F77E9A8118
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Unused/ResultsClassifier/Config.hs
View File

@ -9,13 +9,13 @@ import qualified Data.ByteString.Char8 as C
import qualified Data.Either as E
import qualified Data.Bifunctor as B
import System.FilePath ((</>))
import System.Directory (getHomeDirectory)
import System.Directory (getHomeDirectory, doesFileExist)
import Paths_unused (getDataFileName)
import Unused.ResultsClassifier.Types (LanguageConfiguration, ParseConfigError(..))
import Unused.Util (readIfFileExists)
loadConfig :: IO (Either String [LanguageConfiguration])
loadConfig = Y.decodeEither <$> readConfig
loadConfig = either Left Y.decodeEither <$> readConfig
loadAllConfigurations :: IO (Either [ParseConfigError] [LanguageConfiguration])
loadAllConfigurations = do
@ -41,5 +41,11 @@ loadConfigFromFile path = do
addSourceToLeft :: String -> Either String c -> Either ParseConfigError c
addSourceToLeft source = B.first (ParseConfigError source)
readConfig :: IO BS.ByteString
readConfig = getDataFileName ("data" </> "config.yml") >>= BS.readFile
readConfig :: IO (Either String BS.ByteString)
readConfig = do
configFileName <- getDataFileName ("data" </> "config.yml")
exists <- doesFileExist configFileName
if exists
then Right <$> BS.readFile configFileName
else return $ Left "default config not found"