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

diff --git a/src/Main.hs b/src/Main.hs
index 8ab82b9..88ba39c 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,45 +1,18 @@
-{-# LANGUAGE ScopedTypeVariables, RecordWildCards #-}
+{-# LANGUAGE DoAndIfThenElse #-}
 module Main
 where
 
-import Prelude hiding (readFile)
-import System.Directory(doesFileExist)
 import System.IO (
   Handle,
   IOMode (WriteMode),
   openBinaryFile,
-  stdout
-  )
-import System.IO.UTF8 (readFile)
-import Text.XML.HXT.Core
+  stdout)
 
-import CommandLine (Args(..), apply_args, show_help)
-import LWN.Page
+import CommandLine (show_help)
+import Configuration (Cfg(..), get_cfg)
+import LWN.Page (epublish, page_from_url)
 
 
-my_read_opts :: SysConfigList
-my_read_opts = [ withValidate  no,
-                 withParseHTML yes,
-                 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.
@@ -51,30 +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
-  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     -> do
-         _ <- show_help
-         return ()
-
+  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 ()