CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SCRATCH nuke the overcomplicated logger, use a simple one.

Browse Source
This commit is contained in:
Petr Mrázek
2015-02-02 02:14:14 +01:00
parent 28a39ef7ac
commit cd9d37aac4
71 changed files with 415 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
logic/auth/flows/AuthenticateTask.cpp
View File

@ -23,7 +23,7 @@
#include <QJsonArray>
#include <QVariant>
#include "logger/QsLog.h"
#include <QDebug>
AuthenticateTask::AuthenticateTask(MojangAccount * account, const QString &password,
QObject *parent)
@ -74,11 +74,11 @@ void AuthenticateTask::processResponse(QJsonObject responseData)
{
// Read the response data. We need to get the client token, access token, and the selected
// profile.
QLOG_DEBUG() << "Processing authentication response.";
// QLOG_DEBUG() << responseData;
qDebug() << "Processing authentication response.";
// qDebug() << responseData;
// If we already have a client token, make sure the one the server gave us matches our
// existing one.
QLOG_DEBUG() << "Getting client token.";
qDebug() << "Getting client token.";
QString clientToken = responseData.value("clientToken").toString("");
if (clientToken.isEmpty())
{
@ -95,7 +95,7 @@ void AuthenticateTask::processResponse(QJsonObject responseData)
m_account->m_clientToken = clientToken;
// Now, we set the access token.
QLOG_DEBUG() << "Getting access token.";
qDebug() << "Getting access token.";
QString accessToken = responseData.value("accessToken").toString("");
if (accessToken.isEmpty())
{
@ -110,7 +110,7 @@ void AuthenticateTask::processResponse(QJsonObject responseData)
// Mojang hasn't yet implemented the profile system,
// but we might as well support what's there so we
// don't have trouble implementing it later.
QLOG_DEBUG() << "Loading profile list.";
qDebug() << "Loading profile list.";
QJsonArray availableProfiles = responseData.value("availableProfiles").toArray();
QList<AccountProfile> loadedProfiles;
for (auto iter : availableProfiles)
@ -126,7 +126,7 @@ void AuthenticateTask::processResponse(QJsonObject responseData)
// This should never happen, but we might as well
// warn about it if it does so we can debug it easily.
// You never know when Mojang might do something truly derpy.
QLOG_WARN() << "Found entry in available profiles list with missing ID or name "
qWarning() << "Found entry in available profiles list with missing ID or name "
"field. Ignoring it.";
}
@ -140,7 +140,7 @@ void AuthenticateTask::processResponse(QJsonObject responseData)
// We do need to make sure that the current profile that the server gave us
// is actually in the available profiles list.
// If it isn't, we'll just fail horribly (*shouldn't* ever happen, but you never know).
QLOG_DEBUG() << "Setting current profile.";
qDebug() << "Setting current profile.";
QJsonObject currentProfile = responseData.value("selectedProfile").toObject();
QString currentProfileId = currentProfile.value("id").toString("");
if (currentProfileId.isEmpty())
@ -173,7 +173,7 @@ void AuthenticateTask::processResponse(QJsonObject responseData)
// We've made it through the minefield of possible errors. Return true to indicate that
// we've succeeded.
QLOG_DEBUG() << "Finished reading authentication response.";
qDebug() << "Finished reading authentication response.";
changeState(STATE_SUCCEEDED);
}

10
logic/auth/flows/RefreshTask.cpp
View File

@ -22,7 +22,7 @@
#include <QJsonArray>
#include <QVariant>
#include "logger/QsLog.h"
#include <QDebug>
RefreshTask::RefreshTask(MojangAccount *account) : YggdrasilTask(account)
{
@ -63,9 +63,9 @@ void RefreshTask::processResponse(QJsonObject responseData)
{
// Read the response data. We need to get the client token, access token, and the selected
// profile.
QLOG_DEBUG() << "Processing authentication response.";
qDebug() << "Processing authentication response.";
// QLOG_DEBUG() << responseData;
// qDebug() << responseData;
// If we already have a client token, make sure the one the server gave us matches our
// existing one.
QString clientToken = responseData.value("clientToken").toString("");
@ -82,7 +82,7 @@ void RefreshTask::processResponse(QJsonObject responseData)
}
// Now, we set the access token.
QLOG_DEBUG() << "Getting new access token.";
qDebug() << "Getting new access token.";
QString accessToken = responseData.value("accessToken").toString("");
if (accessToken.isEmpty())
{
@ -120,7 +120,7 @@ void RefreshTask::processResponse(QJsonObject responseData)
// We've made it through the minefield of possible errors. Return true to indicate that
// we've succeeded.
QLOG_DEBUG() << "Finished reading refresh response.";
qDebug() << "Finished reading refresh response.";
// Reset the access token.
m_account->m_accessToken = accessToken;
changeState(STATE_SUCCEEDED);

2
logic/auth/flows/ValidateTask.cpp
View File

@ -23,7 +23,7 @@
#include <QJsonArray>
#include <QVariant>
#include "logger/QsLog.h"
#include <QDebug>
ValidateTask::ValidateTask(MojangAccount * account, QObject *parent)
: YggdrasilTask(account, parent)