Adjust to new HPath API
This commit is contained in:
@@ -55,8 +55,9 @@ import HPath
|
||||
Abs
|
||||
, Path
|
||||
)
|
||||
import HSFM.FileSystem.Errors
|
||||
import HSFM.FileSystem.FileOperations
|
||||
import HPath.IO
|
||||
import HPath.IO.Errors
|
||||
import HPath.IO.Utils
|
||||
import HSFM.FileSystem.FileType
|
||||
import HSFM.FileSystem.UtilTypes
|
||||
import HSFM.GUI.Gtk.Callbacks.Utils
|
||||
@@ -431,8 +432,8 @@ renameF [item] _ _ = withErrorDialog $ do
|
||||
++ P.fpToString (P.fromAbs $ (P.dirname . path $ item)
|
||||
P.</> fn) ++ "\"?"
|
||||
withConfirmationDialog cmsg $
|
||||
HSFM.FileSystem.FileOperations.renameFile (path item)
|
||||
((P.dirname $ path item) P.</> fn)
|
||||
HPath.IO.renameFile (path item)
|
||||
((P.dirname $ path item) P.</> fn)
|
||||
renameF _ _ _ = withErrorDialog
|
||||
. throwIO $ InvalidOperation
|
||||
"Operation not supported on multiple files"
|
||||
|
||||
@@ -33,8 +33,8 @@ import GHC.IO.Exception
|
||||
IOErrorType(..)
|
||||
)
|
||||
import qualified HPath as P
|
||||
import HSFM.FileSystem.Errors
|
||||
import HSFM.FileSystem.FileOperations
|
||||
import HPath.IO
|
||||
import HPath.IO.Errors
|
||||
import HSFM.FileSystem.FileType
|
||||
import HSFM.FileSystem.UtilTypes
|
||||
import HSFM.GUI.Gtk.Data
|
||||
|
||||
@@ -68,7 +68,7 @@ import Distribution.Verbosity
|
||||
)
|
||||
import Graphics.UI.Gtk
|
||||
import qualified HPath as P
|
||||
import HSFM.FileSystem.Errors
|
||||
import HPath.IO.Errors
|
||||
import HSFM.FileSystem.FileType
|
||||
import HSFM.FileSystem.UtilTypes
|
||||
import HSFM.GUI.Glib.GlibString()
|
||||
@@ -222,7 +222,7 @@ withErrorDialog io =
|
||||
[ Handler (\e -> showErrorDialog
|
||||
$ displayException (e :: IOException))
|
||||
, Handler (\e -> showErrorDialog
|
||||
$ displayException (e :: FmIOException))
|
||||
$ displayException (e :: HPathIOException))
|
||||
]
|
||||
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ import Data.Maybe
|
||||
catMaybes
|
||||
, fromJust
|
||||
)
|
||||
import HSFM.FileSystem.Errors
|
||||
import HPath.IO.Errors
|
||||
(
|
||||
canOpenDirectory
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user