From 6aa9bd0f77dcb5128167fae62e32aa5252fe85c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 2 Dec 2013 00:55:24 +0100
Subject: Renew the updater branch

Now with some actual consensus on what the updater will do!
---
 mmc_updater/src/UpdateScript.cpp | 98 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 mmc_updater/src/UpdateScript.cpp

(limited to 'mmc_updater/src/UpdateScript.cpp')

diff --git a/mmc_updater/src/UpdateScript.cpp b/mmc_updater/src/UpdateScript.cpp
new file mode 100644
index 00000000..606163dd
--- /dev/null
+++ b/mmc_updater/src/UpdateScript.cpp
@@ -0,0 +1,98 @@
+#include "UpdateScript.h"
+
+#include "Log.h"
+#include "StringUtils.h"
+
+#include "tinyxml/tinyxml.h"
+
+std::string elementText(const TiXmlElement* element)
+{
+	if (!element)
+	{
+		return std::string();
+	}
+	return element->GetText();
+}
+
+UpdateScript::UpdateScript()
+{
+}
+
+void UpdateScript::parse(const std::string& path)
+{
+	m_path.clear();
+
+	TiXmlDocument document(path);
+	if (document.LoadFile())
+	{
+		m_path = path;
+
+		LOG(Info,"Loaded script from " + path);
+
+		const TiXmlElement* updateNode = document.RootElement();
+		parseUpdate(updateNode);
+	}
+	else
+	{
+		LOG(Error,"Unable to load script " + path);
+	}
+}
+
+bool UpdateScript::isValid() const
+{
+	return !m_path.empty();
+}
+
+void UpdateScript::parseUpdate(const TiXmlElement* updateNode)
+{
+	const TiXmlElement* installNode = updateNode->FirstChildElement("install");
+	if (installNode)
+	{
+		const TiXmlElement* installFileNode = installNode->FirstChildElement("file");
+		while (installFileNode)
+		{
+			m_filesToInstall.push_back(parseFile(installFileNode));
+			installFileNode = installFileNode->NextSiblingElement("file");
+		}
+	}
+
+	const TiXmlElement* uninstallNode = updateNode->FirstChildElement("uninstall");
+	if (uninstallNode)
+	{
+		const TiXmlElement* uninstallFileNode = uninstallNode->FirstChildElement("file");
+		while (uninstallFileNode)
+		{
+			m_filesToUninstall.push_back(uninstallFileNode->GetText());
+			uninstallFileNode = uninstallFileNode->NextSiblingElement("file");
+		}
+	}
+}
+
+UpdateScriptFile UpdateScript::parseFile(const TiXmlElement* element)
+{
+	UpdateScriptFile file;
+	file.path = elementText(element->FirstChildElement("name"));
+
+	std::string modeString = elementText(element->FirstChildElement("permissions"));
+	sscanf(modeString.c_str(),"%i",&file.permissions);
+
+	file.linkTarget = elementText(element->FirstChildElement("target"));
+	file.isMainBinary = strToBool(elementText(element->FirstChildElement("is-main-binary")));
+	return file;
+}
+
+const std::vector<UpdateScriptFile>& UpdateScript::filesToInstall() const
+{
+	return m_filesToInstall;
+}
+
+const std::vector<std::string>& UpdateScript::filesToUninstall() const
+{
+	return m_filesToUninstall;
+}
+
+const std::string UpdateScript::path() const
+{
+	return m_path;
+}
+
-- 
cgit v1.2.3


From e90f1a27569ac6b9e9782646c9de92fc9534b1d2 Mon Sep 17 00:00:00 2001
From: Andrew <forkk@forkk.net>
Date: Thu, 5 Dec 2013 20:32:12 -0600
Subject: Implement update installer

---
 mmc_updater/src/UpdateScript.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'mmc_updater/src/UpdateScript.cpp')

diff --git a/mmc_updater/src/UpdateScript.cpp b/mmc_updater/src/UpdateScript.cpp
index 606163dd..849a2217 100644
--- a/mmc_updater/src/UpdateScript.cpp
+++ b/mmc_updater/src/UpdateScript.cpp
@@ -71,13 +71,14 @@ void UpdateScript::parseUpdate(const TiXmlElement* updateNode)
 UpdateScriptFile UpdateScript::parseFile(const TiXmlElement* element)
 {
 	UpdateScriptFile file;
-	file.path = elementText(element->FirstChildElement("name"));
+	// The name within the update files folder.
+	file.source = elementText(element->FirstChildElement("source"));
+	// The path to install to.
+	file.dest = elementText(element->FirstChildElement("dest"));
 
-	std::string modeString = elementText(element->FirstChildElement("permissions"));
+	std::string modeString = elementText(element->FirstChildElement("mode"));
 	sscanf(modeString.c_str(),"%i",&file.permissions);
 
-	file.linkTarget = elementText(element->FirstChildElement("target"));
-	file.isMainBinary = strToBool(elementText(element->FirstChildElement("is-main-binary")));
 	return file;
 }
 
-- 
cgit v1.2.3