X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Flwn-epub.git;a=blobdiff_plain;f=src%2FLWN%2FHTTP.hs;h=a8a1980f273cfdc352911bb7bcd3b55b58137cdf;hp=71058dc67040b69da700e2744fe1daa796ae3607;hb=f3321e2ce7d7645ad562dc8f6620bfd561edc75d;hpb=96249c993a34237c6e6df772eb36858e70ce9b34

diff --git a/src/LWN/HTTP.hs b/src/LWN/HTTP.hs
index 71058dc..a8a1980 100644
--- a/src/LWN/HTTP.hs
+++ b/src/LWN/HTTP.hs
@@ -4,12 +4,11 @@ module LWN.HTTP
 where
 
 import qualified Data.ByteString as B (hPut)
-
+import qualified Data.Map as Map (Map, empty, insert)
 import Network.Curl (
   CurlCode(..),
   CurlOption(..),
   CurlResponse,
-  URLString,
   do_curl_,
   initialize,
   respBody,
@@ -21,9 +20,9 @@ import System.Directory (doesFileExist, getTemporaryDirectory)
 import System.IO (hClose, hPutStrLn, stderr)
 import System.IO.Temp (openBinaryTempFile, openTempFile)
 
-import LWN.URI (filename)
+import LWN.URI (URL, filename)
 
-login_url :: URLString
+login_url :: URL
 login_url = "https://lwn.net/login"
 
 username_field :: String
@@ -59,7 +58,7 @@ make_cookie_jar = do
   hClose out_handle -- We just want to create it for now.
   return out_path
 
-get_page :: Maybe FilePath -> URLString -> IO (Either String String)
+get_page :: Maybe FilePath -> URL -> IO (Either String String)
 get_page cookie_file url =
   withCurlDo $ do
     -- Create a curl instance.
@@ -143,7 +142,7 @@ log_in cookie_jar username password =
 --   We need to be able to parse the filename out of the URL
 --   so that when we stick our image in the document, the reader
 --   knows that type (jpg, png, etc.) it is.
-save_image :: URLString -> IO (Maybe FilePath)
+save_image :: URL -> IO (Maybe FilePath)
 save_image url = do
   it_exists <- doesFileExist url
   if it_exists then do
@@ -164,3 +163,22 @@ save_image url = do
           Right bs -> do
             B.hPut out_handle bs
             return $ Just out_path
+
+
+
+
+-- | Map absolute image URLs to local system file paths where the
+--   image referenced by the URL is stored.
+type ImageMap = Map.Map URL FilePath
+
+download_image_urls :: [URL] -> IO ImageMap
+download_image_urls image_urls = do
+  files <- mapM save_image image_urls
+  let pairs = zip image_urls files
+  return $ foldl my_insert empty_map pairs
+  where
+    empty_map = Map.empty :: ImageMap
+
+    my_insert :: ImageMap -> (URL, Maybe FilePath) -> ImageMap
+    my_insert dict (_, Nothing)  = dict
+    my_insert dict (k, Just v) = Map.insert k v dict