From 455b18bc1044d8f4cfb0d99c19f9f38955d00d00 Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Wed, 21 Apr 2010 21:01:07 +0200
Subject: Removed all the dynamic module loading stuff.

---
 Hsbot/Plugin.hs | 62 +++++++++++++--------------------------------------------
 1 file changed, 14 insertions(+), 48 deletions(-)

(limited to 'Hsbot/Plugin.hs')

diff --git a/Hsbot/Plugin.hs b/Hsbot/Plugin.hs
index 63d8256..34c6603 100644
--- a/Hsbot/Plugin.hs
+++ b/Hsbot/Plugin.hs
@@ -1,68 +1,35 @@
 module Hsbot.Plugin
     ( loadPlugin
     , sendToPlugin
-    , reloadPlugin
     , unloadPlugin
     ) where
 
 import Control.Concurrent
-import Control.Concurrent.Chan
+import Control.Concurrent.Chan()
 import Control.Exception
 import Control.Monad.State
 import qualified Data.Map as M
-import Data.Maybe
-import System.IO
-import System.Plugins
+import Data.Maybe()
+import System.IO()
 
 import Hsbot.Types
 import Hsbot.Utils
 
--- TODO : reload plugin, list plugins, etc
-
 -- | Loads a plugin into an ircBot
-loadPlugin :: String -> IrcBot ()
-loadPlugin name = do
+loadPlugin :: String -> (Chan BotMsg -> Chan BotMsg -> IO ()) -> IrcBot ()
+loadPlugin name entryPoint = do
     bot <- get
     let oldPlugins = botPlugins bot
-    if name `M.member` oldPlugins
-      then traceM $ inColor ("Can't load plugin \"" ++ name ++ "\", this identifier has already been registered.") [31] -- or a wait, smthg like that?
-      else do
-        plugin <- liftIO $ effectivelyLoadPlugin name (botChannel bot)
-        case plugin of
-            Just plugin' -> do
-                put $ bot { botPlugins = M.insert name plugin' oldPlugins}
-            Nothing -> return ()
+    plugin <- liftIO $ effectivelyLoadPlugin name entryPoint (botChannel bot)
+    put $ bot { botPlugins = M.insert name plugin oldPlugins}
 
 -- | Effectively try to load a plugin
-effectivelyLoadPlugin :: String -> Chan BotMsg -> IO (Maybe Plugin)
-effectivelyLoadPlugin name serverChan = do
-    -- TODO : test if Plugins/ ++ name ++ .hs exists
-    m <- liftIO $ makeAll ("Plugins/" ++ name ++ ".hs") ["-XScopedTypeVariables"]
-    plugin <- case m of
-        MakeSuccess _ _ -> do
-            ldstat <- load_ ("Plugins/" ++ name ++ ".o") [".","Hsbot","Hsbot/Plugins"] ("main" ++ name)
-            case ldstat of
-                LoadSuccess v entryPoint -> do
-                    putStrLn $ inColor ("Loaded plugin: " ++ name) [32]
-                    chan <- newChan :: IO (Chan BotMsg)
-                    threadId <- forkIO $ entryPoint serverChan chan
-                    return $ Just (Plugin name v threadId chan)
-                LoadFailure e -> do
-                    putStrLn $ inColor ("Couldn't load plugin: " ++ name) [31]
-                    mapM_ putStrLn e
-                    return Nothing
-        MakeFailure e -> do
-            putStrLn $ inColor ("FATAL: Couldn't compile plugin: " ++ name) [31]
-            mapM_ putStrLn e
-            return Nothing
-    return plugin
-
--- | Reloads a plugin
--- TODO : make it a safe reload (compile before unloading)
-reloadPlugin :: String -> IrcBot ()
-reloadPlugin name = do
-    unloadPlugin name
-    loadPlugin name
+effectivelyLoadPlugin :: String -> (Chan BotMsg -> Chan BotMsg -> IO ()) -> Chan BotMsg -> IO (Plugin)
+effectivelyLoadPlugin name entryPoint serverChan = do
+    putStrLn $ inColor ("Loaded (static) plugin: " ++ name) [32]
+    chan <- newChan :: IO (Chan BotMsg)
+    threadId <- forkIO $ entryPoint serverChan chan
+    return $ Plugin name threadId chan
 
 -- | Unloads a plugin
 unloadPlugin :: String -> IrcBot ()
@@ -73,9 +40,8 @@ unloadPlugin name = do
         Just plugin -> do
             let newPlugins = M.delete name oldPlugins
             liftIO $ throwTo (pluginThreadId plugin) UserInterrupt
-            liftIO $ unloadAll $ pluginModule plugin
             put $ bot { botPlugins = newPlugins }
-        Nothing -> return ()
+        Nothing     -> return ()
 
 -- | Sends a msg to a plugin
 sendToPlugin :: BotMsg -> Plugin -> IrcBot ()
-- 
cgit v1.2.3