X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=cloogleirc.icl;h=534a57a2d4349d5fb950d90d463476c66869f83e;hp=3aa328ebb2060254565bd516d7877d6e3ba43b69;hb=38119fcb7be8437bc535665f20af8b641ee67e64;hpb=2b051d8c52d1d999a5ca902ef75f99635c80f540 diff --git a/cloogleirc.icl b/cloogleirc.icl index 3aa328e..534a57a 100644 --- a/cloogleirc.icl +++ b/cloogleirc.icl @@ -1,7 +1,7 @@ module cloogleirc import Cloogle -import GenPrint +import Text.GenPrint import StdEnv import Data.Functor @@ -12,7 +12,7 @@ from Text import class Text(..), instance Text String, instance + String import Internet.HTTP -import Text.JSON +import Text.GenJSON import Text.URI import System.Time @@ -20,7 +20,7 @@ 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), >>= from Text.Encodings.UrlEncoding import urlEncode import System.CommandLine import Internet.HTTP @@ -33,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 @@ -57,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 @@ -68,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) @@ -87,6 +87,9 @@ cloogle data w +++ toString (length class_funs) +++ " class functions" processResult (ModuleResult (br, _)) = "Module in " +++ br.library +++ ": " +++ br.modul + processResult (SyntaxResult (br, re)) + = "Clean syntax: " +++ re.syntax_title +++ "\n" + +++ concat (intersperse "; " re.syntax_code) limitResults :: String -> String limitResults s @@ -95,9 +98,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 @@ -108,18 +109,21 @@ cloogle data w , bs_strftime :: String } -//Start :: *World -> (MaybeErrorString (), *World) +Start :: *World -> (Maybe String, *World) Start w -# ([arg0:args], w) = getCommandLine w +# ([cmd:args], w) = getCommandLine w # (io, w) = stdio w -# bs = parseCLI args -| isError bs = (Error $ "\n" +++ fromError bs +++ "\n", snd $ fclose io w) +# bs = parseCLI cmd args +| isError bs + # io = io <<< fromError bs <<< "\n" + = (Nothing, snd $ fclose io w) # (Ok bs) = bs -# (merr, io, w) = bot (bs.bs_server, bs.bs_port) (startup bs) shutdown io (process bs.bs_strftime) w -= (maybe (Ok ()) Error merr, snd $ fclose io w) +# (_, w) = fclose io w +# (merr, _, w) = bot (bs.bs_server, bs.bs_port) (startup bs) shutdown () (process bs.bs_strftime) w += (merr, w) where - parseCLI :: [String] -> MaybeErrorString BotSettings - parseCLI [] = Ok + parseCLI :: String [String] -> MaybeErrorString BotSettings + parseCLI _ [] = Ok { bs_nick = "clooglebot" , bs_nickserv = Nothing , bs_autojoin = [] @@ -127,7 +131,7 @@ Start w , bs_server = "irc.freenode.net" , bs_strftime = "%s" } - parseCLI [a:as] + parseCLI cmd [a:as] | a == "-f" || a == "--strftime" = arg1 "--strftime" as \a c->{c & bs_strftime=a} | a == "-n" || a == "--nick" @@ -141,7 +145,7 @@ Start w | a == "-s" || a == "--server" = arg1 "--server" as \a c->{c & bs_server=a} | a == "-h" || a == "--help" = Error $ join "\n" $ - [ "Usage: cloogle [OPTS]" + [ "Usage: " + cmd + " [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" @@ -153,9 +157,9 @@ Start w , "\t has to be escaped in most shells" ] = Error $ "Unknown option: " +++ a - - arg1 name [] _ = Error $ name +++ " requires an argument" - arg1 name [a:as] f = parseCLI as >>= Ok o f a + where + arg1 name [] _ = Error $ name +++ " requires an argument" + arg1 name [a:as] f = parseCLI cmd as >>= Ok o f a nickserv pw = PRIVMSG (CSepList ["NickServ"]) $ "IDENTIFY " +++ pw @@ -169,29 +173,31 @@ Start w [JOIN (CSepList bs.bs_autojoin) Nothing] shutdown = map toPrefix [QUIT $ Just "Bye"] - //process :: String IRCMessage *File *World -> (Maybe [IRCMessage], *File, *World) - process strf im io w + process :: String !IRCMessage () !*World -> (Maybe [IRCMessage], (), !*World) + process strf im _ w + # (io ,w) = stdio w # (io, w) = log strf " (r): " im (io, w) + # (_, w) = fclose io w = case im.irc_command of - Left numr = (Just [], io, w) + Left numr = (Just [], (), w) Right cmd = case process` im.irc_prefix cmd w of - (Nothing, w) = (Nothing, io, w) + (Nothing, w) = (Nothing, (), w) (Just cs, w) # msgs = map toPrefix cs - # (io, w) = foldr (log strf " (s): ") (io, w) msgs - = (Just msgs, io, w) + = (Just msgs, (), w) - //log :: String String IRCMessage (*File, *World) -> (*File, *World) + 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) + #! (t, w) = localTime w + = (io <<< strfTime strf t <<< pref <<< toString m <<< "\n", w) - //process` :: (Maybe (Either IRCUser String)) IRCCommand *World -> (Maybe [IRCCommand], *World) + process` :: (Maybe (Either IRCUser String)) IRCCommand *World -> (Maybe [IRCCommand], *World) process` (Just (Left user)) (PRIVMSG t m) w | m == "!restart" = (Nothing, w) | m.[0] == '!' # (msgs, w) = realProcess (split " " $ m % (1, size m)) w = (Just $ map reply msgs, w) + | m % (0,4) == "\001PING" = (Just [reply m], w) = (Just [], w) where reply = case (\(CSepList [t:_]) -> t.[0]) t of @@ -200,7 +206,7 @@ Start w process` _ (PING t mt) w = (Just [PONG t mt], w) process` _ _ w = (Just [], w) - //realProcess :: [String] *World -> ([String], *World) + realProcess :: [String] *World -> ([String], *World) realProcess ["help",x:xs] w = ((case x of "help" = [ "Usage: !help [ARG]"