16 files changed, 1129 insertions, 1129 deletions

diff --git a/api/logic/updater/DownloadTask.cpp b/api/logic/updater/DownloadTask.cpp
index e0adf593..cb92018d 100644
--- a/api/logic/updater/DownloadTask.cpp
+++ b/api/logic/updater/DownloadTask.cpp
@@ -27,140 +27,140 @@ namespace GoUpdate
 {
 
 DownloadTask::DownloadTask(Status status, QString target, QObject *parent)
-	: Task(parent), m_updateFilesDir(target)
+    : Task(parent), m_updateFilesDir(target)
 {
-	m_status = status;
+    m_status = status;
 
-	m_updateFilesDir.setAutoRemove(false);
+    m_updateFilesDir.setAutoRemove(false);
 }
 
 void DownloadTask::executeTask()
 {
-	loadVersionInfo();
+    loadVersionInfo();
 }
 
 void DownloadTask::loadVersionInfo()
 {
-	setStatus(tr("Loading version information..."));
+    setStatus(tr("Loading version information..."));
 
-	NetJob *netJob = new NetJob("Version Info");
+    NetJob *netJob = new NetJob("Version Info");
 
-	// Find the index URL.
-	QUrl newIndexUrl = QUrl(m_status.newRepoUrl).resolved(QString::number(m_status.newVersionId) + ".json");
-	qDebug() << m_status.newRepoUrl << " turns into " << newIndexUrl;
+    // Find the index URL.
+    QUrl newIndexUrl = QUrl(m_status.newRepoUrl).resolved(QString::number(m_status.newVersionId) + ".json");
+    qDebug() << m_status.newRepoUrl << " turns into " << newIndexUrl;
 
-	netJob->addNetAction(m_newVersionFileListDownload = Net::Download::makeByteArray(newIndexUrl, &newVersionFileListData));
+    netJob->addNetAction(m_newVersionFileListDownload = Net::Download::makeByteArray(newIndexUrl, &newVersionFileListData));
 
-	// If we have a current version URL, get that one too.
-	if (!m_status.currentRepoUrl.isEmpty())
-	{
-		QUrl cIndexUrl = QUrl(m_status.currentRepoUrl).resolved(QString::number(m_status.currentVersionId) + ".json");
-		netJob->addNetAction(m_currentVersionFileListDownload = Net::Download::makeByteArray(cIndexUrl, &currentVersionFileListData));
-		qDebug() << m_status.currentRepoUrl << " turns into " << cIndexUrl;
-	}
+    // If we have a current version URL, get that one too.
+    if (!m_status.currentRepoUrl.isEmpty())
+    {
+        QUrl cIndexUrl = QUrl(m_status.currentRepoUrl).resolved(QString::number(m_status.currentVersionId) + ".json");
+        netJob->addNetAction(m_currentVersionFileListDownload = Net::Download::makeByteArray(cIndexUrl, &currentVersionFileListData));
+        qDebug() << m_status.currentRepoUrl << " turns into " << cIndexUrl;
+    }
 
-	// connect signals and start the job
-	connect(netJob, &NetJob::succeeded, this, &DownloadTask::processDownloadedVersionInfo);
-	connect(netJob, &NetJob::failed, this, &DownloadTask::vinfoDownloadFailed);
-	m_vinfoNetJob.reset(netJob);
-	netJob->start();
+    // connect signals and start the job
+    connect(netJob, &NetJob::succeeded, this, &DownloadTask::processDownloadedVersionInfo);
+    connect(netJob, &NetJob::failed, this, &DownloadTask::vinfoDownloadFailed);
+    m_vinfoNetJob.reset(netJob);
+    netJob->start();
 }
 
 void DownloadTask::vinfoDownloadFailed()
 {
-	// Something failed. We really need the second download (current version info), so parse
-	// downloads anyways as long as the first one succeeded.
-	if (m_newVersionFileListDownload->wasSuccessful())
-	{
-		processDownloadedVersionInfo();
-		return;
-	}
-
-	// TODO: Give a more detailed error message.
-	qCritical() << "Failed to download version info files.";
-	emitFailed(tr("Failed to download version info files."));
+    // Something failed. We really need the second download (current version info), so parse
+    // downloads anyways as long as the first one succeeded.
+    if (m_newVersionFileListDownload->wasSuccessful())
+    {
+        processDownloadedVersionInfo();
+        return;
+    }
+
+    // TODO: Give a more detailed error message.
+    qCritical() << "Failed to download version info files.";
+    emitFailed(tr("Failed to download version info files."));
 }
 
 void DownloadTask::processDownloadedVersionInfo()
 {
-	VersionFileList m_currentVersionFileList;
-	VersionFileList m_newVersionFileList;
-
-	setStatus(tr("Reading file list for new version..."));
-	qDebug() << "Reading file list for new version...";
-	QString error;
-	if (!parseVersionInfo(newVersionFileListData, m_newVersionFileList, error))
-	{
-		qCritical() << error;
-		emitFailed(error);
-		return;
-	}
-
-	// if we have the current version info, use it.
-	if (m_currentVersionFileListDownload && m_currentVersionFileListDownload->wasSuccessful())
-	{
-		setStatus(tr("Reading file list for current version..."));
-		qDebug() << "Reading file list for current version...";
-		// if this fails, it's not a complete loss.
-		QString error;
-		if(!parseVersionInfo( currentVersionFileListData, m_currentVersionFileList, error))
-		{
-			qDebug() << error << "This is not a fatal error.";
-		}
-	}
-
-	// We don't need this any more.
-	m_currentVersionFileListDownload.reset();
-	m_newVersionFileListDownload.reset();
-	m_vinfoNetJob.reset();
-
-	setStatus(tr("Processing file lists - figuring out how to install the update..."));
-
-	// make a new netjob for the actual update files
-	NetJobPtr netJob (new NetJob("Update Files"));
-
-	// fill netJob and operationList
-	if (!processFileLists(m_currentVersionFileList, m_newVersionFileList, m_status.rootPath, m_updateFilesDir.path(), netJob, m_operations))
-	{
-		emitFailed(tr("Failed to process update lists..."));
-		return;
-	}
-
-	// Now start the download.
-	QObject::connect(netJob.get(), &NetJob::succeeded, this, &DownloadTask::fileDownloadFinished);
-	QObject::connect(netJob.get(), &NetJob::progress, this, &DownloadTask::fileDownloadProgressChanged);
-	QObject::connect(netJob.get(), &NetJob::failed, this, &DownloadTask::fileDownloadFailed);
-
-	setStatus(tr("Downloading %1 update files.").arg(QString::number(netJob->size())));
-	qDebug() << "Begin downloading update files to" << m_updateFilesDir.path();
-	m_filesNetJob = netJob;
-	m_filesNetJob->start();
+    VersionFileList m_currentVersionFileList;
+    VersionFileList m_newVersionFileList;
+
+    setStatus(tr("Reading file list for new version..."));
+    qDebug() << "Reading file list for new version...";
+    QString error;
+    if (!parseVersionInfo(newVersionFileListData, m_newVersionFileList, error))
+    {
+        qCritical() << error;
+        emitFailed(error);
+        return;
+    }
+
+    // if we have the current version info, use it.
+    if (m_currentVersionFileListDownload && m_currentVersionFileListDownload->wasSuccessful())
+    {
+        setStatus(tr("Reading file list for current version..."));
+        qDebug() << "Reading file list for current version...";
+        // if this fails, it's not a complete loss.
+        QString error;
+        if(!parseVersionInfo( currentVersionFileListData, m_currentVersionFileList, error))
+        {
+            qDebug() << error << "This is not a fatal error.";
+        }
+    }
+
+    // We don't need this any more.
+    m_currentVersionFileListDownload.reset();
+    m_newVersionFileListDownload.reset();
+    m_vinfoNetJob.reset();
+
+    setStatus(tr("Processing file lists - figuring out how to install the update..."));
+
+    // make a new netjob for the actual update files
+    NetJobPtr netJob (new NetJob("Update Files"));
+
+    // fill netJob and operationList
+    if (!processFileLists(m_currentVersionFileList, m_newVersionFileList, m_status.rootPath, m_updateFilesDir.path(), netJob, m_operations))
+    {
+        emitFailed(tr("Failed to process update lists..."));
+        return;
+    }
+
+    // Now start the download.
+    QObject::connect(netJob.get(), &NetJob::succeeded, this, &DownloadTask::fileDownloadFinished);
+    QObject::connect(netJob.get(), &NetJob::progress, this, &DownloadTask::fileDownloadProgressChanged);
+    QObject::connect(netJob.get(), &NetJob::failed, this, &DownloadTask::fileDownloadFailed);
+
+    setStatus(tr("Downloading %1 update files.").arg(QString::number(netJob->size())));
+    qDebug() << "Begin downloading update files to" << m_updateFilesDir.path();
+    m_filesNetJob = netJob;
+    m_filesNetJob->start();
 }
 
 void DownloadTask::fileDownloadFinished()
 {
-	emitSucceeded();
+    emitSucceeded();
 }
 
 void DownloadTask::fileDownloadFailed(QString reason)
 {
-	qCritical() << "Failed to download update files:" << reason;
-	emitFailed(tr("Failed to download update files: %1").arg(reason));
+    qCritical() << "Failed to download update files:" << reason;
+    emitFailed(tr("Failed to download update files: %1").arg(reason));
 }
 
 void DownloadTask::fileDownloadProgressChanged(qint64 current, qint64 total)
 {
-	setProgress(current, total);
+    setProgress(current, total);
 }
 
 QString DownloadTask::updateFilesDir()
 {
-	return m_updateFilesDir.path();
+    return m_updateFilesDir.path();
 }
 
 OperationList DownloadTask::operations()
 {
-	return m_operations;
+    return m_operations;
 }
 
 }
