X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Flwn-epub.git;a=blobdiff_plain;f=src%2FLWN%2FPage.hs;h=97171c641be08a6761a1a1800002190c7f10b9ed;hp=620e3ec3d8bf66a9a67bff98cc3ac215a2a64b70;hb=aad40cd8e1e8c84c5fc294674a7159bb40838440;hpb=4220827f62d772d7edcbdcc1c2f13d6c2eb5f534 diff --git a/src/LWN/Page.hs b/src/LWN/Page.hs index 620e3ec..97171c6 100644 --- a/src/LWN/Page.hs +++ b/src/LWN/Page.hs @@ -5,10 +5,11 @@ where import qualified Data.Map as Map (lookup) import Data.Time (getCurrentTime) -import System.IO (Handle, hClose, hFlush) import qualified Data.ByteString.Lazy as B (ByteString, hPut) import Data.String.Utils (split, strip) import Data.Maybe (catMaybes, fromJust, isNothing) +import Prelude hiding (readFile) +import System.IO (Handle, hClose, hFlush) import Test.HUnit (Assertion, assertEqual) import Test.Framework (Test, testGroup) import Test.Framework.Providers.HUnit (testCase) @@ -26,33 +27,34 @@ import Text.XML.HXT.Core ( (/>), (//>), changeAttrValue, - getAttrValue, getChildren, getText, - hasAttrValue, hasName, - isElem, - mkName, - none, processAttrl, processTopDown, runX, - setElemName, xshow, when) import Text.HandsomeSoup (css, parseHtml) +import Configuration (Cfg) import LWN.Article -import LWN.HTTP (ImageMap, download_image_urls) -import LWN.URI (URL, try_make_absolute_url) -import LWN.XHTML (XHTML, to_xhtml) -import Misc (contains) +import LWN.HTTP ( + ImageMap, + download_image_urls, + get_article_contents) +import LWN.URI (URL) +import LWN.XHTML ( + XHTML, + image_srcs, + is_image, + preprocess, + remove_byline, + remove_title, + to_xhtml, + xml_from_contents) + --- Should be called *after* preprocessing. -download_images :: IOSArrow XmlTree XmlTree -> IO ImageMap -download_images xml = do - image_urls <- runX $ xml >>> image_srcs - download_image_urls image_urls data Page = @@ -77,9 +79,7 @@ instance XHTML Page where "