Revert "Better normalization of filepaths"

This reverts commit c5009bd.

Author: LaurentRDC

src/Text/Pandoc/Filter/Plot/Parse.hs

@@ -33,8 +33,7 @@ import           Data.Version                      (showVersion)
 
 import           Paths_pandoc_plot                 (version)
 
-import           System.FilePath                   (makeValid)
-import           System.Directory                  (canonicalizePath)
+import           System.FilePath                   (makeValid, normalise)
 
 import           Text.Pandoc.Definition            (Block (..), Inline,
                                                     Pandoc (..), Format(..))
@@ -90,8 +89,8 @@ parseFigureSpec block@(CodeBlock (id', classes, attrs) _) =
                 extraAttrs     = Map.toList extraAttrs'
                 blockAttrs     = (id', filter (/= cls toolkit) classes, filteredAttrs)
 
-            blockDependencies <- parseFileDependencies $ fromMaybe mempty $ Map.lookup (tshow DependenciesK) attrs'
-            let dependencies = (defaultDependencies conf) <> blockDependencies
+            let blockDependencies = parseFileDependencies $ fromMaybe mempty $ Map.lookup (tshow DependenciesK) attrs'
+                dependencies = (defaultDependencies conf) <> blockDependencies
 
             -- This is the first opportunity to check save format compatibility
             let saveFormatSupported = saveFormat `elem` (supportedSaveFormats toolkit)
@@ -110,7 +109,7 @@ parseFigureSpec _ = return Nothing
 parseContent :: Block -> PlotM Script
 parseContent (CodeBlock (_, _, attrs) content) = do
     let attrs' = Map.fromList attrs
-    mfile  <- liftIO $ sequence $ fmap canonicalizePath $ unpack <$> Map.lookup (tshow FileK) attrs'
+        mfile  = unpack <$> Map.lookup (tshow FileK) attrs'
     when (content /= mempty && isJust mfile) $ do
         err $ mconcat [ 
             "Figure refers to a file (", pack $ fromJust mfile
@@ -157,10 +156,11 @@ readBool s | s `elem` ["True",  "true",  "'True'",  "'true'",  "1"] = True
 
 
 -- | Parse a list of file dependencies such as /[foo.bar, hello.txt]/.
-parseFileDependencies :: Text -> PlotM [FilePath]
+parseFileDependencies :: Text -> [FilePath]
 parseFileDependencies t
-    | t == mempty = return mempty
-    | otherwise   = sequence $ 
-                        fmap (liftIO . canonicalizePath . unpack . T.dropAround isSpace) 
-                            . T.splitOn "," 
-                            . T.dropAround (\c -> c `elem` ['[', ']']) $ t
+    | t == mempty = mempty
+    | otherwise   = fmap normalise 
+                      . fmap unpack 
+                      . fmap (T.dropAround isSpace) -- Remove leading/trailing whitespace on filenames
+                      . T.splitOn "," 
+                      . T.dropAround (\c -> c `elem` ['[', ']']) $ t

src/Text/Pandoc/Filter/Plot/Renderers/Prelude.hs

@@ -25,7 +25,7 @@ module Text.Pandoc.Filter.Plot.Renderers.Prelude (
 import           Data.Maybe                    (isJust)
 import           Data.Text                     (Text, unpack)
 
-import           System.Directory              (findExecutable, canonicalizePath)
+import           System.Directory              (findExecutable)
 import           System.Exit                   (ExitCode(..))
 
 import           Text.Shakespeare.Text         (st)
@@ -43,9 +43,7 @@ commandSuccess s = do
 
 -- | Checks that an executable is available on path, at all.
 existsOnPath :: FilePath -> IO Bool
-existsOnPath fp = canonicalizePath fp 
-                    >>= findExecutable 
-                    >>= fmap isJust . return
+existsOnPath fp = findExecutable fp >>= fmap isJust . return
 
 
 -- | Try to find the executable and normalise its path.

src/Text/Pandoc/Filter/Plot/Scripting.hs

@@ -27,10 +27,10 @@ import qualified Data.Text.IO                      as T
 import           Paths_pandoc_plot                 (version)
 
 import           System.Directory                  (createDirectoryIfMissing,
-                                                    doesFileExist, getTemporaryDirectory,
-                                                    canonicalizePath)
+                                                    doesFileExist, getTemporaryDirectory)
 import           System.Exit                       (ExitCode (..))
-import           System.FilePath                   (addExtension, replaceExtension,
+import           System.FilePath                   (addExtension,
+                                                    normalise, replaceExtension,
                                                     takeDirectory, (</>))
 
 import           Text.Pandoc.Filter.Plot.Renderers
@@ -131,7 +131,7 @@ tempScriptPath FigureSpec{..} = do
 
 -- | Determine the path to the source code that generated the figure.
 sourceCodePath :: FigureSpec -> PlotM FilePath
-sourceCodePath = fmap (flip replaceExtension ".txt") . figurePath
+sourceCodePath = fmap normalise . fmap (flip replaceExtension ".txt") . figurePath
 
 
 -- | Hash of the content of a @FigureSpec@. Note that unlike usual hashes,
@@ -165,4 +165,4 @@ figurePath spec = do
     fh <- figureContentHash spec
     let    ext  = extension . saveFormat $ spec
            stem = flip addExtension ext . show $ fh
-    liftIO $ canonicalizePath $ directory spec </> stem
+    return $ normalise $ directory spec </> stem