\ No newline at end of file
diff --git a/api/logic/updater/DownloadTask.h b/api/logic/updater/DownloadTask.h
index 8330d3e8..30b4b9ec 100644
--- a/api/logic/updater/DownloadTask.h
+++ b/api/logic/updater/DownloadTask.h
@@ -29,70 +29,70 @@ namespace GoUpdate
  */
 class MULTIMC_LOGIC_EXPORT DownloadTask : public Task
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	/**
-	 * Create a download task
-	 *
-	 * target is a template - XXXXXX at the end will be replaced with a random generated string, ensuring uniqueness
-	 */
-	explicit DownloadTask(Status status, QString target, QObject* parent = 0);
-	virtual ~DownloadTask() {};
+    /**
+     * Create a download task
+     *
+     * target is a template - XXXXXX at the end will be replaced with a random generated string, ensuring uniqueness
+     */
+    explicit DownloadTask(Status status, QString target, QObject* parent = 0);
+    virtual ~DownloadTask() {};
 
-	/// Get the directory that will contain the update files.
-	QString updateFilesDir();
+    /// Get the directory that will contain the update files.
+    QString updateFilesDir();
 
-	/// Get the list of operations that should be done
-	OperationList operations();
+    /// Get the list of operations that should be done
+    OperationList operations();
 
