X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Flwn-epub.git;a=blobdiff_plain;f=src%2FMain.hs;h=47c69fa1cba9ade063d2b63bea22fe800b33a4e9;hp=655f1bef40c0680bda2c98e2d4ae9bc6f06c2cd8;hb=ebedcdb6b1b8925dcfb5700d076f25743fac8645;hpb=6789361c1ee570df06878535aff73d99b87528a5

diff --git a/src/Main.hs b/src/Main.hs
index 655f1be..47c69fa 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -3,7 +3,7 @@ module Main
 where
 
 import Prelude hiding (readFile)
-import System.Directory(doesFileExist)
+import System.Directory (doesFileExist)
 import System.IO (
   Handle,
   IOMode (WriteMode),
@@ -11,10 +11,14 @@ import System.IO (
   stdout
   )
 import System.IO.UTF8 (readFile)
+import Text.Regex.Posix ((=~))
 import Text.XML.HXT.Core
 
-import CommandLine (Args(..), apply_args, show_help)
+import CommandLine (show_help)
+import Configuration (Cfg(..), get_cfg)
 import LWN.Page
+import LWN.URI (is_lwn_url, make_absolute_url)
+import Misc (contains)
 
 
 my_read_opts :: SysConfigList
@@ -51,17 +55,36 @@ 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
+real_article_path s = do
+  is_file <- doesFileExist s
+  return $ if is_file then s else check_cases
+  where
+    abs_current =
+      case make_absolute_url "current" of
+        Nothing -> s
+        Just ac -> ac
+    abs_s =
+      case make_absolute_url s of
+        Nothing -> s
+        Just as -> as
+
+    check_cases :: String
+    check_cases
+      | is_lwn_url s = s
+      | s `contains` "current" = abs_current
+      | s =~ "^[0-9]+$" = abs_s
+      | otherwise = s -- Give up
 
 main :: IO ()
 main = do
-  Args{..} <- apply_args
+  Cfg{..} <- get_cfg
   output_handle <- get_output_handle output
   maybe_html <- get_xml_from_article article
 
@@ -71,10 +94,10 @@ main = do
       result <- parse html
       case result of
         Just stuff  -> epublish stuff output_handle
-        Nothing     -> return ()
+        Nothing     -> do
+         _ <- show_help
+         return ()
 
     Nothing -> do
       _ <- show_help
       return ()
-
-  putStrLn "Done."