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

45
launcher/ui/pages/modplatform/ResourceModel.cpp
View File

@ -123,8 +123,8 @@ void ResourceModel::fetchMore(const QModelIndex& parent)
void ResourceModel::search()
{
if (!m_current_job.isRunning())
m_current_job.clear();
if (hasActiveSearchJob())
return;
auto args{ createSearchArguments() };
@ -146,22 +146,22 @@ void ResourceModel::search()
};
if (auto job = m_api->searchProjects(std::move(args), std::move(callbacks)); job)
addActiveJob(job);
runSearchJob(job);
}
void ResourceModel::loadEntry(QModelIndex& entry)
{
auto const& pack = m_packs[entry.row()];
if (!m_current_job.isRunning())
m_current_job.clear();
if (!hasActiveInfoJob())
m_current_info_job.clear();
if (!pack.versionsLoaded) {
auto args{ createVersionsArguments(entry) };
auto callbacks{ createVersionsCallbacks(entry) };
if (auto job = m_api->getProjectVersions(std::move(args), std::move(callbacks)); job)
addActiveJob(job);
runInfoJob(job);
}
if (!pack.extraDataLoaded) {
@ -169,14 +169,25 @@ void ResourceModel::loadEntry(QModelIndex& entry)
auto callbacks{ createInfoCallbacks(entry) };
if (auto job = m_api->getProjectInfo(std::move(args), std::move(callbacks)); job)
addActiveJob(job);
runInfoJob(job);
}
}
void ResourceModel::refresh()
{
if (m_current_job.isRunning()) {
m_current_job.abort();
bool reset_requested = false;
if (hasActiveInfoJob()) {
m_current_info_job.abort();
reset_requested = true;
}
if (hasActiveSearchJob()) {
m_current_search_job->abort();
reset_requested = true;
}
if (reset_requested) {
m_search_state = SearchState::ResetRequested;
return;
}
@ -195,6 +206,22 @@ void ResourceModel::clearData()
endResetModel();
}
void ResourceModel::runSearchJob(NetJob::Ptr ptr)
{
m_current_search_job = ptr;
m_current_search_job->start();
}
void ResourceModel::runInfoJob(Task::Ptr ptr)
{
if (!m_current_info_job.isRunning())
m_current_info_job.clear();
m_current_info_job.addTask(ptr);
if (!m_current_info_job.isRunning())
m_current_info_job.run();
}
std::optional<QIcon> ResourceModel::getIcon(QModelIndex& index, const QUrl& url)
{
QPixmap pixmap;