-	/// set updater download behavior
-	void setUseLocalUpdater(bool useLocal);
+    /// set updater download behavior
+    void setUseLocalUpdater(bool useLocal);
 
 protected:
-	//! Entry point for tasks.
-	virtual void executeTask() override;
-
-	/*!
-	 * Downloads the version info files from the repository.
-	 * The files for both the current build, and the build that we're updating to need to be downloaded.
-	 * If the current version's info file can't be found, MultiMC will not delete files that
-	 * were removed between versions. It will still replace files that have changed, however.
-	 * Note that although the repository URL for the current version is not given to the update task,
-	 * the task will attempt to look it up in the UpdateChecker's channel list.
-	 * If an error occurs here, the function will call emitFailed and return false.
-	 */
-	void loadVersionInfo();
-
-	NetJobPtr m_vinfoNetJob;
-	QByteArray currentVersionFileListData;
-	QByteArray newVersionFileListData;
-	Net::Download::Ptr m_currentVersionFileListDownload;
-	Net::Download::Ptr m_newVersionFileListDownload;
-
-	NetJobPtr m_filesNetJob;
-
-	Status m_status;
-
-	OperationList m_operations;
-
-	/*!
-	 * Temporary directory to store update files in.
-	 * This will be set to not auto delete. Task will fail if this fails to be created.
-	 */
-	QTemporaryDir m_updateFilesDir;
+    //! Entry point for tasks.
+    virtual void executeTask() override;
+
+    /*!
+     * Downloads the version info files from the repository.
+     * The files for both the current build, and the build that we're updating to need to be downloaded.
+     * If the current version's info file can't be found, MultiMC will not delete files that
+     * were removed between versions. It will still replace files that have changed, however.
+     * Note that although the repository URL for the current version is not given to the update task,
+     * the task will attempt to look it up in the UpdateChecker's channel list.
+     * If an error occurs here, the function will call emitFailed and return false.
+     */
+    void loadVersionInfo();
+
+    NetJobPtr m_vinfoNetJob;
+    QByteArray currentVersionFileListData;
+    QByteArray newVersionFileListData;
+    Net::Download::Ptr m_currentVersionFileListDownload;
+    Net::Download::Ptr m_newVersionFileListDownload;
+
+    NetJobPtr m_filesNetJob;
+
+    Status m_status;
+
+    OperationList m_operations;
+
+    /*!
+     * Temporary directory to store update files in.
+     * This will be set to not auto delete. Task will fail if this fails to be created.
+     */
+    QTemporaryDir m_updateFilesDir;
 
 protected slots:
