Merge pull request #13 from clean-cloogle/pr-better-output

[cloogle-irc.git] / cloogleirc.icl

diff --git a/cloogleirc.icl b/cloogleirc.icl
index 980ea11..3e89acc 100644 (file)
--- a/cloogleirc.icl
+++ b/cloogleirc.icl
@@ -15,6 +15,7 @@ import Internet.HTTP
 import Text.JSON
 
 import Text.URI
+import System.Time
 
 import Control.Applicative
 import qualified Control.Monad as CM
@@ -32,8 +33,7 @@ import TCPIP
 import IRC
 import IRCBot
 
-TIMEOUT :== Just 10000
-SERVER :== "irc.freenode.net"
+import StdMisc, StdDebug
 
 shorten :: String *World -> (String, *World)
 shorten s w 
@@ -94,9 +94,7 @@ cloogle data w
                = join "\n" (map maxWidth lines)
                
                maxWidth :: String -> String
-               maxWidth s
-               | size s > 80 = subString 0 77 s + "..."
-               = s
+               maxWidth s = if (size s > 80) (subString 0 77 s + "...") s
 
 :: BotSettings =
                { bs_nick     :: String
@@ -104,15 +102,19 @@ cloogle data w
                , bs_autojoin :: [String]
                , bs_port     :: Int
                , bs_server   :: String
+               , bs_strftime :: String
                }
 
-Start :: *World -> (MaybeErrorString (), *World)
+Start :: *World -> (Maybe String, *World)
 Start w
 # ([arg0:args], w) = getCommandLine w
+# (io, w) = stdio w
+# io = io <<< "\n"
 # bs = parseCLI args 
-| isError bs = (Error $ "\n" +++ fromError bs +++ "\n", w)
+//| isError bs = (Just $ "\n" +++ fromError bs +++ "\n", snd $ fclose io w)
 # (Ok bs) = bs
-= bot (bs.bs_server, bs.bs_port) (startup bs) shutdown () process w
+# (merr, io, w) = bot (bs.bs_server, bs.bs_port) (startup bs) shutdown io (process bs.bs_strftime) w
+= (Nothing, w)//= (merr, snd $ fclose io w)
        where
                parseCLI :: [String] -> MaybeErrorString BotSettings
                parseCLI [] = Ok
@@ -121,8 +123,11 @@ Start w
                        , bs_autojoin = []
                        , bs_port     = 6667
                        , bs_server   = "irc.freenode.net"
+                       , bs_strftime = "%s"
                        }
                parseCLI [a:as]
+               | a == "-f" || a == "--strftime"
+                       = arg1 "--strftime" as \a c->{c & bs_strftime=a}
                | a == "-n" || a == "--nick"
                        = arg1 "--nick" as \a c->{c & bs_nick=a}
                | a == "-ns" || a == "--nickserv"
@@ -132,10 +137,11 @@ Start w
                | a == "-p" || a == "--port"
                        = arg1 "--port" as \a c->{c & bs_port=toInt a}
                | a == "-s" || a == "--server"
-                       = arg1 "--port" as \a c->{c & bs_server=a}
+                       = arg1 "--server" as \a c->{c & bs_server=a}
                | a == "-h" || a == "--help" = Error $ join "\n" $
                        [ "Usage: cloogle [OPTS]"
                        , "Options:"
+                       , "\t--strftime/-f FORMAT   strftime format used in the output. default: %s\n"
                        , "\t--nick/-n NICKNAME     Use the given nickname instead of clooglebot"
                        , "\t--nickserv/-ns PW      Identify via the given password with NickServ"
                        , "\t--port/-p PORT         Use the given port instead of port 6667"
@@ -161,12 +167,22 @@ Start w
                                [JOIN (CSepList bs.bs_autojoin) Nothing]
                shutdown = map toPrefix [QUIT $ Just "Bye"]
 
-               process :: IRCMessage () *World -> (Maybe [IRCMessage], (), *World)
-               process im s w = case im.irc_command of
-                       Left numr = (Just [], (), w)
+               process :: String !IRCMessage *File !*World -> (Maybe [IRCMessage], *File, !*World)
+               process strf im io w
+               #! (io, w) = log strf " (r): " im (io, w)
+               = case im.irc_command of
+                       Left numr = (Just [], io, w)
                        Right cmd = case process` im.irc_prefix cmd w of
-                               (Nothing, w) = (Nothing, (), w)
-                               (Just cs, w) = (Just $ map toPrefix cs, (), w)
+                               (Nothing, w) = (Nothing, io, w)
+                               (Just cs, w)
+                               # msgs = map toPrefix cs
+                               #! (io, w) = foldr (log strf " (s): ") (io, w) msgs
+                               = (Just msgs, io, w)
+
+               log :: String String IRCMessage (!*File, !*World) -> (!*File, !*World)
+               log strf pref m (io, w)
+               #! (t, w) = localTime w
+               = (io <<< strfTime strf t <<< pref <<< toString m, w)
 
                process` :: (Maybe (Either IRCUser String)) IRCCommand *World -> (Maybe [IRCCommand], *World)
                process` (Just (Left user)) (PRIVMSG t m) w