Begin working on determining the article argument type.

diff --git a/lwn-epub.cabal b/lwn-epub.cabal
index 6eb0c4e127c40ef572f063e851cf655ff8147e8f..18796348d99ad428b3e13b925ac3c2c6fc7ecbfa 100644 (file)
--- a/lwn-epub.cabal
+++ b/lwn-epub.cabal
@@ -15,10 +15,16 @@ executable lwn-epub
     directory               == 1.1.*,
     filepath                == 1.3.*,
     HandsomeSoup            == 0.3.*,
     directory               == 1.1.*,
     filepath                == 1.3.*,
     HandsomeSoup            == 0.3.*,

+    HUnit                   == 1.2.*,

     hxt                     == 9.*,
     MissingH                == 1.1.*,
     hxt                     == 9.*,
     MissingH                == 1.1.*,

+    network                 == 2.3.*,

     pandoc                  == 1.9.*,
     pandoc                  == 1.9.*,

-    time                    == 1.*
+    regex-posix             == 0.95.*,
+    test-framework          == 0.6.*,
+    test-framework-hunit    == 0.2.*,
+    time                    == 1.*,
+    utf8-string             == 0.3.*

 
   main-is:
     Main.hs
 
   main-is:
     Main.hs

diff --git a/src/CommandLine.hs b/src/CommandLine.hs
index a61cc30e46b570a34f6541e68a39f1368a5a8677..4fd9a542d600e8a41c9c74498ccd153fda013a7c 100644 (file)
--- a/src/CommandLine.hs
+++ b/src/CommandLine.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 
 {-# LANGUAGE DeriveDataTypeable #-}
 

-module CommandLine (Args(..), apply_args)
+module CommandLine (Args(..), apply_args, show_help)

 where
 
 -- Get the version from Cabal.
 where
 
 -- Get the version from Cabal.


@@ -71,6 +71,9 @@ is_missing_arg_error s =
   startswith "Requires at least" s
 
 
   startswith "Requires at least" s
 
 

+show_help :: IO (CmdArgs Args)
+show_help = withArgs ["--help"] parse_args
+

 parse_args :: IO (CmdArgs Args)
 parse_args = do
   x <- getArgs
 parse_args :: IO (CmdArgs Args)
 parse_args = do
   x <- getArgs


@@ -80,7 +83,7 @@ parse_args = do
       Left err ->
         if (is_missing_arg_error err) then
           -- Disregard the error message, show help instead.
       Left err ->
         if (is_missing_arg_error err) then
           -- Disregard the error message, show help instead.

-          withArgs ["--help"] parse_args
+          show_help

         else do
           hPutStrLn stderr err
           exitWith (ExitFailure exit_args_parse_failed)
         else do
           hPutStrLn stderr err
           exitWith (ExitFailure exit_args_parse_failed)

diff --git a/src/Main.hs b/src/Main.hs
index 373d423c9f322ba885db966fecff5b7e190c4dd4..655f1bef40c0680bda2c98e2d4ae9bc6f06c2cd8 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -2,24 +2,44 @@
 module Main
 where
 
 module Main
 where
 

+import Prelude hiding (readFile)
+import System.Directory(doesFileExist)

 import System.IO (
   Handle,
   IOMode (WriteMode),
   openBinaryFile,
   stdout
   )
 import System.IO (
   Handle,
   IOMode (WriteMode),
   openBinaryFile,
   stdout
   )

+import System.IO.UTF8 (readFile)

 import Text.XML.HXT.Core
 
 import Text.XML.HXT.Core
 

-import CommandLine (Args(..), apply_args)
+import CommandLine (Args(..), apply_args, show_help)

 import LWN.Page
 
 import LWN.Page
 

-my_read :: String -> IOStateArrow s b XmlTree
-my_read =
-  readDocument [ withValidate  no,
+
+my_read_opts :: SysConfigList
+my_read_opts = [ withValidate  no,

                  withParseHTML yes,
                  withParseHTML yes,

-                 withInputEncoding utf8,

                  withWarnings no ]
 
                  withWarnings no ]
 

+-- | My version of HandsomeSoup's parseHTML.
+my_read :: String -> IOStateArrow s b XmlTree
+my_read = readString my_read_opts
+
+-- | 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 :: String -> IO (Maybe (IOStateArrow s b XmlTree))
+get_xml_from_article s = do
+  article <- real_article_path s
+  is_file <- doesFileExist article
+  case is_file of
+    True -> do
+      contents <- readFile article
+      return $ Just $ my_read contents
+    False -> do
+      -- Download the URL and try to parse it.
+      return Nothing
+

 -- | If we're given an empty path, return a handle to
 --   'stdout'. Otherwise, open the given file and return a read/write
 --   handle to that.
 -- | If we're given an empty path, return a handle to
 --   'stdout'. Otherwise, open the given file and return a read/write
 --   handle to that.


@@ -43,12 +63,18 @@ main :: IO ()
 main = do
   Args{..} <- apply_args
   output_handle <- get_output_handle output
 main = do
   Args{..} <- apply_args
   output_handle <- get_output_handle output

-  input_path <- real_article_path article
-  let html = my_read input_path
-  result <- parse html
+  maybe_html <- get_xml_from_article article
+
+  case maybe_html of
+
+    Just html -> do
+      result <- parse html
+      case result of
+        Just stuff  -> epublish stuff output_handle
+        Nothing     -> return ()

 
 

-  case result of
-    Just stuff  -> epublish stuff output_handle
-    Nothing     -> return ()
+    Nothing -> do
+      _ <- show_help
+      return ()

 
   putStrLn "Done."
 
   putStrLn "Done."