-	/*!
-	 * This function is called when version information is finished downloading
-	 * and at least the new file list download succeeded
-	 */
-	void processDownloadedVersionInfo();
-	void vinfoDownloadFailed();
-
-	void fileDownloadFinished();
-	void fileDownloadFailed(QString reason);
-	void fileDownloadProgressChanged(qint64 current, qint64 total);
+    /*!
+     * This function is called when version information is finished downloading
+     * and at least the new file list download succeeded
+     */
+    void processDownloadedVersionInfo();
+    void vinfoDownloadFailed();
+
+    void fileDownloadFinished();
+    void fileDownloadFailed(QString reason);
+    void fileDownloadProgressChanged(qint64 current, qint64 total);
 };
 
 }
\ No newline at end of file
diff --git a/api/logic/updater/DownloadTask_test.cpp b/api/logic/updater/DownloadTask_test.cpp
index e75c3ffa..531b2527 100644
--- a/api/logic/updater/DownloadTask_test.cpp
+++ b/api/logic/updater/DownloadTask_test.cpp
@@ -12,11 +12,11 @@ using namespace GoUpdate;
 
 FileSourceList encodeBaseFile(const char *suffix)
 {
-	auto base = QDir::currentPath();
-	QUrl localFile = QUrl::fromLocalFile(base + suffix);
-	QString localUrlString = localFile.toString(QUrl::FullyEncoded);
-	auto item = FileSource("http", localUrlString);
-	return FileSourceList({item});
+    auto base = QDir::currentPath();
+    QUrl localFile = QUrl::fromLocalFile(base + suffix);
+    QString localUrlString = localFile.toString(QUrl::FullyEncoded);
+    auto item = FileSource("http", localUrlString);
+    return FileSourceList({item});
 }
 
 Q_DECLARE_METATYPE(VersionFileList)
