X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=6b18c8646d311bdcaef94042561299f1a5836241;hb=52e788e676ea2a67ad20b23d2e5c5b351f27b834;hp=12cd00268bf60444faf2d7449dd2cd5ed4866a3f;hpb=49c23c133221c9686dde0d52d06904db8d048724;p=dead%2Fhtsn.git

diff --git a/src/Main.hs b/src/Main.hs
index 12cd002..6b18c86 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -28,7 +28,6 @@ import System.IO (
   stderr,
   stdout )
 import System.IO.Error (catchIOError)
-import System.Log.Logger ( getLogger, rootLoggerName, saveGlobalLogger )
 import System.Timeout (timeout)
 
 import CommandLine (get_args)
@@ -46,18 +45,52 @@ import Logging (
 import qualified OptionalConfiguration as OC (
   OptionalConfiguration(..),
   from_rc )
-import Terminal (putGreenLn)
+import Terminal (
+  display_debug,
+  display_error,
+  display_info,
+  display_sent,
+  display_warning )
 import TSN.FeedHosts (FeedHosts(..))
 import TSN.Xml (parse_xmlfid, xml_prologue)
 
 
+-- | Warning! This does not automatically append a newline. The output
+-- is displayed/logged as-is, for, you know, debug purposes.
+report_debug :: String -> IO ()
+report_debug s = do
+  display_debug s
+  log_debug s
+
+report_error :: String -> IO ()
+report_error s = do
+  display_error $ "ERROR: " ++ s
+  log_error s
+
+report_info :: String -> IO ()
+report_info s = do
+  display_info s
+  log_info s
+
+-- | Warning! This does not automatically append a newline.
+report_sent :: String -> IO ()
+report_sent s = do
+  display_sent s
+  log_debug s
+
+report_warning :: String -> IO ()
+report_warning s = do
+  display_warning $ "WARNING: " ++ s
+  log_warning s
+
+
 -- | Receive a single line of text from a Handle, and send it to the
 --   debug log.
 --
 recv_line :: Handle -> IO String
 recv_line h = do
   line <- hGetLine h
-  log_debug line
+  report_debug (line ++ "\n")
   return line
 
 
@@ -72,14 +105,14 @@ save_document :: Configuration -> String -> IO ()
 save_document cfg doc =
   case maybe_path of
     Nothing ->
-      log_error "Document missing XML_File_ID element."
+      report_error "Document missing XML_File_ID element."
     Just path -> do
       already_exists <- doesFileExist path
       when already_exists $ do
         let msg = "File " ++ path ++ " already exists, overwriting."
-        log_warning msg
+        report_warning msg
       writeFile path doc
-      log_info $ "Wrote file: " ++ path ++ "."
+      report_info $ "Wrote file: " ++ path ++ "."
   where
     xmlfid = fmap show (parse_xmlfid doc)
     filename = fmap (++ ".xml") xmlfid
@@ -102,9 +135,9 @@ loop !cfg !h !buffer = do
     -- of its lines into one big string.
     let document = concat $ reverse buffer
     save_document cfg document
-    loop cfg h [line] -- empty the buffer before looping again
+    loop cfg h [line] -- Empty the buffer before looping again.
   else
-    -- append line to the head of the buffer and loop
+    -- Append line to the head of the buffer and loop.
     loop cfg h (line : buffer)
 
 
@@ -113,13 +146,13 @@ log_in cfg h = do
   prompt1 <- recv_prompt h
 
   if prompt1 /= username_prompt then
-    log_error "Didn't receive username prompt."
+    report_error "Didn't receive username prompt."
   else do
     send_line h (username cfg)
     prompt2 <- recv_prompt h
 
     if prompt2 /= password_prompt then
-      log_error "Didn't receive password prompt."
+      report_error "Didn't receive password prompt."
     else do
       send_line h (password cfg)
       _ <- recv_line h -- "The Sports Network"
@@ -130,21 +163,23 @@ log_in cfg h = do
 
     send_line :: Handle -> String -> IO ()
     send_line h' s = do
-      hPutStr h' (s ++ "\r\n")
-      putGreenLn s
+      let line = s ++ "\r\n"
+      hPutStr h' line
+      display_sent line
 
     recv_chars :: Int -> Handle -> IO String
     recv_chars n h' = do
       s <- sequence [ hGetChar h' | _ <- [1..n] ]
-      putStr s
+      report_debug s
       return s
 
     recv_prompt :: Handle -> IO String
     recv_prompt = recv_chars 10
 
+
 connect_and_loop :: Configuration -> String -> IO ()
 connect_and_loop cfg host = do
-  log_info $ "Connecting to " ++ host ++ "..."
+  report_info $ "Connecting to " ++ host ++ "..."
   bracket acquire_handle release_handle action
   return ()
   where
@@ -168,7 +203,7 @@ connect_and_loop cfg host = do
       --
       login_worked <- timeout five_seconds $ log_in cfg h
       case login_worked of
-        Nothing -> log_info "Login timed out (5s)."
+        Nothing -> report_info "Login timed out (5s)."
         Just _ ->  loop cfg h []
 
 
@@ -184,10 +219,6 @@ thread_sleep seconds = do
 -- | The entry point of the program.
 main :: IO ()
 main = do
-  init_logging
-  root_logger <- getLogger rootLoggerName
-  saveGlobalLogger root_logger
-
   rc_cfg <- OC.from_rc
   cmd_cfg <- get_args
 
@@ -195,26 +226,30 @@ main = do
   -- prefering the command-line ones.
   let opt_config = rc_cfg <> cmd_cfg
 
-  -- This is necessary because if the user specifies an empty list of
+  -- Update a default config with any options that have been set in
+  -- either the config file or on the command-line.  We initialize
+  -- logging before the missing parameter checks below so that we can
+  -- log the errors.
+  let cfg = (def :: Configuration) `merge_optional` opt_config
+  init_logging (syslog cfg)
+
+  -- Check the optional config for missing required options. This is
+  -- necessary because if the user specifies an empty list of
   -- hostnames in e.g. the config file, we want to bail rather than
-  -- fall back on the default list (which gets merged from a
-  -- Configuration below).
+  -- fall back on the default list (which was merged from a default
+  -- Configuration above).
   when (null $ get_feed_hosts (OC.feed_hosts opt_config)) $ do
-    log_error "No feed hosts supplied."
+    report_error "No feed hosts supplied."
     exitWith (ExitFailure exit_no_feed_hosts)
 
   when (isNothing (OC.password opt_config)) $ do
-    log_error "No password supplied."
+    report_error "No password supplied."
     exitWith (ExitFailure exit_no_password)
 
   when (isNothing (OC.username opt_config)) $ do
-    log_error "No username supplied."
+    report_error "No username supplied."
     exitWith (ExitFailure exit_no_username)
 
-  -- Finally, update a default config with any options that have been
-  -- set in either the config file or on the command-line.
-  let cfg = (def :: Configuration) `merge_optional` opt_config
-
   -- This may be superstition (and I believe stderr is unbuffered),
   -- but it can't hurt.
   hSetBuffering stderr NoBuffering
@@ -234,6 +269,6 @@ main = do
     round_robin cfg feed_host_idx = do
       let hosts = get_feed_hosts $ feed_hosts cfg
       let host = hosts !! feed_host_idx
-      catchIOError (connect_and_loop cfg host) (log_error . show)
+      catchIOError (connect_and_loop cfg host) (report_error . show)
       thread_sleep 10 -- Wait 10s before attempting to reconnect.
       round_robin cfg $ (feed_host_idx + 1) `mod` (length hosts)