Fix script loading and unloading

diff --git a/acid/src/main/java/net/rizon/acid/core/Acidictive.java b/acid/src/main/java/net/rizon/acid/core/Acidictive.java
index 7cd01a54201a3ffad1bf22f5947991ed80debcfa..eb43ad2009ef920e42a50c4aa1b14c432c4c56ff 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/Acidictive.java
+++ b/acid/src/main/java/net/rizon/acid/core/Acidictive.java
@@ -351,7 +351,7 @@ public class Acidictive extends AcidCore
                                 */
                                if (!command.equalsIgnoreCase("help")
                                                && !recipient.startsWith("#"))
-                                       privmsg(conf.getChannelNamed("cmdlogchan"), x.getNick() + "->" + recipient + ": " + msg);
+                                       privmsg(conf.getChannelNamed("cmdlogchan"), x.getNick() + ": " + msg);
                        }
                        catch (Exception ex)
                        {

diff --git a/pyva/pyva.example.yml b/pyva/pyva.example.yml
index f75d1dfccdef3c8e06de081160097aa680ac6279..e5eec2a5d132a5c2b561d148ac2973544f6ad833 100644 (file)
--- a/pyva/pyva.example.yml
+++ b/pyva/pyva.example.yml
@@ -92,8 +92,8 @@ clients:
   channels: [ py ]
 
 path:
- - "C:/Users/Adam/git/geoserv/pyva/src/main/java/net/rizon/pyva"
- - "C:/Users/Adam/git/geoserv/pyva/src/main/python"
+ - "C:/Users/Adam/git/acid/pyva/src/main/java/net/rizon/pyva"
+ - "C:/Users/Adam/git/acid/pyva/src/main/python"
 
 plugins:
  - control

diff --git a/pyva/src/main/python/README b/pyva/src/main/python/README
deleted file mode 100644 (file)
index cd2c555..0000000
--- a/pyva/src/main/python/README
+++ /dev/null
@@ -1,10 +0,0 @@
-Pyva based python pseudoservers
-===============================
-
-Each pseudoserver lives in its own directory, in format <pluginname>/<pluginname>.py,
-for example: internets/internets.py. All dependencies related to the plugin itself
-should be in its directory.
-
-Python dependencies as of right now are:
-       * pymysql
-       * py-dom-xpath

diff --git a/pyva/src/main/python/plugin.py b/pyva/src/main/python/plugin.py
index 228c48cc0808bf4f0ff50594fba3c46818f2db7f..b329ebbdc46a159c3bde3af8fb09356067bcf7bd 100644 (file)
--- a/pyva/src/main/python/plugin.py
+++ b/pyva/src/main/python/plugin.py
@@ -1,6 +1,7 @@
 import traceback
 import logging
 import task
+import importlib
 
 from core import *
 
@@ -27,8 +28,6 @@ modules = {}
 plugin_to_modname = lambda x: '%s.%s' % (x, x)
 
 def loadPlugin(plugin, inter):
-       import importlib
-
        global modules
 
        modname = plugin_to_modname(plugin)
@@ -40,24 +39,23 @@ def loadPlugin(plugin, inter):
 
        obj.start()
 
-       modules[modname] = obj
+       modules[plugin] = obj
 
 def unloadPlugin(plugin):
        global modules
 
        modname = plugin_to_modname(plugin)
 
-       obj = modules[modname]
+       obj = modules[plugin]
        obj.stop()
 
        deps = [module for module in sys.modules if module.startswith(modname + '.')]
        for dep in deps:
                del sys.modules[dep]
-       if plugin in sys.modules:
+       if modname in sys.modules:
                del sys.modules[modname]
 
-       del sys.modules[modname]
-       del modules[modname]
+       del modules[plugin]
 
 def getPlugins():
        return modules.keys()