1 files changed, 101 insertions, 101 deletions

diff --git a/api/logic/meta/BaseEntity.cpp b/api/logic/meta/BaseEntity.cpp
index 5c2339cb..ce0be859 100644
--- a/api/logic/meta/BaseEntity.cpp
+++ b/api/logic/meta/BaseEntity.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2015-2018 MultiMC Contributors
+/* Copyright 2015-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,45 +27,45 @@
 class ParsingValidator : public Net::Validator
 {
 public: /* con/des */
-	ParsingValidator(Meta::BaseEntity *entity) : m_entity(entity)
-	{
-	};
-	virtual ~ParsingValidator()
-	{
-	};
+    ParsingValidator(Meta::BaseEntity *entity) : m_entity(entity)
+    {
+    };
+    virtual ~ParsingValidator()
+    {
+    };
 
 public: /* methods */
-	bool init(QNetworkRequest &) override
-	{
-		return true;
-	}
-	bool write(QByteArray & data) override
-	{
-		this->data.append(data);
-		return true;
-	}
-	bool abort() override
-	{
-		return true;
-	}
-	bool validate(QNetworkReply &) override
-	{
-		auto fname = m_entity->localFilename();
-		try
-		{
-			m_entity->parse(Json::requireObject(Json::requireDocument(data, fname), fname));
-			return true;
-		}
-		catch (Exception &e)
-		{
-			qWarning() << "Unable to parse response:" << e.cause();
-			return false;
-		}
-	}
+    bool init(QNetworkRequest &) override
+    {
+        return true;
+    }
+    bool write(QByteArray & data) override
+    {
+        this->data.append(data);
+        return true;
+    }
+    bool abort() override
+    {
+        return true;
+    }
+    bool validate(QNetworkReply &) override
+    {
+        auto fname = m_entity->localFilename();
+        try
+        {
+            m_entity->parse(Json::requireObject(Json::requireDocument(data, fname), fname));
+            return true;
+        }
+        catch (const Exception &e)
+        {
+            qWarning() << "Unable to parse response:" << e.cause();
+            return false;
+        }
+    }
 
 private: /* data */
-	QByteArray data;
-	Meta::BaseEntity *m_entity;
+    QByteArray data;
+    Meta::BaseEntity *m_entity;
 };
 
 Meta::BaseEntity::~BaseEntity()
@@ -74,89 +74,89 @@ Meta::BaseEntity::~BaseEntity()
 
 QUrl Meta::BaseEntity::url() const
 {
-	return QUrl("https://v1.meta.multimc.org").resolved(localFilename());
+    return QUrl("https://meta.multimc.org/v1/").resolved(localFilename());
 }
 
 bool Meta::BaseEntity::loadLocalFile()
 {
-	const QString fname = QDir("meta").absoluteFilePath(localFilename());
-	if (!QFile::exists(fname))
-	{
-		return false;
-	}
-	// TODO: check if the file has the expected checksum
-	try
-	{
-		parse(Json::requireObject(Json::requireDocument(fname, fname), fname));
-		return true;
-	}
-	catch (Exception &e)
-	{
-		qDebug() << QString("Unable to parse file %1: %2").arg(fname, e.cause());
-		// just make sure it's gone and we never consider it again.
-		QFile::remove(fname);
-		return false;
-	}
+    const QString fname = QDir("meta").absoluteFilePath(localFilename());
+    if (!QFile::exists(fname))
+    {
+        return false;
+    }
+    // TODO: check if the file has the expected checksum
+    try
+    {
+        parse(Json::requireObject(Json::requireDocument(fname, fname), fname));
+        return true;
+    }
+    catch (const Exception &e)
+    {
+        qDebug() << QString("Unable to parse file %1: %2").arg(fname, e.cause());
+        // just make sure it's gone and we never consider it again.
+        QFile::remove(fname);
+        return false;
+    }
 }
 
 void Meta::BaseEntity::load(Net::Mode loadType)
 {
-	// load local file if nothing is loaded yet
-	if(!isLoaded())
-	{
-		if(loadLocalFile())
-		{
-			m_loadStatus = LoadStatus::Local;
-		}
-	}
-	// if we need remote update, run the update task
-	if(loadType == Net::Mode::Offline || !shouldStartRemoteUpdate())
-	{
-		return;
-	}
-	NetJob *job = new NetJob(QObject::tr("Download of meta file %1").arg(localFilename()));
-	auto url = this->url();
-	auto entry = ENV.metacache()->resolveEntry("meta", localFilename());
-	entry->setStale(true);
-	auto dl = Net::Download::makeCached(url, entry);
-	/*
-	 * The validator parses the file and loads it into the object.
-	 * If that fails, the file is not written to storage.
-	 */
-	dl->addValidator(new ParsingValidator(this));
-	job->addNetAction(dl);
-	m_updateStatus = UpdateStatus::InProgress;
-	m_updateTask.reset(job);
-	QObject::connect(job, &NetJob::succeeded, [&]()
-	{
-		m_loadStatus = LoadStatus::Remote;
-		m_updateStatus = UpdateStatus::Succeeded;
-		m_updateTask.reset();
-	});
-	QObject::connect(job, &NetJob::failed, [&]()
-	{
-		m_updateStatus = UpdateStatus::Failed;
-		m_updateTask.reset();
-	});
-	m_updateTask->start();
+    // load local file if nothing is loaded yet
+    if(!isLoaded())
+    {
+        if(loadLocalFile())
+        {
+            m_loadStatus = LoadStatus::Local;
+        }
+    }
+    // if we need remote update, run the update task
+    if(loadType == Net::Mode::Offline || !shouldStartRemoteUpdate())
+    {
+        return;
+    }
+    NetJob *job = new NetJob(QObject::tr("Download of meta file %1").arg(localFilename()));
+    auto url = this->url();
+    auto entry = ENV.metacache()->resolveEntry("meta", localFilename());
+    entry->setStale(true);
+    auto dl = Net::Download::makeCached(url, entry);
+    /*
+     * The validator parses the file and loads it into the object.
+     * If that fails, the file is not written to storage.
+     */
+    dl->addValidator(new ParsingValidator(this));
+    job->addNetAction(dl);
+    m_updateStatus = UpdateStatus::InProgress;
+    m_updateTask.reset(job);
+    QObject::connect(job, &NetJob::succeeded, [&]()
+    {
+        m_loadStatus = LoadStatus::Remote;
+        m_updateStatus = UpdateStatus::Succeeded;
+        m_updateTask.reset();
+    });
+    QObject::connect(job, &NetJob::failed, [&]()
+    {
+        m_updateStatus = UpdateStatus::Failed;
+        m_updateTask.reset();
+    });
+    m_updateTask->start();
 }
 
 bool Meta::BaseEntity::isLoaded() const
 {
-	return m_loadStatus > LoadStatus::NotLoaded;
+    return m_loadStatus > LoadStatus::NotLoaded;
 }
 
 bool Meta::BaseEntity::shouldStartRemoteUpdate() const
 {
-	// TODO: version-locks and offline mode?
-	return m_updateStatus != UpdateStatus::InProgress;
+    // TODO: version-locks and offline mode?
+    return m_updateStatus != UpdateStatus::InProgress;
 }
 
 shared_qobject_ptr<Task> Meta::BaseEntity::getCurrentTask()
 {
-	if(m_updateStatus == UpdateStatus::InProgress)
-	{
-		return m_updateTask;
-	}
-	return nullptr;
+    if(m_updateStatus == UpdateStatus::InProgress)
+    {
+        return m_updateTask;
+    }
+    return nullptr;
 }