Continue rewriting, found a problem in the way I kill plugins.
This commit is contained in:
parent
fd8d5faf5f
commit
416460886d
9 changed files with 48 additions and 25 deletions
|
@ -3,6 +3,7 @@ module Plugins.Core
|
|||
) where
|
||||
|
||||
import Control.Concurrent.Chan
|
||||
import Control.Monad.State
|
||||
|
||||
import Hsbot.IRCPlugin
|
||||
import Hsbot.Types
|
||||
|
@ -18,9 +19,9 @@ mainCore serverChan chan = do
|
|||
-- | The IrcPlugin monad main function
|
||||
run :: IrcPlugin ()
|
||||
run = do
|
||||
mapM_ sendRegisterCommand ["load", "unload"]
|
||||
mapM_ sendRegisterCommand ["load", "reload", "unload"]
|
||||
runPlugin
|
||||
mapM_ sendUnregisterCommand ["load", "unload"]
|
||||
mapM_ sendUnregisterCommand ["load", "reload", "unload"]
|
||||
|
||||
runPlugin :: IrcPlugin ()
|
||||
runPlugin = forever $ do
|
||||
|
@ -33,6 +34,7 @@ runPlugin = forever $ do
|
|||
"RUN" -> let stuff = words $ intCmdMsg intCmd
|
||||
in case head stuff of
|
||||
"load" -> loadPlugin $ tail stuff
|
||||
"reload" -> reloadPlugin $ tail stuff
|
||||
"unload" -> unloadPlugin $ tail stuff
|
||||
_ -> lift $ trace $ show intCmd -- TODO : help message
|
||||
_ -> lift $ trace $ show intCmd
|
||||
|
@ -43,6 +45,10 @@ runPlugin = forever $ do
|
|||
loadPlugin :: [String] -> IrcPlugin ()
|
||||
loadPlugin pluginNames = mapM_ (sendCommand "LOAD" "CORE") pluginNames
|
||||
|
||||
-- | The reload command
|
||||
reloadPlugin :: [String] -> IrcPlugin ()
|
||||
reloadPlugin pluginNames = mapM_ (sendCommand "RELOAD" "CORE") pluginNames
|
||||
|
||||
-- | The unload command
|
||||
unloadPlugin :: [String] -> IrcPlugin ()
|
||||
unloadPlugin pluginNames = mapM_ (sendCommand "UNLOAD" "CORE") pluginNames
|
||||
|
|
|
@ -28,8 +28,9 @@ type QuoteBot a = StateT QuoteDB IO a
|
|||
mainQuote :: Chan BotMsg -> Chan BotMsg -> IO ()
|
||||
mainQuote serverChan chan = do
|
||||
let plugin = PluginInstance "Quote" serverChan chan
|
||||
(runStateT run plugin) `catch` (const $ return ((), plugin))
|
||||
return ()
|
||||
plugin' <- (execStateT run plugin) `catch` (const $ return plugin)
|
||||
putStrLn "graou"
|
||||
evalStateT stop plugin'
|
||||
|
||||
-- | The IrcPlugin monad main function
|
||||
run :: IrcPlugin ()
|
||||
|
@ -37,6 +38,9 @@ run = do
|
|||
-- TODO : init quote handling (sqlite + structure to handle temporary stuff)
|
||||
sendRegisterCommand "quote"
|
||||
runPlugin
|
||||
|
||||
stop :: IrcPlugin ()
|
||||
stop = do
|
||||
sendUnregisterCommand "quote"
|
||||
-- TODO : send cancel messages for all temporary stuff
|
||||
|
||||
|
|
Reference in a new issue