X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Flwn-epub.git;a=blobdiff_plain;f=src%2FLWN%2FPage.hs;h=3027eaef6c83e76067a744acf98be3a8b6b8579f;hp=6a097cbf7714d8929a37708ddd92a29c8982bf21;hb=2953924e2016393a1ffb9e2e82b4c90c8c57dfd3;hpb=f3321e2ce7d7645ad562dc8f6620bfd561edc75d
diff --git a/src/LWN/Page.hs b/src/LWN/Page.hs
index 6a097cb..3027eae 100644
--- a/src/LWN/Page.hs
+++ b/src/LWN/Page.hs
@@ -5,10 +5,13 @@ 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.Directory (doesFileExist)
+import System.IO (Handle, hClose, hFlush, hPutStrLn, stderr)
+import System.IO.UTF8 (readFile)
import Test.HUnit (Assertion, assertEqual)
import Test.Framework (Test, testGroup)
import Test.Framework.Providers.HUnit (testCase)
@@ -21,6 +24,7 @@ import Text.Pandoc (
import Text.XML.HXT.Core (
ArrowXml,
IOSArrow,
+ IOStateArrow,
XmlTree,
(>>>),
(/>),
@@ -42,12 +46,64 @@ import Text.XML.HXT.Core (
when)
import Text.HandsomeSoup (css, parseHtml)
+import Configuration (Cfg, password, use_account, username)
import LWN.Article
-import LWN.HTTP (ImageMap, download_image_urls)
+import LWN.HTTP (
+ ImageMap,
+ download_image_urls,
+ get_page,
+ log_in,
+ make_cookie_jar)
import LWN.URI (URL, try_make_absolute_url)
-import LWN.XHTML (XHTML, to_xhtml)
+import LWN.XHTML (XHTML, parse_lwn, to_xhtml)
import Misc (contains)
+
+-- | Try to parse the given article using HXT. We try a few different
+-- methods; if none of them work, we return 'Nothing'.
+get_xml_from_article :: Cfg -> URL -> IO (Maybe (IOStateArrow s b XmlTree))
+get_xml_from_article cfg article_name = do
+ my_article <- real_article_path article_name
+ is_file <- doesFileExist my_article
+ case is_file of
+ True -> do
+ contents <- readFile my_article
+ return $ Just $ parse_lwn contents
+ False -> do
+ -- Download the URL and try to parse it.
+ if use_account cfg then do
+ -- use_account would be false if these fromJusts would fail.
+ cj <- make_cookie_jar
+ li_result <- log_in cj
+ (fromJust $ username cfg)
+ (fromJust $ password cfg)
+
+ case li_result of
+ Left err -> do
+ let msg = "Failed to log in. " ++ err
+ hPutStrLn stderr msg
+ Right response_body -> do
+ hPutStrLn stderr response_body
+
+ html <- get_page (Just cj) my_article
+
+ case html of
+ Left err -> do
+ let msg = "Failed to retrieve page. " ++ err
+ hPutStrLn stderr msg
+ return Nothing
+ Right h -> return $ Just $ parse_lwn h
+ else do
+ html <- get_page Nothing my_article
+ case html of
+ Left err -> do
+ let msg = "Failed to retrieve page. " ++ err
+ hPutStrLn stderr msg
+ return Nothing
+ Right h -> return $ Just $ parse_lwn h
+
+
+
-- Should be called *after* preprocessing.
download_images :: IOSArrow XmlTree XmlTree -> IO ImageMap
download_images xml = do
@@ -77,9 +133,7 @@ instance XHTML Page where
" " ++ (show $ LWN.Article.title a) ++ "" ++
"" ++
"" ++
- "" ++
(to_xhtml a) ++
- "
" ++
"" ++
"