From 76bea2bc15c6ea2bdad90160c50bb66f8b8b95eb Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Fri, 28 Jul 2017 06:55:17 +0200
Subject: [PATCH] datastore/xml: handle entire file save and be closer with new
 nemubot XML API

---
 nemubot/datastore/xml.py        | 13 ++++++++++++-
 nemubot/tools/xmlparser/node.py | 24 ++----------------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/nemubot/datastore/xml.py b/nemubot/datastore/xml.py
index 46dca70..025c0c5 100644
--- a/nemubot/datastore/xml.py
+++ b/nemubot/datastore/xml.py
@@ -143,4 +143,15 @@ class XML(Abstract):
         if self.rotate:
             self._rotate(path)
 
-        return data.save(path)
+        import tempfile
+        _, tmpath = tempfile.mkstemp()
+        with open(tmpath, "w") as f:
+            import xml.sax.saxutils
+            gen = xml.sax.saxutils.XMLGenerator(f, "utf-8")
+            gen.startDocument()
+            data.saveElement(gen)
+            gen.endDocument()
+
+        # Atomic save
+        import shutil
+        shutil.move(tmpath, path)
diff --git a/nemubot/tools/xmlparser/node.py b/nemubot/tools/xmlparser/node.py
index 965a475..7df255e 100644
--- a/nemubot/tools/xmlparser/node.py
+++ b/nemubot/tools/xmlparser/node.py
@@ -196,7 +196,7 @@ class ModuleState:
         if self.index_fieldname is not None:
             self.setIndex(self.index_fieldname, self.index_tagname)
 
-    def save_node(self, gen):
+    def saveElement(self, gen):
         """Serialize this node as a XML node"""
         from datetime import datetime
         attribs = {}
@@ -215,29 +215,9 @@ class ModuleState:
             gen.startElement(self.name, attrs)
 
             for child in self.childs:
-                child.save_node(gen)
+                child.saveElement(gen)
 
             gen.endElement(self.name)
         except:
             logger.exception("Error occured when saving the following "
                              "XML node: %s with %s", self.name, attrs)
-
-    def save(self, filename):
-        """Save the current node as root node in a XML file
-
-        Argument:
-        filename -- location of the file to create/erase
-        """
-
-        import tempfile
-        _, tmpath = tempfile.mkstemp()
-        with open(tmpath, "w") as f:
-            import xml.sax.saxutils
-            gen = xml.sax.saxutils.XMLGenerator(f, "utf-8")
-            gen.startDocument()
-            self.save_node(gen)
-            gen.endDocument()
-
-        # Atomic save
-        import shutil
-        shutil.move(tmpath, filename)