@@ -24,191 +24,191 @@ Q_DECLARE_METATYPE(Operation)
 
 QDebug operator<<(QDebug dbg, const FileSource &f)
 {
-	dbg.nospace() << "FileSource(type=" << f.type << " url=" << f.url
-				  << " comp=" << f.compressionType << ")";
-	return dbg.maybeSpace();
+    dbg.nospace() << "FileSource(type=" << f.type << " url=" << f.url
+                  << " comp=" << f.compressionType << ")";
+    return dbg.maybeSpace();
 }
 
 QDebug operator<<(QDebug dbg, const VersionFileEntry &v)
 {
-	dbg.nospace() << "VersionFileEntry(path=" << v.path << " mode=" << v.mode
-				  << " md5=" << v.md5 << " sources=" << v.sources << ")";
-	return dbg.maybeSpace();
+    dbg.nospace() << "VersionFileEntry(path=" << v.path << " mode=" << v.mode
+                  << " md5=" << v.md5 << " sources=" << v.sources << ")";
+    return dbg.maybeSpace();
 }
 
 QDebug operator<<(QDebug dbg, const Operation::Type &t)
 {
-	switch (t)
-	{
-	case Operation::OP_REPLACE:
-		dbg << "OP_COPY";
-		break;
-	case Operation::OP_DELETE:
-		dbg << "OP_DELETE";
-		break;
-	}
-	return dbg.maybeSpace();
+    switch (t)
+    {
+    case Operation::OP_REPLACE:
+        dbg << "OP_COPY";
+        break;
+    case Operation::OP_DELETE:
+        dbg << "OP_DELETE";
+        break;
+    }
+    return dbg.maybeSpace();
 }
 
 QDebug operator<<(QDebug dbg, const Operation &u)
 {
-	dbg.nospace() << "Operation(type=" << u.type << " file=" << u.source
-				  << " dest=" << u.destination << " mode=" << u.destinationMode << ")";
-	return dbg.maybeSpace();
+    dbg.nospace() << "Operation(type=" << u.type << " file=" << u.source
+                  << " dest=" << u.destination << " mode=" << u.destinationMode << ")";
+    return dbg.maybeSpace();
 }
 
 class DownloadTaskTest : public QObject
 {
-	Q_OBJECT
+    Q_OBJECT
 private
 slots:
-	void initTestCase()
-	{
-	}
-	void cleanupTestCase()
-	{
-	}
-
-	void test_parseVersionInfo_data()
-	{
-		QTest::addColumn<QByteArray>("data");
-		QTest::addColumn<VersionFileList>("list");
-		QTest::addColumn<QString>("error");
-		QTest::addColumn<bool>("ret");
-
-		QTest::newRow("one")
-			<< MULTIMC_GET_TEST_FILE("data/1.json")
-			<< (VersionFileList()
-				<< VersionFileEntry{"fileOne",
-														493,
-														encodeBaseFile("/data/fileOneA"),
-														"9eb84090956c484e32cb6c08455a667b"}
-				<< VersionFileEntry{"fileTwo",
-														644,
-														encodeBaseFile("/data/fileTwo"),
-														"38f94f54fa3eb72b0ea836538c10b043"}
-				<< VersionFileEntry{"fileThree",
-														750,
-														encodeBaseFile("/data/fileThree"),
-														"f12df554b21e320be6471d7154130e70"})
-			<< QString() << true;
-		QTest::newRow("two")
-			<< MULTIMC_GET_TEST_FILE("data/2.json")
-			<< (VersionFileList()
-				<< VersionFileEntry{"fileOne",
-														493,
-														encodeBaseFile("/data/fileOneB"),
-														"42915a71277c9016668cce7b82c6b577"}
-				<< VersionFileEntry{"fileTwo",
-														644,
-														encodeBaseFile("/data/fileTwo"),
-														"38f94f54fa3eb72b0ea836538c10b043"})
-			<< QString() << true;
-	}
-	void test_parseVersionInfo()
-	{
-		QFETCH(QByteArray, data);
-		QFETCH(VersionFileList, list);
-		QFETCH(QString, error);
-		QFETCH(bool, ret);
-
-		VersionFileList outList;
-		QString outError;
-		bool outRet = parseVersionInfo(data, outList, outError);
-		QCOMPARE(outRet, ret);
-		QCOMPARE(outList, list);
-		QCOMPARE(outError, error);
-	}
-
-	void test_processFileLists_data()
-	{
-		QTest::addColumn<QString>("tempFolder");
-		QTest::addColumn<VersionFileList>("currentVersion");
-		QTest::addColumn<VersionFileList>("newVersion");
-		QTest::addColumn<OperationList>("expectedOperations");
-
-		QTemporaryDir tempFolderObj;
-		QString tempFolder = tempFolderObj.path();
-		// update fileOne, keep fileTwo, remove fileThree
-		QTest::newRow("test 1")
-			<< tempFolder << (VersionFileList()
-							  << VersionFileEntry{
-									 "data/fileOne", 493,
-									 FileSourceList()
-										 << FileSource(
-												"http", "http://host/path/fileOne-1"),
-									 "9eb84090956c484e32cb6c08455a667b"}
-							  << VersionFileEntry{
-									 "data/fileTwo", 644,
-									 FileSourceList()
-										 << FileSource(
-												"http", "http://host/path/fileTwo-1"),
-									 "38f94f54fa3eb72b0ea836538c10b043"}
-							  << VersionFileEntry{
-									 "data/fileThree", 420,
-									 FileSourceList()
-										 << FileSource(
-												"http", "http://host/path/fileThree-1"),
-									 "f12df554b21e320be6471d7154130e70"})
-			<< (VersionFileList()
-				<< VersionFileEntry{
-					   "data/fileOne", 493,
-					   FileSourceList()
-						   << FileSource("http",
-															 "http://host/path/fileOne-2"),
-					   "42915a71277c9016668cce7b82c6b577"}
-				<< VersionFileEntry{
-					   "data/fileTwo", 644,
-					   FileSourceList()
-						   << FileSource("http",
-															 "http://host/path/fileTwo-2"),
-					   "38f94f54fa3eb72b0ea836538c10b043"})
-			<< (OperationList()
-				<< Operation::DeleteOp("data/fileThree")
-				<< Operation::CopyOp(
-					   FS::PathCombine(tempFolder,
-								   QString("data/fileOne").replace("/", "_")),
-					   "data/fileOne", 493));
-	}
-	void test_processFileLists()
-	{
-		QFETCH(QString, tempFolder);
-		QFETCH(VersionFileList, currentVersion);
-		QFETCH(VersionFileList, newVersion);
-		QFETCH(OperationList, expectedOperations);
-
-		OperationList operations;
-
-		processFileLists(currentVersion, newVersion, QDir::currentPath(), tempFolder, new NetJob("Dummy"), operations);
-		qDebug() << (operations == expectedOperations);
-		qDebug() << operations;
-		qDebug() << expectedOperations;
-		QCOMPARE(operations, expectedOperations);
-	}
-
-	void test_OSXPathFixup()
-	{
-		QString path, pathOrig;
-		bool result;
-		// Proper OSX path
-		pathOrig = path = "MultiMC.app/Foo/Bar/Baz";
-		qDebug() << "Proper OSX path: " << path;
-		result = fixPathForOSX(path);
-		QCOMPARE(path, QString("Foo/Bar/Baz"));
-		QCOMPARE(result, true);
-
-		// Bad OSX path
-		pathOrig = path = "translations/klingon.lol";
-		qDebug() << "Bad OSX path: " << path;
-		result = fixPathForOSX(path);
-		QCOMPARE(path, pathOrig);
-		QCOMPARE(result, false);
-	}
+    void initTestCase()
+    {
+    }
+    void cleanupTestCase()
+    {
+    }
+
+    void test_parseVersionInfo_data()
+    {
+        QTest::addColumn<QByteArray>("data");
+        QTest::addColumn<VersionFileList>("list");
+        QTest::addColumn<QString>("error");
+        QTest::addColumn<bool>("ret");
+
+        QTest::newRow("one")
+            << MULTIMC_GET_TEST_FILE("data/1.json")
+            << (VersionFileList()
+                << VersionFileEntry{"fileOne",
+                                                        493,
+                                                        encodeBaseFile("/data/fileOneA"),
+                                                        "9eb84090956c484e32cb6c08455a667b"}
+                << VersionFileEntry{"fileTwo",
+                                                        644,
+                                                        encodeBaseFile("/data/fileTwo"),
+                                                        "38f94f54fa3eb72b0ea836538c10b043"}
+                << VersionFileEntry{"fileThree",
+                                                        750,
+                                                        encodeBaseFile("/data/fileThree"),
+                                                        "f12df554b21e320be6471d7154130e70"})
+            << QString() << true;
+        QTest::newRow("two")
+            << MULTIMC_GET_TEST_FILE("data/2.json")
+            << (VersionFileList()
+                << VersionFileEntry{"fileOne",
+                                                        493,
+                                                        encodeBaseFile("/data/fileOneB"),
+                                                        "42915a71277c9016668cce7b82c6b577"}
+                << VersionFileEntry{"fileTwo",
+                                                        644,
+                                                        encodeBaseFile("/data/fileTwo"),
+                                                        "38f94f54fa3eb72b0ea836538c10b043"})
+            << QString() << true;
+    }
+    void test_parseVersionInfo()
+    {
+        QFETCH(QByteArray, data);
+        QFETCH(VersionFileList, list);
+        QFETCH(QString, error);
+        QFETCH(bool, ret);
+
+        VersionFileList outList;
+        QString outError;
+        bool outRet = parseVersionInfo(data, outList, outError);
+        QCOMPARE(outRet, ret);
+        QCOMPARE(outList, list);
+        QCOMPARE(outError, error);
+    }
+
+    void test_processFileLists_data()
+    {
+        QTest::addColumn<QString>("tempFolder");
+        QTest::addColumn<VersionFileList>("currentVersion");
+        QTest::addColumn<VersionFileList>("newVersion");
+        QTest::addColumn<OperationList>("expectedOperations");
+
+        QTemporaryDir tempFolderObj;
+        QString tempFolder = tempFolderObj.path();
+        // update fileOne, keep fileTwo, remove fileThree
+        QTest::newRow("test 1")
+            << tempFolder << (VersionFileList()
+                              << VersionFileEntry{
+                                     "data/fileOne", 493,
+                                     FileSourceList()
+                                         << FileSource(
+                                                "http", "http://host/path/fileOne-1"),
+                                     "9eb84090956c484e32cb6c08455a667b"}
+                              << VersionFileEntry{
+                                     "data/fileTwo", 644,
+                                     FileSourceList()
+                                         << FileSource(
+                                                "http", "http://host/path/fileTwo-1"),
+                                     "38f94f54fa3eb72b0ea836538c10b043"}
+                              << VersionFileEntry{
+                                     "data/fileThree", 420,
+                                     FileSourceList()
+                                         << FileSource(
+                                                "http", "http://host/path/fileThree-1"),
+                                     "f12df554b21e320be6471d7154130e70"})
+            << (VersionFileList()
+                << VersionFileEntry{
+                       "data/fileOne", 493,
+                       FileSourceList()
+                           << FileSource("http",
+                                                             "http://host/path/fileOne-2"),
+                       "42915a71277c9016668cce7b82c6b577"}
+                << VersionFileEntry{
+                       "data/fileTwo", 644,
+                       FileSourceList()
+                           << FileSource("http",
+                                                             "http://host/path/fileTwo-2"),
+                       "38f94f54fa3eb72b0ea836538c10b043"})
+            << (OperationList()
+                << Operation::DeleteOp("data/fileThree")
+                << Operation::CopyOp(
+                       FS::PathCombine(tempFolder,
+                                   QString("data/fileOne").replace("/", "_")),
+                       "data/fileOne", 493));
+    }
+    void test_processFileLists()
+    {
+        QFETCH(QString, tempFolder);
+        QFETCH(VersionFileList, currentVersion);
+        QFETCH(VersionFileList, newVersion);
+        QFETCH(OperationList, expectedOperations);
+
+        OperationList operations;
+
+        processFileLists(currentVersion, newVersion, QDir::currentPath(), tempFolder, new NetJob("Dummy"), operations);
+        qDebug() << (operations == expectedOperations);
+        qDebug() << operations;
+        qDebug() << expectedOperations;
+        QCOMPARE(operations, expectedOperations);
+    }
+
+    void test_OSXPathFixup()
+    {
+        QString path, pathOrig;
+        bool result;
+        // Proper OSX path
+        pathOrig = path = "MultiMC.app/Foo/Bar/Baz";
+        qDebug() << "Proper OSX path: " << path;
+        result = fixPathForOSX(path);
+        QCOMPARE(path, QString("Foo/Bar/Baz"));
+        QCOMPARE(result, true);
+
+        // Bad OSX path
+        pathOrig = path = "translations/klingon.lol";
+        qDebug() << "Bad OSX path: " << path;
+        result = fixPathForOSX(path);
+        QCOMPARE(path, pathOrig);
+        QCOMPARE(result, false);
+    }
 };
 
 extern "C"
 {
-	QTEST_GUILESS_MAIN(DownloadTaskTest)
+    QTEST_GUILESS_MAIN(DownloadTaskTest)
 }
 
 #include "DownloadTask_test.moc"
