Move to new HPath API

This commit is contained in:
2016-05-09 14:41:57 +02:00
parent dc457eb168
commit 5fc77f6b24
5 changed files with 12 additions and 6 deletions

View File

@@ -54,6 +54,10 @@ import HPath
Abs
, Path
)
import HPath.IO
(
canonicalizePath
)
import HSFM.Utils.IO
import System.IO.Error
(
@@ -204,7 +208,7 @@ throwDestinationInSource :: Path Abs -- ^ source dir
-> IO ()
throwDestinationInSource source dest = do
dest' <- (\x -> maybe x (\y -> x P.</> y) $ P.basename dest)
<$> (P.canonicalizePath $ P.dirname dest)
<$> (canonicalizePath $ P.dirname dest)
dids <- forM (P.getAllParents dest') $ \p -> do
fs <- PF.getSymbolicLinkStatus (P.fromAbs p)
return (PF.deviceID fs, PF.fileID fs)

View File

@@ -37,6 +37,7 @@ import Control.Exception
try
, SomeException
)
import qualified Data.ByteString as BS
import Data.Foldable
(
for_
@@ -76,6 +77,10 @@ import System.INotify
, killINotify
, EventVariety(..)
)
import System.Posix.FilePath
(
pathSeparator
)
@@ -303,7 +308,7 @@ refreshView mygui myview mfp =
Item)
case ecd of
Right dir -> return (Just $ path dir)
Left _ -> return (P.parseAbs P.pathSeparator')
Left _ -> return (P.parseAbs $ BS.singleton pathSeparator)
-- |Refreshes the View based on the given directory.