Messages now implements Serializable

nemubot/datastore/xml.py

@@ -120,6 +120,7 @@ class XML(Abstract):
             from nemubot.tools.xmlparser import XMLParser
             from nemubot.datastore.nodes import basic as basicNodes
             from nemubot.datastore.nodes import python as pythonNodes
+            from nemubot.message.command import Command
 
             d = {
                 basicNodes.ListNode.serializetag: basicNodes.ListNode,
@@ -127,6 +128,7 @@ class XML(Abstract):
                 pythonNodes.IntNode.serializetag: pythonNodes.IntNode,
                 pythonNodes.FloatNode.serializetag: pythonNodes.FloatNode,
                 pythonNodes.StringNode.serializetag: pythonNodes.StringNode,
+                Command.serializetag: Command,
             }
             d.update(extendsTags)
 

nemubot/message/abstract.py

@@ -16,11 +16,16 @@
 
 from datetime import datetime, timezone
 
+from nemubot.datastore.nodes import Serializable
 
-class Abstract:
+
+class Abstract(Serializable):
 
     """This class represents an abstract message"""
 
+    serializetag = "nemubotAMessage"
+
+
     def __init__(self, server=None, date=None, to=None, to_response=None, frm=None, frm_owner=False):
         """Initialize an abstract message
 
@@ -87,3 +92,8 @@ class Abstract:
                 del ret[w]
 
         return ret
+
+
+    def serialize(self):
+        from nemubot.datastore.nodes import ParsingNode
+        return ParsingNode(tag=Abstract.serializetag, **self.export_args())

nemubot/message/command.py

@@ -1,5 +1,5 @@
 # Nemubot is a smart and modulable IM bot.
-# Copyright (C) 2012-2015  Mercier Pierre-Olivier
+# Copyright (C) 2012-2016  Mercier Pierre-Olivier
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -21,6 +21,9 @@ class Command(Abstract):
 
     """This class represents a specialized TextMessage"""
 
+    serializetag = "nemubotCommand"
+
+
     def __init__(self, cmd, args=None, kwargs=None, *nargs, **kargs):
         super().__init__(*nargs, **kargs)
 
@@ -28,17 +31,35 @@ class Command(Abstract):
         self.args = args if args is not None else list()
         self.kwargs = kwargs if kwargs is not None else dict()
 
-    def __str__(self):
+
+    def __repr__(self):
         return self.cmd + " @" + ",@".join(self.args)
 
-    @property
-    def cmds(self):
-        # TODO: this is for legacy modules
-        return [self.cmd] + self.args
+
+    def addChild(self, name, child):
+        if name == "list":
+            self.args = child
+        elif name == "dict":
+            self.kwargs = child
+        else:
+            return False
+        return True
+
+
+    def serialize(self):
+        from nemubot.datastore.nodes import ParsingNode
+        node = ParsingNode(tag=Command.serializetag, cmd=self.cmd)
+        if len(self.args):
+            node.children.append(ParsingNode.serialize_node(self.args))
+        if len(self.kwargs):
+            node.children.append(ParsingNode.serialize_node(self.kwargs))
+        return node
 
 
 class OwnerCommand(Command):
 
     """This class represents a special command incomming from the owner"""
 
+    serializetag = "nemubotOCommand"
+
     pass