diff --git a/api/logic/updater/GoUpdate.cpp b/api/logic/updater/GoUpdate.cpp
index 716048a0..ef040db6 100644
--- a/api/logic/updater/GoUpdate.cpp
+++ b/api/logic/updater/GoUpdate.cpp
@@ -12,208 +12,208 @@ namespace GoUpdate
 
 bool parseVersionInfo(const QByteArray &data, VersionFileList &list, QString &error)
 {
-	QJsonParseError jsonError;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
-	if (jsonError.error != QJsonParseError::NoError)
-	{
-		error = QString("Failed to parse version info JSON: %1 at %2")
-					.arg(jsonError.errorString())
-					.arg(jsonError.offset);
-		qCritical() << error;
-		return false;
-	}
-
-	QJsonObject json = jsonDoc.object();
-
-	qDebug() << data;
-	qDebug() << "Loading version info from JSON.";
-	QJsonArray filesArray = json.value("Files").toArray();
-	for (QJsonValue fileValue : filesArray)
-	{
-		QJsonObject fileObj = fileValue.toObject();
-
-		QString file_path = fileObj.value("Path").toString();
+    QJsonParseError jsonError;
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
+    if (jsonError.error != QJsonParseError::NoError)
+    {
+        error = QString("Failed to parse version info JSON: %1 at %2")
+                    .arg(jsonError.errorString())
+                    .arg(jsonError.offset);
+        qCritical() << error;
+        return false;
+    }
+
+    QJsonObject json = jsonDoc.object();
+
+    qDebug() << data;
+    qDebug() << "Loading version info from JSON.";
+    QJsonArray filesArray = json.value("Files").toArray();
+    for (QJsonValue fileValue : filesArray)
+    {
+        QJsonObject fileObj = fileValue.toObject();
+
+        QString file_path = fileObj.value("Path").toString();
 #ifdef Q_OS_MAC
-		// On OSX, the paths for the updater need to be fixed.
-		// basically, anything that isn't in the .app folder is ignored.
-		// everything else is changed so the code that processes the files actually finds
-		// them and puts the replacements in the right spots.
-		fixPathForOSX(file_path);
+        // On OSX, the paths for the updater need to be fixed.
+        // basically, anything that isn't in the .app folder is ignored.
+        // everything else is changed so the code that processes the files actually finds
+        // them and puts the replacements in the right spots.
+        fixPathForOSX(file_path);
 #endif
-		VersionFileEntry file{file_path,		fileObj.value("Perms").toVariant().toInt(),
-							  FileSourceList(), fileObj.value("MD5").toString(), };
-		qDebug() << "File" << file.path << "with perms" << file.mode;
-
-		QJsonArray sourceArray = fileObj.value("Sources").toArray();
-		for (QJsonValue val : sourceArray)
-		{
-			QJsonObject sourceObj = val.toObject();
-
-			QString type = sourceObj.value("SourceType").toString();
-			if (type == "http")
-			{
-				file.sources.append(FileSource("http", sourceObj.value("Url").toString()));
-			}
-			else
-			{
-				qWarning() << "Unknown source type" << type << "ignored.";
-			}
-		}
-
-		qDebug() << "Loaded info for" << file.path;
-
-		list.append(file);
-	}
-
-	return true;
+        VersionFileEntry file{file_path,        fileObj.value("Perms").toVariant().toInt(),
+                              FileSourceList(), fileObj.value("MD5").toString(), };
+        qDebug() << "File" << file.path << "with perms" << file.mode;
+
+        QJsonArray sourceArray = fileObj.value("Sources").toArray();
+        for (QJsonValue val : sourceArray)
+        {
+            QJsonObject sourceObj = val.toObject();
+
+            QString type = sourceObj.value("SourceType").toString();
+            if (type == "http")
+            {
+                file.sources.append(FileSource("http", sourceObj.value("Url").toString()));
+            }
+            else
+            {
+                qWarning() << "Unknown source type" << type << "ignored.";
+            }
+        }
+
+        qDebug() << "Loaded info for" << file.path;
+
+        list.append(file);
+    }
+
+    return true;
 }
 
 bool processFileLists
 (
-	const VersionFileList &currentVersion,
-	const VersionFileList &newVersion,
-	const QString &rootPath,
-	const QString &tempPath,
-	NetJobPtr job,
-	OperationList &ops
+    const VersionFileList &currentVersion,
+    const VersionFileList &newVersion,
+    const QString &rootPath,
+    const QString &tempPath,
+    NetJobPtr job,
+    OperationList &ops
 )
 {
-	// First, if we've loaded the current version's file list, we need to iterate through it and
-	// delete anything in the current one version's list that isn't in the new version's list.
-	for (VersionFileEntry entry : currentVersion)
-	{
-		QFileInfo toDelete(FS::PathCombine(rootPath, entry.path));
-		if (!toDelete.exists())
-		{
-			qCritical()