From 0dc35ad26ce91a85436c392aa5b9b9fbfaca39cd Mon Sep 17 00:00:00 2001 From: Adrian Cochrane Date: Sun, 14 Jul 2019 20:05:11 +1200 Subject: [PATCH] Improve concision of Stylish HTML Conduit's API. --- stylish-html-conduit/src/Data/HTML2CSS.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stylish-html-conduit/src/Data/HTML2CSS.hs b/stylish-html-conduit/src/Data/HTML2CSS.hs index 2d16578..986b1be 100644 --- a/stylish-html-conduit/src/Data/HTML2CSS.hs +++ b/stylish-html-conduit/src/Data/HTML2CSS.hs @@ -16,16 +16,16 @@ import Data.CSS.Style import Network.URI ---- Constants -cssPriorityAgent = 1 -cssPriorityUser = 2 -cssPriorityAuthor = 3 +cssPriorityAgent styles = styles {priority = 1} +cssPriorityUser styles = styles {priority = 2} +cssPriorityAuthor styles = styles {priority = 3} ---- Parsing externalStyles :: PropertyParser s => QueryableStyleSheet s -> (M.Map XML.Name Txt.Text -> Bool) -> XML.Element -> (URI -> IO Txt.Text) -> IO (QueryableStyleSheet s) externalStyles stylesheet testMedia html loadURL = do css <- externalStyles' testMedia html loadURL - return $ foldl parse stylesheet {priority = cssPriorityAuthor} css + return $ foldl parse (cssPriorityAuthor stylesheet) css externalStyles' testMedia html loadURL = go $ linkedStyles' testMedia html where -- TODO parallelise loads go (link:links) = do @@ -43,7 +43,7 @@ linkedStyles' testMedia (XML.Element _ _ children) = concat [linkedStyles' testMedia el | XML.NodeElement el <- children] internalStyles testMedia stylesheet html = - foldl parse (stylesheet {priority = cssPriorityAuthor}) $ internalStyles' testMedia html + foldl parse (cssPriorityAuthor stylesheet) $ internalStyles' testMedia html internalStyles' testMedia (XML.Element (XML.Name "style"_ _) attrs children) | testMedia attrs = [strContent children] internalStyles' testMedia (XML.Element _ _ children) = -- 2.30.2