slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev:Hledger.Utils.IO: clarify expandPath, expandHomePath

Browse Source
This commit is contained in:
Simon Michael 2025-12-30 18:47:40 -10:00
parent 6a9c5d41d9
commit 3d85549e79
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hledger-lib/Hledger/Utils/IO.hs
View File

@ -397,8 +397,8 @@ getCurrentZonedTime = do
getHomeSafe :: IO (Maybe FilePath) getHomeSafe :: IO (Maybe FilePath)
getHomeSafe = fmap Just getHomeDirectory `catch` (\(_ :: IOException) -> return Nothing) getHomeSafe = fmap Just getHomeDirectory `catch` (\(_ :: IOException) -> return Nothing)
-- | Expand a tilde (representing home directory) at the start of a file path. -- | Expand a single tilde (representing home directory) at the start of a file path.
-- ~username is not supported. Can raise an error. -- ~username is not supported. This can raise an IO error.
expandHomePath :: FilePath -> IO FilePath expandHomePath :: FilePath -> IO FilePath
expandHomePath = \case expandHomePath = \case
"~" -> getHomeDirectory "~" -> getHomeDirectory
@ -409,12 +409,14 @@ expandHomePath = \case
-- | Given a current directory, convert a possibly relative, possibly tilde-prefixed -- | Given a current directory, convert a possibly relative, possibly tilde-prefixed
-- file path to an absolute one. -- file path to an absolute one.
-- ~username is not supported. Leaves "-" unchanged. Can raise an error. -- ~username is not supported.
-- If the file path is "-", it is left as-is.
-- This can an raise an IO error.
expandPath :: FilePath -> FilePath -> IO FilePath -- general type sig for use in reader parsers expandPath :: FilePath -> FilePath -> IO FilePath -- general type sig for use in reader parsers
expandPath _ "-" = return "-" expandPath _ "-" = return "-"
expandPath curdir p = (if isRelative p then (curdir </>) else id) <$> expandHomePath p -- PARTIAL: expandPath curdir p = (if isRelative p then (curdir </>) else id) <$> expandHomePath p -- PARTIAL:
-- | Like expandPath, but treats the expanded path as a glob, and returns -- | Like @expandPath@, but treats the expanded path as a glob, and returns
-- zero or more matched absolute file paths, alphabetically sorted. -- zero or more matched absolute file paths, alphabetically sorted.
-- Can raise an error. -- Can raise an error.
-- For a more elaborate glob expander, see 'findMatchedFiles' (used by the include directive). -- For a more elaborate glob expander, see 'findMatchedFiles' (used by the include directive).