Final cleanups to get the download working.

[dead/lwn-epub.git] / src / LWN / HTTP.hs

diff --git a/src/LWN/HTTP.hs b/src/LWN/HTTP.hs
index 3793f10ae7470966d5b1526bcdf435af05f6fb5a..71058dc67040b69da700e2744fe1daa796ae3607 100644 (file)
--- a/src/LWN/HTTP.hs
+++ b/src/LWN/HTTP.hs
@@ -14,7 +14,7 @@ import Network.Curl (
   initialize,
   respBody,
   respCurlCode,
-  withCurlDo               
+  withCurlDo
   )
 import Network.Curl.Download (openURI)
 import System.Directory (doesFileExist, getTemporaryDirectory)
@@ -44,11 +44,11 @@ default_curl_opts =
     -- And we don't want to use a DNS cache anyway.
     CurlDNSCacheTimeout 0,
 
-    -- Give it a little time...
-    CurlTimeout 45,
+    -- Follow redirects.
+    CurlFollowLocation True,
 
-    -- And let us know when things go wrong.
-    CurlVerbose True ]
+    -- Give it a little time...
+    CurlTimeout 45 ]
 
 
 make_cookie_jar :: IO FilePath
@@ -59,8 +59,8 @@ make_cookie_jar = do
   hClose out_handle -- We just want to create it for now.
   return out_path
 
-get_page :: Maybe FilePath -> URLString -> IO (Maybe String)
-get_page cookie_jar url =
+get_page :: Maybe FilePath -> URLString -> IO (Either String String)
+get_page cookie_file url =
   withCurlDo $ do
     -- Create a curl instance.
     curl <- initialize
@@ -73,24 +73,25 @@ get_page cookie_jar url =
     -- Pull out the response code as a CurlCode.
     let code = respCurlCode resp
 
-    case code of
-      CurlOK -> return $ Just (respBody resp)
-      error_code -> do
-        hPutStrLn stderr ("HTTP Error: " ++ (show error_code))
+    return $
+      case code of
+        CurlOK -> Right (respBody resp)
+        error_code -> Left ("HTTP Error: " ++ (show error_code))
         -- If an error occurred, we want to dump as much information as
         -- possible. If this becomes a problem, we can use respGetInfo to
         -- query the response object for more information
-        return Nothing
   where
     get_opts =
-      case cookie_jar of
+      case cookie_file of
         Nothing -> []
-        Just cookies -> [ CurlCookieJar cookies ]
+        Just cookies -> [ CurlCookieFile cookies ]
 
     curl_opts = default_curl_opts ++ get_opts
 
 
-log_in :: FilePath -> String -> String -> IO Bool
+-- | Log in using curl. Store the resulting session cookies in the
+--   supplied file.
+log_in :: FilePath -> String -> String -> IO (Either String String)
 log_in cookie_jar username password =
   withCurlDo $ do
     -- Create a curl instance.
@@ -104,14 +105,13 @@ log_in cookie_jar username password =
     -- Pull out the response code as a CurlCode.
     let code = respCurlCode resp
 
-    case code of
-      CurlOK -> return True
-      error_code -> do
-        hPutStrLn stderr ("HTTP Error: " ++ (show error_code))
+    return $
+      case code of
+        CurlOK -> Right (respBody resp)
+        error_code -> Left $ "HTTP Error: " ++ (show error_code)
         -- If an error occurred, we want to dump as much information as
         -- possible. If this becomes a problem, we can use respGetInfo to
         -- query the response object for more information
-        return False
   where
     post_submit :: String
     post_submit = submit_field ++ "=Log+In"