X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=cloogleirc.icl;h=05aaa7d24e9f2ba0734814982173a6b8ce00a201;hp=980ea11564f9dc61a8511bef04cab7510c2ec5ca;hb=6074fc23351ac06daad779b3ac6c09a36590de24;hpb=708f2d439b306fe546e86e1a5a65c4081a1a2677

diff --git a/cloogleirc.icl b/cloogleirc.icl
index 980ea11..05aaa7d 100644
--- a/cloogleirc.icl
+++ b/cloogleirc.icl
@@ -15,11 +15,12 @@ import Internet.HTTP
 import Text.JSON
 
 import Text.URI
+import System.Time
 
 import Control.Applicative
 import qualified Control.Monad as CM
 import qualified Data.Map as DM
-from Control.Monad import class Monad, instance Monad Maybe, >>=
+from Control.Monad import class Monad(bind), instance Monad Maybe, >>=
 from Text.Encodings.UrlEncoding import urlEncode
 import System.CommandLine
 import Internet.HTTP
@@ -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 
@@ -56,7 +56,7 @@ shorten s w
 
 cloogle :: String *World -> (String, *World)
 cloogle data w
-# (mer, w) = doHTTPRequestL
+# (mer, w) = doHTTPRequestFollowRedirects
 		{ newHTTPRequest
 		& req_path = "/api.php"
 		, req_query = "?str=" + urlEncode data
@@ -67,6 +67,7 @@ cloogle data w
 # resp = fromOk mer
 = case fromJSON $ fromString resp.HTTPResponse.rsp_data of
 	Nothing = ("couldn't parse json", w)
+	Just {return=127} = ("No results for " + data, w)
 	Just clr = ("Results for " + data + " -- https://cloogle.org/#" +
 		replaceSubString "+" "%20" (urlEncode data) + "\n" +
 		processResults clr, w)
@@ -94,9 +95,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 +103,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
+= (merr, snd $ fclose io w)
 	where
 		parseCLI :: [String] -> MaybeErrorString BotSettings
 		parseCLI [] = Ok
@@ -121,8 +124,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 +138,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 +168,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