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

fix(RD): separate search and versions/info tasks

Browse Source 
This allows us to check whether a search request is already on-going, in
which case we don't need to make another one (and shouldn't).

Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow
2022-12-20 17:14:17 -03:00
parent 38e20eb148
commit 563fe8d515
4 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
launcher/ui/pages/modplatform/ResourceModel.h
View File

@ -40,8 +40,9 @@ class ResourceModel : public QAbstractListModel {
[[nodiscard]] inline int columnCount(const QModelIndex& parent) const override { return parent.isValid() ? 0 : 1; }
[[nodiscard]] inline auto flags(const QModelIndex& index) const -> Qt::ItemFlags override { return QAbstractListModel::flags(index); }
inline void addActiveJob(Task::Ptr ptr) { m_current_job.addTask(ptr); if (!m_current_job.isRunning()) m_current_job.start(); }
inline Task const& activeJob() { return m_current_job; }
[[nodiscard]] bool hasActiveSearchJob() const { return m_current_search_job && m_current_search_job->isRunning(); }
[[nodiscard]] bool hasActiveInfoJob() const { return m_current_info_job.isRunning(); }
[[nodiscard]] Task::Ptr activeSearchJob() { return hasActiveSearchJob() ? m_current_search_job : nullptr; }
[[nodiscard]] auto getSortingMethods() const { return m_api->getSortingMethods(); }
@ -80,6 +81,9 @@ class ResourceModel : public QAbstractListModel {
/** Resets the model's data. */
void clearData();
void runSearchJob(NetJob::Ptr);
void runInfoJob(Task::Ptr);
protected:
const BaseInstance& m_base_instance;
@ -91,7 +95,10 @@ class ResourceModel : public QAbstractListModel {
std::unique_ptr<ResourceAPI> m_api;
ConcurrentTask m_current_job;
// Job for searching for new entries
shared_qobject_ptr<NetJob> m_current_search_job;
// Job for fetching versions and extra info on existing entries
ConcurrentTask m_current_info_job;
shared_qobject_ptr<NetJob> m_current_icon_job;
QSet<QUrl> m_currently_running_icon_actions;