summaryrefslogtreecommitdiffstats
path: root/api/logic/tasks
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-12-30 18:57:46 +0100
committerPetr Mrázek <peterix@gmail.com>2017-12-30 18:57:46 +0100
commit58ead6a1f40c8332757a362e79431d8dd9f85995 (patch)
tree9e1a1aee5091ccb675407884a310f8b2a364ee8a /api/logic/tasks
parent5937b1c3d479c906beaa62104769e1ccfaea8f8a (diff)
downloadMultiMC-58ead6a1f40c8332757a362e79431d8dd9f85995.tar
MultiMC-58ead6a1f40c8332757a362e79431d8dd9f85995.tar.gz
MultiMC-58ead6a1f40c8332757a362e79431d8dd9f85995.tar.lz
MultiMC-58ead6a1f40c8332757a362e79431d8dd9f85995.tar.xz
MultiMC-58ead6a1f40c8332757a362e79431d8dd9f85995.zip
NOISSUE handle 'folder' Flame packages by ignoring them, show warnings for minor Flame import problems
Diffstat (limited to 'api/logic/tasks')
-rw-r--r--api/logic/tasks/Task.cpp10
-rw-r--r--api/logic/tasks/Task.h6
2 files changed, 16 insertions, 0 deletions
diff --git a/api/logic/tasks/Task.cpp b/api/logic/tasks/Task.cpp
index bc48e902..9cd67e46 100644
--- a/api/logic/tasks/Task.cpp
+++ b/api/logic/tasks/Task.cpp
@@ -134,3 +134,13 @@ QString Task::failReason() const
return m_failReason;
}
+void Task::logWarning(const QString& line)
+{
+ qWarning() << line;
+ m_Warnings.append(line);
+}
+
+QStringList Task::warnings() const
+{
+ return m_Warnings;
+}
diff --git a/api/logic/tasks/Task.h b/api/logic/tasks/Task.h
index f54996c1..f7a508e9 100644
--- a/api/logic/tasks/Task.h
+++ b/api/logic/tasks/Task.h
@@ -37,6 +37,8 @@ public:
*/
QString failReason() const;
+ virtual QStringList warnings() const;
+
virtual bool canAbort() const { return false; }
QString getStatus()
@@ -54,6 +56,9 @@ public:
return m_progressTotal;
}
+protected:
+ void logWarning(const QString & line);
+
private:
QString describe();
@@ -85,6 +90,7 @@ 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;