c3c8870752
It seems to make sense to convert both System.Directory and System.FilePath uses to OsPath in one go. This will generally look like replacing RawFilePath with OsPath in type signatures, and will be driven by the now absolutely massive pile of compile errors. Got a few modules building in this new regime. Sponsored-by: Jack Hill
85 lines
2.1 KiB
Haskell
85 lines
2.1 KiB
Haskell
{- OsPath utilities
|
|
-
|
|
- Copyright 2025 Joey Hess <id@joeyh.name>
|
|
-
|
|
- License: BSD-2-clause
|
|
-}
|
|
|
|
{-# LANGUAGE CPP #-}
|
|
{-# LANGUAGE PackageImports #-}
|
|
{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
|
|
{-# OPTIONS_GHC -fno-warn-tabs #-}
|
|
|
|
module Utility.OsPath (
|
|
OsPath,
|
|
OsString,
|
|
RawFilePath,
|
|
literalOsPath,
|
|
toOsPath,
|
|
fromOsPath,
|
|
module X,
|
|
getSearchPath,
|
|
) where
|
|
|
|
import Utility.FileSystemEncoding
|
|
#ifdef WITH_OSPATH
|
|
import System.OsPath as X hiding (OsPath, OsString)
|
|
import System.OsPath
|
|
import "os-string" System.OsString.Internal.Types
|
|
import qualified Data.ByteString.Short as S
|
|
import qualified System.FilePath.ByteString as PB
|
|
#else
|
|
import System.FilePath.ByteString as X hiding (RawFilePath, getSearchPath)
|
|
import System.FilePath.ByteString (getSearchPath)
|
|
import qualified Data.ByteString as S
|
|
#endif
|
|
|
|
class OsPathConv t where
|
|
toOsPath :: t -> OsPath
|
|
fromOsPath :: OsPath -> t
|
|
|
|
instance OsPathConv FilePath where
|
|
toOsPath = toOsPath . toRawFilePath
|
|
fromOsPath = fromRawFilePath . fromOsPath
|
|
|
|
{- Used for string constants. -}
|
|
literalOsPath :: String -> OsPath
|
|
literalOsPath = toOsPath
|
|
|
|
#ifdef WITH_OSPATH
|
|
instance OsPathConv RawFilePath where
|
|
toOsPath = bytesToOsPath
|
|
fromOsPath = bytesFromOsPath
|
|
|
|
{- Unlike System.OsString.fromBytes, on Windows this does not ensure a
|
|
- valid USC-2LE encoding. The input ByteString must be in a valid encoding
|
|
- already or uses of the OsPath will fail. -}
|
|
bytesToOsPath :: RawFilePath -> OsPath
|
|
#if defined(mingw32_HOST_OS)
|
|
bytesToOsPath = OsString . WindowsString . S.toShort
|
|
#else
|
|
bytesToOsPath = OsString . PosixString . S.toShort
|
|
#endif
|
|
|
|
bytesFromOsPath :: OsPath -> RawFilePath
|
|
#if defined(mingw32_HOST_OS)
|
|
bytesFromOsPath = S.fromShort . getWindowsString . getOsString
|
|
#else
|
|
bytesFromOsPath = S.fromShort . getPosixString . getOsString
|
|
#endif
|
|
|
|
{- For some reason not included in System.OsPath -}
|
|
getSearchPath :: IO [OsPath]
|
|
getSearchPath = map toOsPath <$> PB.getSearchPath
|
|
|
|
#else
|
|
{- When not building with WITH_OSPATH, use RawFilePath.
|
|
-}
|
|
type OsPath = RawFilePath
|
|
|
|
type OsString = S.ByteString
|
|
|
|
instance OsPathConv RawFilePath where
|
|
toOsPath = id
|
|
fromOsPath = id
|
|
#endif
|