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

NOISSUE tabs -> spaces

Browse Source
This commit is contained in:
Petr Mrázek
2018-07-15 14:51:05 +02:00
parent 03280cc62e
commit bbb3b3e6f6
577 changed files with 51938 additions and 51938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
api/logic/tasks/SequentialTask.cpp
View File

@ -6,50 +6,50 @@ SequentialTask::SequentialTask(QObject *parent) : Task(parent), m_currentIndex(-
void SequentialTask::addTask(std::shared_ptr<Task> task)
{
m_queue.append(task);
m_queue.append(task);
}
void SequentialTask::executeTask()
{
m_currentIndex = -1;
startNext();
m_currentIndex = -1;
startNext();
}
void SequentialTask::startNext()
{
if (m_currentIndex != -1)
{
std::shared_ptr<Task> previous = m_queue[m_currentIndex];
disconnect(previous.get(), 0, this, 0);
}
m_currentIndex++;
if (m_queue.isEmpty() || m_currentIndex >= m_queue.size())
{
emitSucceeded();
return;
}
std::shared_ptr<Task> next = m_queue[m_currentIndex];
connect(next.get(), SIGNAL(failed(QString)), this, SLOT(subTaskFailed(QString)));
connect(next.get(), SIGNAL(status(QString)), this, SLOT(subTaskStatus(QString)));
connect(next.get(), SIGNAL(progress(qint64, qint64)), this, SLOT(subTaskProgress(qint64, qint64)));
connect(next.get(), SIGNAL(succeeded()), this, SLOT(startNext()));
next->start();
if (m_currentIndex != -1)
{
std::shared_ptr<Task> previous = m_queue[m_currentIndex];
disconnect(previous.get(), 0, this, 0);
}
m_currentIndex++;
if (m_queue.isEmpty() || m_currentIndex >= m_queue.size())
{
emitSucceeded();
return;
}
std::shared_ptr<Task> next = m_queue[m_currentIndex];
connect(next.get(), SIGNAL(failed(QString)), this, SLOT(subTaskFailed(QString)));
connect(next.get(), SIGNAL(status(QString)), this, SLOT(subTaskStatus(QString)));
connect(next.get(), SIGNAL(progress(qint64, qint64)), this, SLOT(subTaskProgress(qint64, qint64)));
connect(next.get(), SIGNAL(succeeded()), this, SLOT(startNext()));
next->start();
}
void SequentialTask::subTaskFailed(const QString &msg)
{
emitFailed(msg);
emitFailed(msg);
}
void SequentialTask::subTaskStatus(const QString &msg)
{
setStatus(msg);
setStatus(msg);
}
void SequentialTask::subTaskProgress(qint64 current, qint64 total)
{
if(total == 0)
{
setProgress(0, 100);
return;
}
setProgress(current, total);
if(total == 0)
{
setProgress(0, 100);
return;
}
setProgress(current, total);
}

22
api/logic/tasks/SequentialTask.h
View File

@ -9,24 +9,24 @@
class MULTIMC_LOGIC_EXPORT SequentialTask : public Task
{
Q_OBJECT
Q_OBJECT
public:
explicit SequentialTask(QObject *parent = 0);
virtual ~SequentialTask() {};
explicit SequentialTask(QObject *parent = 0);
virtual ~SequentialTask() {};
void addTask(std::shared_ptr<Task> task);
void addTask(std::shared_ptr<Task> task);
protected:
void executeTask();
void executeTask();
private
slots:
void startNext();
void subTaskFailed(const QString &msg);
void subTaskStatus(const QString &msg);
void subTaskProgress(qint64 current, qint64 total);
void startNext();
void subTaskFailed(const QString &msg);
void subTaskStatus(const QString &msg);
void subTaskProgress(qint64 current, qint64 total);
private:
QQueue<std::shared_ptr<Task> > m_queue;
int m_currentIndex;
QQueue<std::shared_ptr<Task> > m_queue;
int m_currentIndex;
};

144
api/logic/tasks/Task.cpp
View File

@ -23,124 +23,124 @@ Task::Task(QObject *parent) : QObject(parent)
void Task::setStatus(const QString &new_status)
{
if(m_status != new_status)
{
m_status = new_status;
emit status(m_status);
}
if(m_status != new_status)
{
m_status = new_status;
emit status(m_status);
}
}
void Task::setProgress(qint64 current, qint64 total)
{
m_progress = current;
m_progressTotal = total;
emit progress(m_progress, m_progressTotal);
m_progress = current;
m_progressTotal = total;
emit progress(m_progress, m_progressTotal);
}
void Task::start()
{
m_running = true;
emit started();
qDebug() << "Task" << describe() << "started";
executeTask();
m_running = true;
emit started();
qDebug() << "Task" << describe() << "started";
executeTask();
}
void Task::emitFailed(QString reason)
{
// Don't fail twice.
if (!m_running)
{
qCritical() << "Task" << describe() << "failed while not running!!!!: " << reason;
return;
}
m_running = false;
m_finished = true;
m_succeeded = false;
m_failReason = reason;
qCritical() << "Task" << describe() << "failed: " << reason;
emit failed(reason);
emit finished();
// Don't fail twice.
if (!m_running)
{
qCritical() << "Task" << describe() << "failed while not running!!!!: " << reason;
return;
}
m_running = false;
m_finished = true;
m_succeeded = false;
m_failReason = reason;
qCritical() << "Task" << describe() << "failed: " << reason;
emit failed(reason);
emit finished();
}
void Task::emitAborted()
{
// Don't abort twice.
if (!m_running)
{
qCritical() << "Task" << describe() << "aborted while not running!!!!";
return;
}
m_running = false;
m_finished = true;
m_succeeded = false;
m_failReason = "Aborted.";
qDebug() << "Task" << describe() << "aborted.";
emit failed(m_failReason);
emit finished();
// Don't abort twice.
if (!m_running)
{
qCritical() << "Task" << describe() << "aborted while not running!!!!";
return;
}
m_running = false;
m_finished = true;
m_succeeded = false;
m_failReason = "Aborted.";
qDebug() << "Task" << describe() << "aborted.";
emit failed(m_failReason);
emit finished();
}
void Task::emitSucceeded()
{
// Don't succeed twice.
if (!m_running)
{
qCritical() << "Task" << describe() << "succeeded while not running!!!!";
return;
}
m_running = false;
m_finished = true;
m_succeeded = true;
qDebug() << "Task" << describe() << "succeeded";
emit succeeded();
emit finished();
// Don't succeed twice.
if (!m_running)
{
qCritical() << "Task" << describe() << "succeeded while not running!!!!";
return;
}
m_running = false;
m_finished = true;
m_succeeded = true;
qDebug() << "Task" << describe() << "succeeded";
emit succeeded();
emit finished();
}
QString Task::describe()
{
QString outStr;
QTextStream out(&outStr);
out << metaObject()->className() << QChar('(');
auto name = objectName();
if(name.isEmpty())
{
out << QString("0x%1").arg((quintptr)this, 0, 16);
}
else
{
out << name;
}
out << QChar(')');
out.flush();
return outStr;
QString outStr;
QTextStream out(&outStr);
out << metaObject()->className() << QChar('(');
auto name = objectName();
if(name.isEmpty())
{
out << QString("0x%1").arg((quintptr)this, 0, 16);
}
else
{
out << name;
}
out << QChar(')');
out.flush();
return outStr;
}
bool Task::isRunning() const
{
return m_running;
return m_running;
}
bool Task::isFinished() const
{
return m_finished;
return m_finished;
}
bool Task::wasSuccessful() const
{
return m_succeeded;
return m_succeeded;
}
QString Task::failReason() const
{
return m_failReason;
return m_failReason;
}
void Task::logWarning(const QString& line)
{
qWarning() << line;
m_Warnings.append(line);
qWarning() << line;
m_Warnings.append(line);
}
QStringList Task::warnings() const
{
return m_Warnings;
return m_Warnings;
}

98
api/logic/tasks/Task.h
View File

@ -23,78 +23,78 @@
class MULTIMC_LOGIC_EXPORT Task : public QObject
{
Q_OBJECT
Q_OBJECT
public:
explicit Task(QObject *parent = 0);
virtual ~Task() {};
explicit Task(QObject *parent = 0);
virtual ~Task() {};
bool isRunning() const;
bool isFinished() const;
bool wasSuccessful() const;
bool isRunning() const;
bool isFinished() const;
bool wasSuccessful() const;
/*!
* Returns the string that was passed to emitFailed as the error message when the task failed.
* If the task hasn't failed, returns an empty string.
*/
QString failReason() const;
/*!
* Returns the string that was passed to emitFailed as the error message when the task failed.
* If the task hasn't failed, returns an empty string.
*/
QString failReason() const;
virtual QStringList warnings() const;
virtual QStringList warnings() const;
virtual bool canAbort() const { return false; }
virtual bool canAbort() const { return false; }
QString getStatus()
{
return m_status;
}
QString getStatus()
{
return m_status;
}
qint64 getProgress()
{
return m_progress;
}
qint64 getProgress()
{
return m_progress;
}
qint64 getTotalProgress()
{
return m_progressTotal;
}
qint64 getTotalProgress()
{
return m_progressTotal;
}
protected:
void logWarning(const QString & line);
void logWarning(const QString & line);
private:
QString describe();
QString describe();
signals:
void started();
void progress(qint64 current, qint64 total);
void finished();
void succeeded();
void failed(QString reason);
void status(QString status);
void started();
void progress(qint64 current, qint64 total);
void finished();
void succeeded();
void failed(QString reason);
void status(QString status);
public slots:
virtual void start();
virtual bool abort() { return false; };
virtual void start();
virtual bool abort() { return false; };
protected:
virtual void executeTask() = 0;
virtual void executeTask() = 0;
protected slots:
virtual void emitSucceeded();
virtual void emitAborted();
virtual void emitFailed(QString reason);
virtual void emitSucceeded();
virtual void emitAborted();
virtual void emitFailed(QString reason);
public slots:
void setStatus(const QString &status);
void setProgress(qint64 current, qint64 total);
void setStatus(const QString &status);
void setProgress(qint64 current, qint64 total);
private:
bool m_running = false;
bool m_finished = false;
bool m_succeeded = false;
QStringList m_Warnings;
QString m_failReason = "";
QString m_status;
int m_progress = 0;
int m_progressTotal = 100;
bool m_running = false;
bool m_finished = false;
bool m_succeeded = false;
QStringList m_Warnings;
QString m_failReason = "";
QString m_status;
int m_progress = 0;
int m_progressTotal = 100;
};