X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=cloogleirc.icl;h=9edcb80690dd5c939eedb963cce15dbecdc293f3;hp=3e89acc8f2d172f0810f6b8a7522ccca3f78f171;hb=1c65613d8732d28f6c6c11864ccbc761918ac594;hpb=73e3f056b86da6bd5ac20b0f14a28ac7f79512d1 diff --git a/cloogleirc.icl b/cloogleirc.icl index 3e89acc..9edcb80 100644 --- a/cloogleirc.icl +++ b/cloogleirc.icl @@ -1,40 +1,29 @@ module cloogleirc -import Cloogle -import GenPrint import StdEnv +import Control.Applicative +import Control.Monad => qualified join +import Data.Either +import Data.Error +import Data.Func import Data.Functor +import Data.List +import qualified Data.Map as DM import Data.Maybe -import Data.Either -from Data.Func import $, mapSt -from Text import class Text(..), instance Text String, instance + String - +import Data.Tuple import Internet.HTTP - -import Text.JSON - -import Text.URI +import System.CommandLine import System.Time +import Text +import Text.Encodings.UrlEncoding +import Text.GenJSON -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 Text.Encodings.UrlEncoding import urlEncode -import System.CommandLine -import Internet.HTTP -import Data.Error -import Data.List -import Data.Functor -import Data.Tuple +import Cloogle.API -import TCPIP import IRC import IRCBot -import StdMisc, StdDebug - shorten :: String *World -> (String, *World) shorten s w # s = if (startsWith "http://" s) s (if (startsWith "https://" s) s ("http://" + s)) @@ -56,7 +45,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 +56,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) @@ -86,6 +76,14 @@ 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) + processResult (ABCInstructionResult (br, re)) + = "ABC instruction: " +++ re.abc_instruction + processResult (ProblemResult pr) + = "Common problem: " +++ pr.problem_title + +++ "; see https://gitlab.science.ru.nl/cloogle/common-problems/blob/master/" +++ pr.problem_key +++ ".md" limitResults :: String -> String limitResults s @@ -107,17 +105,19 @@ cloogle data w Start :: *World -> (Maybe String, *World) Start w -# ([arg0:args], w) = getCommandLine w +# ([cmd:args], w) = getCommandLine w # (io, w) = stdio w -# io = io <<< "\n" -# bs = parseCLI args -//| isError bs = (Just $ "\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 -= (Nothing, w)//= (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 = [] @@ -125,7 +125,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" @@ -139,7 +139,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" @@ -151,9 +151,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 @@ -167,22 +167,23 @@ 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 - #! (io, w) = log strf " (r): " 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 strf pref m (io, w) #! (t, w) = localTime w - = (io <<< strfTime strf t <<< pref <<< toString m, w) + = (io <<< strfTime strf t <<< pref <<< toString m <<< "\n", w) process` :: (Maybe (Either IRCUser String)) IRCCommand *World -> (Maybe [IRCCommand], *World) process` (Just (Left user)) (PRIVMSG t m) w