Remove unescape workaround by upgrading to html-conduit 1.1.1.2

Pinging @DanBurton @chrisdone
This commit is contained in:
Michael Snoyman 2015-04-07 13:22:01 +03:00
parent 365ad1e354
commit 55e4b49733
3 changed files with 3 additions and 12 deletions

View file

@ -265,21 +265,12 @@ metadataUpdatesFromBS bs = case parseFrontmatter bs of
readFileBS :: File -> IO ByteString readFileBS :: File -> IO ByteString
readFileBS File{..} = BS.readFile $ T.unpack $ fileName <> fileExtension readFileBS File{..} = BS.readFile $ T.unpack $ fileName <> fileExtension
unescape :: ByteString -> ByteString
unescape
= T.encodeUtf8
. T.replace "&amp;" "&"
. T.replace "&gt;" ">"
. T.replace "&lt;" "<"
. T.replace "&quot;" "\""
. T.decodeUtf8
saveUpdate :: Context -> File -> Manager -> SaveConfig -> IO Bool saveUpdate :: Context -> File -> Manager -> SaveConfig -> IO Bool
saveUpdate context file@File{..} manager saveConfig@SaveConfig{..} = do saveUpdate context file@File{..} manager saveConfig@SaveConfig{..} = do
content <- readFileBS file content <- readFileBS file
let (metadataUpdates, content') = metadataUpdatesFromBS content let (metadataUpdates, content') = metadataUpdatesFromBS content
content'' <- preprocessMarkdown content' content'' <- preprocessMarkdown content'
didUpdateContent <- if (unescape content'' == oldContent) didUpdateContent <- if (content'' == oldContent)
then return False then return False
else do else do
req <- postSaveReq context fileName saveConfig content'' req <- postSaveReq context fileName saveConfig content''

View file

@ -479,7 +479,7 @@ constraints: abstract-deque ==0.3,
hsyslog ==2.0, hsyslog ==2.0,
HTF ==0.12.2.4, HTF ==0.12.2.4,
html ==1.0.1.2, html ==1.0.1.2,
html-conduit ==1.1.1.1, html-conduit ==1.1.1.2,
HTTP ==4000.2.19, HTTP ==4000.2.19,
http-client ==0.4.9, http-client ==0.4.9,
http-client-openssl ==0.2.0.1, http-client-openssl ==0.2.0.1,

View file

@ -24,7 +24,7 @@ executable soh-upload
, http-client-tls >=0.2 , http-client-tls >=0.2
, http-types >=0.8 , http-types >=0.8
, directory >=1.2 , directory >=1.2
, html-conduit >=1.1 , html-conduit >=1.1.1.2
, xml-conduit >=1.2 , xml-conduit >=1.2
, pcre-light >=0.4 , pcre-light >=0.4
, resourcet >=1.1 , resourcet >=1.1