Infinity/Plugins/Check.hs Infinity/Plugins/Unlambda.hs util/Unlambda.hs @@ -9,9 +9,9 @@ import Data.List -- | This represents the different types of information -- that can come from IRC over the wire. -data IrcLine = Cmd User Channel (Command,Maybe Args) -- ^ A command sent over the line - | Line User Channel String -- ^ A normal line of little significance - | Err String -- ^ An error occured in parsing. +data IrcLine = Cmd User Channel (Command,Maybe String) -- ^ A command sent over the line + | Line User Channel String -- ^ A normal line of little significance + | Err String -- ^ An error occured in parsing. deriving (Eq,Show) @@ -31,7 +31,7 @@ parseIRCmsg cprefix s = let cmd = (head . words) str' args = (tail . words) str' av = if null args then - Nothing else Just args in + Nothing else Just (unwords args) in (Cmd nick to (cmd,av)) else (Line nick to str') else (Line nick to str') Infinity/IRC.hs @@ -151,14 +151,16 @@ listener plugins rchan rebootvar x@(serv,handle) = infinity $ do let cmd' = tail cmd case av of Nothing -> irclog (C.address serv) (u,c,cmd) - Just s -> irclog (C.address serv) (u,c,cmd++" "++(unwords s)) + Just s -> irclog (C.address serv) (u,c,cmd++" "++s) unless (null cmd') $ do let ctx = IContext serv handle (str,plugins') <- runplugin ctx plugins cmd' av +#ifdef DEBUG + logs Normal $ "Output of \'"++cmd'++"\', with args \'"++(show av)++"\': "++str +#endif privmsg handle c str irclog (C.address serv) ((C.nickname serv),c,str) - -- Loops a function forever infinity a = a >> forever a Infinity/Main.hs @@ -12,7 +12,6 @@ module Infinity.Plugins ( -- $pfuncs ircPrivmsg, runProc, - runUtil, -- $plugactions findplugin, runplugin, saveplugin, @@ -77,10 +76,10 @@ class (Binary st, Show st) => Plugin a st | a -> st where exec :: a -- ^ Phantom -> st -- ^ State -> String -- ^ Command - -> Maybe [String] -- ^ Arguments + -> Maybe String -- ^ Argument -> IPluginT (st,String) -- ^ Return string - + serial _ = False -- $pfunc -- These are functions that are available to plugins @@ -104,16 +103,6 @@ runProc :: FilePath -- ^ Executable name runProc f av str = io (run f av str) --- | Runs a utility process that resides in --- utils/ of the infinity source tree. -runUtil :: FilePath -- ^ Name of utility process - -> [String] -- ^ Command line parameters - -> Maybe String -- ^ Any input - -> IPluginT (String,String) -- ^ Command output and output from stderr, respectively -runUtil file = runProc ("utils" </> file) - - - -- $plugactions @@ -144,7 +133,7 @@ saveplugin (IModule (p,st,_)) = when (serial p) $ putState (show p) st runplugin :: IContext -- ^ Execution context -> [IModule] -- ^ List of plugins -> String -- ^ Command name - -> Maybe [String] -- ^ Arguments + -> Maybe String -- ^ Arguments -> IO (String,[IModule]) runplugin ctx mods cmd av = do case (findplugin mods cmd) of Infinity/Plugins.hs @@ -7,13 +7,12 @@ data Fortune = Fortune deriving (Eq,Show) instance Plugin Fortune () where - serial _ = False - pinit _ = () - cmds _ = ["fortune"] - + pinit _ = () + cmds _ = ["fortune"] help _ "fortune" = "prints a random fortune" exec _ _ "fortune" _ = do - (o,_) <- runProc "fortune" ["-s"] Nothing - let s = map (\x -> if isControl x then ' ' else x) o + (o,e) <- runProc "fortune" ["-s"] Nothing + let s = clean $ if (null e) then o else e return ((), s) + where clean = map (\x -> if isControl x then ' ' else x) Infinity/Plugins/Fortune.hs @@ -6,7 +6,6 @@ data HelloWorld = HelloWorld deriving (Eq,Show) instance Plugin HelloWorld () where - serial _ = False pinit _ = () cmds _ = ["hi","bye"] Infinity/Plugins/HelloWorld.hs @@ -25,4 +25,4 @@ instance Plugin StateTest ST where exec _ x@(ST s) "get" _ = return (x,s) exec _ x "put" Nothing = return (x,"I need some data...") - exec _ _ "put" (Just x) = return (ST (unwords x),"Done") + exec _ _ "put" (Just x) = return (ST x,"Done") Infinity/Plugins/StateTest.hs @@ -3,7 +3,7 @@ module Infinity.Util ( unlessM, whenM, mkdate, mktime, mkdir, ci, run, -- * Types - User, Channel, Command, Args, Nick, Cmds + User, Channel, Command, Nick, Cmds ) where import Data.List import System.IO @@ -20,7 +20,6 @@ type Nick = String type User = String type Channel = String type Command = String -type Args = [String] type Cmds = [String] -- | Runs an executable program, returning output and anything from stderr Infinity/Util.hs @@ -9,8 +9,14 @@ import System.Info import System.Exit import List -bin = "infinity" -- files to remove -dirs = [".","Tests","Infinity","Infinity" </> "Plugins"] -- directories to clean +inf = "infinity" +bins = [inf] ++ + ["util" </> "unlambda"] -- files to remove +dirs = [ "." + , "Tests" + , "util" + , "Infinity" + , "Infinity" </> "Plugins"] -- directories to clean main = defaultMainWithHooks $ defaultUserHooks { runTests = tests, @@ -21,11 +27,11 @@ main = defaultMainWithHooks $ defaultUserHooks { tests _ _ _ _ = P.main copyInfinity _ _ _ _ = do - copyFile (joinPath ["dist","build","infinity",bin]) bin + copyFile (joinPath ["dist","build","infinity",inf]) inf ignore (createDirectory "Log" >> createDirectory "State") cleanInfinity _ _ _ _ = do - ignore (removeFile bin) + mapM_ (ignore . removeFile) bins mapM_ clean dirs where clean d = getDirectoryContents d >>= mapM_ (check d) Setup.hs @@ -36,7 +36,7 @@ flag debug description: Enables static build with code coverage and debug output default: False - +-- the bot executable executable infinity main-is: Main.hs build-depends: binary >= 0.4, filepath, irc >= 0.4, base, @@ -62,3 +62,10 @@ executable infinity ghc-options: -DSTATIC_BUILD else build-depends: plugins >= 1.1 + +-- utilities +-- unlambda +executable unlambda + main-is: util/Unlambda.hs + build-depends: base >= 3.0.1.0 + ghc-options: -o util/unlambda infinity.cabal 378c87fdaf5f4264f025d0090b4f1819ee7f9fde Austin Seipp austin@youareinferior.net http://github.com/thoughtpolice/infinity/commit/d85a67a21dc4a858c1ac846e0c008cab0c20b29b d85a67a21dc4a858c1ac846e0c008cab0c20b29b 2008-01-18T14:36:30-08:00 2008-01-18T14:36:30-08:00 Added Unlambda plugin from Lambdabot Also I changed around the inner structure of plugin types a little, now plugins just get a single string for their command arguments rather than [String] 4b9006b2b2e76c03493efa85c56b3c1cd3e56ea5 Austin Seipp austin@youareinferior.net