Commit 47b7e0a12d5cc2652d264765a77124c96d1fb59c - yaml-dir

Take basename of files/dirs Getty Ritter 9 years ago

1 changed file(s) with 6 addition(s) and 5 deletion(s). Collapse all Expand all

-5

Data/YamlDir.hs less more

24	24	import System.Directory ( doesDirectoryExist
25	25	, getDirectoryContents
26	26	)
27		import System.FilePath ((</>))
	27	import System.FilePath ((</>), takeBaseName)
28	28
29	29	filterDir :: IO [String] -> IO [String]
30	30	filterDir = fmap (filter go)

165	165	vs <- fmap sequence (mapM (parsePath withFile) [path </> k \| k <- ks])
166	166	case vs of
167	167	Left s -> return (Left s)
168		Right vs' -> return (Right (Object (fromList [ (pack k, v)
169		\| k <- ks
170		\| v <- vs'
171		])))
	168	Right vs' ->
	169	return (Right (Object (fromList [ (pack (takeBaseName k), v)
	170	\| k <- ks
	171	\| v <- vs'
	172	])))