fromhtml 0.1.0.4 → 0.1.0.5

raw patch · 2 files changed

+19/−15 lines, 2 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• fromhtml.cabal +2/−2
• src/Text/FromHTML.hs +17/−13

@@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: 8e7e8902b6f60e7e348d73e6ebc7e55557bf93da52a0512fd970a09834484e88+-- hash: 0a14bae31346767a06cfe578265426e650a10e6e25d1edea4fb998ba5b361f8d  name:           fromhtml-version:        0.1.0.4+version:        0.1.0.5 synopsis:       Simple adapter for transformation of HTML to other formats description:    Please see the README on GitHub at <https://github.com/MarekSuchanek/FromHTML#readme> category:       Text

@@ -16,14 +16,15 @@    , ExportType(..)    ) where ---import Debug.Trace- import qualified Data.Char as C import qualified Data.Text as T import qualified Data.Text.Encoding as E import qualified Data.ByteString as B +import           Control.Exception+import           Data.Semigroup import           GHC.IO.Handle+import           GHC.IO.Encoding import           System.Exit import           System.Process import           System.IO.Unsafe@@ -50,11 +51,6 @@ eitherToMaybe (Right x) = Just x eitherToMaybe _ = Nothing --- Variant for debugging--- eitherToMaybe :: Show a => Either a b -> Maybe b--- eitherToMaybe (Right x) = Just x--- eitherToMaybe (Left x) = traceShow x Nothing- str2BS :: String -> B.ByteString str2BS = E.encodeUtf8 . T.pack @@ -88,7 +84,7 @@         opts = ["--quiet", "--encoding", "utf-8", "-", "-"]         cprocess = procWith $ proc "wkhtmltopdf" opts --- | Simple conversion of HTML to PDF using process wkhtmltopdf+-- | Simple conversion of HTML to some format using process pandoc pandoc :: ExportType -> Command pandoc expt = perform cprocess     where@@ -96,16 +92,24 @@         opts = ["-s", "-f", "html", "-t", format, "-o", "-"]         cprocess = procWith $ proc "pandoc" opts -+-- | Perform process (catched IOException) perform :: CreateProcess -> Command-perform cprocess input = do+perform cprocess input = catch (performUnsafe cprocess input)+        (\e -> do let err = show (e :: IOException)+                  return . Left $ "IOException: " <> str2BS err)++-- | Perform process (no caching exceptions)+performUnsafe :: CreateProcess -> Command+performUnsafe cprocess input = do+    setLocaleEncoding utf8  -- don't know what was locales are there...     (Just stdin, Just stdout, Just stderr, p) <- createProcess cprocess     hPutStr stdin input >> hClose stdin     exitCode <- waitForProcess p+    errors <- B.hGetContents stderr+    output <- B.hGetContents stdout     case exitCode of-      ExitSuccess -> Right <$> B.hGetContents stdout-      _           -> Left <$> B.hGetContents stderr-+      ExitSuccess -> return $ Right output+      _           -> return . Left $ "Exit(" <> str2BS (show exitCode) <> "): " <> errors  procWith p = p { std_out = CreatePipe                , std_in  = CreatePipe