Add trailing slashes to URLs.

[dead/lwn-epub.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index 8ab82b94409e25b28d2856dc9b7d6482c304d164..f0e81f76478bab18ec4bf625a474c036ec29f467 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,20 +1,32 @@
-{-# LANGUAGE ScopedTypeVariables, RecordWildCards #-}
+{-# LANGUAGE DoAndIfThenElse #-}
 module Main
 where
 
+import Control.Monad (when)
+import Data.Maybe (fromJust)
 import Prelude hiding (readFile)
-import System.Directory(doesFileExist)
+import System.Directory (doesFileExist)
 import System.IO (
   Handle,
   IOMode (WriteMode),
+  hPutStrLn,
   openBinaryFile,
+  stderr,
   stdout
   )
 import System.IO.UTF8 (readFile)
-import Text.XML.HXT.Core
+import Test.HUnit (Assertion, assertEqual)
+import Test.Framework (Test, testGroup)
+import Test.Framework.Providers.HUnit (testCase)
+import Text.Regex.Posix ((=~))
+import Text.XML.HXT.Core hiding (when)
 
-import CommandLine (Args(..), apply_args, show_help)
-import LWN.Page
+import CommandLine (show_help)
+import Configuration (Cfg(..), get_cfg, use_account)
+import LWN.HTTP (get_page, log_in, make_cookie_jar)
+import LWN.Page (epublish, parse)
+import LWN.URI (add_trailing_slash, is_lwn_url, make_absolute_url, make_https)
+import Misc (contains)
 
 
 my_read_opts :: SysConfigList
@@ -28,17 +40,39 @@ 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
+get_xml_from_article :: Cfg -> IO (Maybe (IOStateArrow s b XmlTree))
+get_xml_from_article cfg = do  
+  my_article <- real_article_path (article cfg)
+  is_file <- doesFileExist my_article
   case is_file of
     True -> do
-      contents <- readFile article
+      contents <- readFile my_article
       return $ Just $ my_read contents
     False -> do
       -- Download the URL and try to parse it.
-      return Nothing
+      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)
+        when (not li_result) $ do
+          hPutStrLn stderr "Failed to log in."
+
+        html <- get_page (Just cj) my_article
+        print $ fromJust $ html
+        return $
+          case html of
+            Nothing -> Nothing
+            Just h  -> Just $ my_read h
+      else do
+        html <- get_page Nothing my_article
+        putStrLn "Not logged in."
+        print $ fromJust $ html
+        return $
+          case html of
+            Nothing -> Nothing
+            Just h  -> Just $ my_read h
 
 -- | If we're given an empty path, return a handle to
 --   'stdout'. Otherwise, open the given file and return a read/write
@@ -51,22 +85,44 @@ 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 add_trailing_slash check_cases
+  where
+    abs_current =
+      case make_absolute_url "current" of
+        Nothing -> s
+        Just ac -> ac
+    abs_article =
+      case make_absolute_url ("Articles/" ++ s) of
+        Nothing -> s
+        Just as -> as
+
+    check_cases :: String
+    check_cases
+      | is_lwn_url s = make_https s
+      | s `contains` "current" = abs_current
+      | s =~ "^[0-9]+$" = abs_article
+      | otherwise = s -- Give up
 
 main :: IO ()
 main = do
-  Args{..} <- apply_args
-  output_handle <- get_output_handle output
-  maybe_html <- get_xml_from_article article
+  cfg <- get_cfg
+  output_handle <- get_output_handle (output cfg)
 
-  case maybe_html of
+  when (use_account cfg) $ do
+    putStrLn "Using account."
 
+  maybe_html <- get_xml_from_article cfg
+
+  case maybe_html of
     Just html -> do
       result <- parse html
       case result of
@@ -78,3 +134,37 @@ main = do
     Nothing -> do
       _ <- show_help
       return ()
+
+
+test_current_article_path :: Assertion
+test_current_article_path = do
+  let expected = "https://lwn.net/current/"
+  actual <- real_article_path "current"
+  assertEqual "Current article path constructed" expected actual
+
+test_numbered_article_path :: Assertion
+test_numbered_article_path = do
+  let expected = "https://lwn.net/Articles/69/"
+  actual <- real_article_path "69" -- I'm twelve
+  assertEqual "Numbered article path constructed" expected actual
+
+
+test_full_article_path :: Assertion
+test_full_article_path = do
+  let expected = "https://lwn.net/Articles/502979/"
+  actual <- real_article_path "https://lwn.net/Articles/502979/"
+  assertEqual "Full article path left alone" expected actual
+
+test_non_https_article_path :: Assertion
+test_non_https_article_path = do
+  let expected = "https://lwn.net/Articles/502979/"
+  actual <- real_article_path "http://lwn.net/Articles/502979/"
+  assertEqual "Non-https URL made https" expected actual
+
+main_tests :: Test
+main_tests =
+  testGroup "Main Tests" [
+    testCase "Current article path constructed" test_current_article_path,
+    testCase "Numbered article path constructed" test_numbered_article_path,
+    testCase "Full article path left alone" test_full_article_path,
+    testCase "Non-https URL made https" test_non_https_article_path ]