Add a constant field order for separate saving of WorldModel.xml

Author: MinyazevR

plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp

@@ -536,7 +536,7 @@ void TwoDModelWidget::saveWorldModel()
 
 	utils::OutFile saveFile(saveFileName);
 	saveFile() << "<?xml version='1.0' encoding='utf-8'?>\n";
-	saveFile() << save.toString(4);
+	saveFile() << xmlUtils::ensureXmlFieldsOrder(save.toString(4));
 }
 
 void TwoDModelWidget::loadWorldModel()

qrrepo/private/serializer.cpp

@@ -36,67 +36,6 @@ using namespace details;
 using namespace utils;
 using namespace qReal;
 
-namespace  {
-
-QString ensureXmlFieldsOrder(const QString &xmlInput) {
-	if (xmlInput.isEmpty()) {
-		return {};
-	}
-
-	QXmlStreamReader reader(xmlInput);
-	QString result;
-	QXmlStreamWriter writer(&result);
-	writer.setAutoFormatting(false);
-	writer.setAutoFormattingIndent(4);
-	bool first = true;
-
-	while (!reader.atEnd() && !reader.hasError()) {
-		auto token = reader.readNext();
-
-		switch (token) {
-		case QXmlStreamReader::StartElement: {
-			writer.writeStartElement(reader.name().toString());
-			if (first) {
-				writer.setAutoFormatting(true);
-				first = false;
-			}
-			QMap<QString, QString> sortedAttrs;
-			for (auto &&attr : reader.attributes()) {
-				sortedAttrs.insert(attr.name().toString(), attr.value().toString());
-			}
-
-			for (auto it = sortedAttrs.constBegin(); it != sortedAttrs.constEnd(); ++it) {
-				writer.writeAttribute(it.key(), it.value());
-			}
-			break;
-		}
-
-		case QXmlStreamReader::EndElement:
-			writer.writeEndElement();
-			break;
-
-		case QXmlStreamReader::Characters:
-			if (!reader.isWhitespace()) {
-				writer.writeCharacters(reader.text().toString());
-			}
-			break;
-
-		case QXmlStreamReader::Comment:
-			writer.writeComment(reader.text().toString());
-			break;
-
-		default:
-			break;
-		}
-	}
-
-	if (reader.hasError()) {
-		return xmlInput;
-	}
-
-	return result;
-}
-}
 const char * const unsavedDir = "%1/unsaved/%2";
 
 Serializer::Serializer(const QString &workingFile) // NOLINT(modernize-pass-by-value)
@@ -244,7 +183,7 @@ void Serializer::saveMetaInfo(QHash<QString, QVariant> const &metaInfo) const
 			OutFile out(filePath);
 			auto value = ValuesSerializer::serializeQVariant(metaInfo[key]);
 			if (key == "worldModel") {
-				out() << ensureXmlFieldsOrder(value);
+				out() << xmlUtils::ensureXmlFieldsOrder(value);
 				continue;
 			}
 			out() << ValuesSerializer::serializeQVariant(metaInfo[key]);

qrutils/xmlUtils.cpp

@@ -16,6 +16,7 @@
 
 #include <QtCore/QFile>
 #include <QtCore/QDebug>
+#include <QXmlStreamReader>
 
 using namespace utils;
 
@@ -24,19 +25,79 @@ QDomDocument xmlUtils::loadDocument(const QString &fileName, QString *errorMessa
 	QFile file(fileName);
 	if (!file.open(QIODevice::ReadOnly)) {
 		qWarning() << "Cannot open" << fileName << "for reading";
-		return QDomDocument();
+		return {};
 	}
 
 	QDomDocument doc;
 	if (!doc.setContent(&file, false, errorMessage, errorLine, errorColumn)) {
 		file.close();
-		return QDomDocument();
+		return {};
 	}
 
 	file.close();
 	return doc;
 }
 
+QString xmlUtils::ensureXmlFieldsOrder(const QString &xmlInput)
+{
+	if (xmlInput.isEmpty()) {
+		return {};
+	}
+
+	QXmlStreamReader reader(xmlInput);
+	QString result;
+	QXmlStreamWriter writer(&result);
+	writer.setAutoFormatting(false);
+	writer.setAutoFormattingIndent(4);
+	bool first = true;
+
+	while (!reader.atEnd() && !reader.hasError()) {
+		auto token = reader.readNext();
+
+		switch (token) {
+		case QXmlStreamReader::StartElement: {
+			writer.writeStartElement(reader.name().toString());
+			if (first) {
+				writer.setAutoFormatting(true);
+				first = false;
+			}
+			QMap<QString, QString> sortedAttrs;
+			for (auto &&attr : reader.attributes()) {
+				sortedAttrs.insert(attr.name().toString(), attr.value().toString());
+			}
+
+			for (auto it = sortedAttrs.constBegin(); it != sortedAttrs.constEnd(); ++it) {
+				writer.writeAttribute(it.key(), it.value());
+			}
+			break;
+		}
+
+		case QXmlStreamReader::EndElement:
+			writer.writeEndElement();
+			break;
+
+		case QXmlStreamReader::Characters:
+			if (!reader.isWhitespace()) {
+				writer.writeCharacters(reader.text().toString());
+			}
+			break;
+
+		case QXmlStreamReader::Comment:
+			writer.writeComment(reader.text().toString());
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	if (reader.hasError()) {
+		return xmlInput;
+	}
+
+	return result;
+}
+
 QDomDocument xmlUtils::loadDocumentWithConversion(const QString &loadFileName
 		, QString *errorMessage, int *errorLine, int *errorColumn)
 {

qrutils/xmlUtils.h

@@ -27,6 +27,7 @@ class QRUTILS_EXPORT xmlUtils
 		, QString *errorMessage = nullptr, int *errorLine = nullptr, int *errorColumn = nullptr);
 	static QDomDocument loadDocumentWithConversion(const QString &fileName
 		, QString *errorMessage = nullptr, int *errorLine = nullptr, int *errorColumn = nullptr);
+	static QString ensureXmlFieldsOrder(const QString &xmlInput);
 };
 
 }