X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Flwn-epub.git;a=blobdiff_plain;f=src%2FMain.hs;h=88ba39c5ff493cd9b3b0acafc9992738d080138f;hp=373d423c9f322ba885db966fecff5b7e190c4dd4;hb=10f322ce20600de109c4643967b6ce3f61f69bf6;hpb=6f0e6cbece7e1b1a3c6b43d19eb2f29088af981c

diff --git a/src/Main.hs b/src/Main.hs
index 373d423..88ba39c 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ScopedTypeVariables, RecordWildCards #-}
+{-# LANGUAGE DoAndIfThenElse #-}
 module Main
 where
 
@@ -6,19 +6,12 @@ import System.IO (
   Handle,
   IOMode (WriteMode),
   openBinaryFile,
-  stdout
-  )
-import Text.XML.HXT.Core
+  stdout)
 
-import CommandLine (Args(..), apply_args)
-import LWN.Page
+import CommandLine (show_help)
+import Configuration (Cfg(..), get_cfg)
+import LWN.Page (epublish, page_from_url)
 
-my_read :: String -> IOStateArrow s b XmlTree
-my_read =
-  readDocument [ withValidate  no,
-                 withParseHTML yes,
-                 withInputEncoding utf8,
-                 withWarnings no ]
 
 -- | If we're given an empty path, return a handle to
 --   'stdout'. Otherwise, open the given file and return a read/write
@@ -31,24 +24,14 @@ get_output_handle path =
     openBinaryFile path WriteMode
 
 
--- | Convert the given article to either a URL or a filesystem
---   path. If the given article exists on the filesystem, we assume
---   it's a file. Otherwise, we check to see if it's a URL. Failing
---   that, we try to construct a URL from what we're given and do our
---   best.
-real_article_path :: String -> IO String
-real_article_path = return . id
-
 main :: IO ()
 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
-
-  case result of
-    Just stuff  -> epublish stuff output_handle
-    Nothing     -> return ()
-
-  putStrLn "Done."
+  cfg <- get_cfg
+  page <- page_from_url cfg (article cfg)
+  case page of
+    Just p -> do
+      output_handle <- get_output_handle (output cfg)
+      epublish p output_handle
+    Nothing -> do
+      _ <- show_help
+      return ()