games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-24 03:47:18 +02:00
Code Issues Releases Activity

Block install / update buttons for mods that are being downloaded

Browse Source
This commit is contained in:
Ivan Savenko 2024-12-10 13:38:13 +00:00
parent bcada0eeed
commit 13497b5fa5
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
launcher/modManager/cmodlistview_moc.cpp
View File

@ -443,9 +443,10 @@ void CModListView::selectMod(const QModelIndex & index)
Helper::enableScrollBySwiping(ui->modInfoBrowser); Helper::enableScrollBySwiping(ui->modInfoBrowser);
Helper::enableScrollBySwiping(ui->changelogBrowser); Helper::enableScrollBySwiping(ui->changelogBrowser);
QStringList notInstalledDependencies = this->getModsToInstall(modName); QStringList notInstalledDependencies = getModsToInstall(modName);
QStringList unavailableDependencies = this->findUnavailableMods(notInstalledDependencies); QStringList unavailableDependencies = findUnavailableMods(notInstalledDependencies);
bool translationMismatch = mod.isTranslation() && CGeneralTextHandler::getPreferredLanguage() != mod.getBaseLanguage().toStdString(); bool translationMismatch = mod.isTranslation() && CGeneralTextHandler::getPreferredLanguage() != mod.getBaseLanguage().toStdString();
bool modIsBeingDownloaded = enqueuedModDownloads.contains(mod.getID());
ui->disableButton->setVisible(modStateModel->isModInstalled(mod.getID()) && modStateModel->isModEnabled(mod.getID())); ui->disableButton->setVisible(modStateModel->isModInstalled(mod.getID()) && modStateModel->isModEnabled(mod.getID()));
ui->enableButton->setVisible(modStateModel->isModInstalled(mod.getID()) && !modStateModel->isModEnabled(mod.getID())); ui->enableButton->setVisible(modStateModel->isModInstalled(mod.getID()) && !modStateModel->isModEnabled(mod.getID()));
@ -456,9 +457,9 @@ void CModListView::selectMod(const QModelIndex & index)
// Block buttons if action is not allowed at this time // Block buttons if action is not allowed at this time
ui->disableButton->setEnabled(true); ui->disableButton->setEnabled(true);
ui->enableButton->setEnabled(notInstalledDependencies.empty() && !translationMismatch); ui->enableButton->setEnabled(notInstalledDependencies.empty() && !translationMismatch);
ui->installButton->setEnabled(unavailableDependencies.empty()); ui->installButton->setEnabled(unavailableDependencies.empty() && !modIsBeingDownloaded);
ui->uninstallButton->setEnabled(true); ui->uninstallButton->setEnabled(true);
ui->updateButton->setEnabled(unavailableDependencies.empty()); ui->updateButton->setEnabled(unavailableDependencies.empty() && !modIsBeingDownloaded);
loadScreenshots(); loadScreenshots();
} }
@ -580,6 +581,8 @@ void CModListView::on_updateButton_clicked()
{ {
QString modName = ui->allModsView->currentIndex().data(ModRoles::ModNameRole).toString(); QString modName = ui->allModsView->currentIndex().data(ModRoles::ModNameRole).toString();
doUpdateMod(modName); doUpdateMod(modName);
ui->updateButton->setEnabled(false);
} }
void CModListView::doUpdateMod(const QString & modName) void CModListView::doUpdateMod(const QString & modName)
@ -587,14 +590,14 @@ void CModListView::doUpdateMod(const QString & modName)
auto targetMod = modStateModel->getMod(modName); auto targetMod = modStateModel->getMod(modName);
if(targetMod.isUpdateAvailable()) if(targetMod.isUpdateAvailable())
downloadFile(modName + ".zip", targetMod.getDownloadUrl(), modName, targetMod.getDownloadSizeBytes()); downloadMod(targetMod);
for(const auto & name : getModsToInstall(modName)) for(const auto & name : getModsToInstall(modName))
{ {
auto mod = modStateModel->getMod(name); auto mod = modStateModel->getMod(name);
// update required mod, install missing (can be new dependency) // update required mod, install missing (can be new dependency)
if(mod.isUpdateAvailable() || !mod.isInstalled()) if(mod.isUpdateAvailable() || !mod.isInstalled())
downloadFile(name + ".zip", mod.getDownloadUrl(), name, mod.getDownloadSizeBytes()); downloadMod(mod);
} }
} }
@ -621,10 +624,21 @@ void CModListView::on_installButton_clicked()
{ {
auto mod = modStateModel->getMod(name); auto mod = modStateModel->getMod(name);
if(mod.isAvailable()) if(mod.isAvailable())
downloadFile(name + ".zip", mod.getDownloadUrl(), name, mod.getDownloadSizeBytes()); downloadMod(mod);
else if(!modStateModel->isModEnabled(name)) else if(!modStateModel->isModEnabled(name))
enableModByName(name); enableModByName(name);
} }
ui->installButton->setEnabled(false);
}
void CModListView::downloadMod(const ModState & mod)
{
if (enqueuedModDownloads.contains(mod.getID()))
return;
enqueuedModDownloads.push_back(mod.getID());
downloadFile(mod.getID() + ".zip", mod.getDownloadUrl(), mod.getName(), mod.getDownloadSizeBytes());
} }
void CModListView::downloadFile(QString file, QUrl url, QString description, qint64 sizeBytes) void CModListView::downloadFile(QString file, QUrl url, QString description, qint64 sizeBytes)
@ -697,6 +711,7 @@ void CModListView::downloadFinished(QStringList savedFiles, QStringList failedFi
doInstallFiles = true; doInstallFiles = true;
} }
enqueuedModDownloads.clear();
dlManager->deleteLater(); dlManager->deleteLater();
dlManager = nullptr; dlManager = nullptr;
@ -958,7 +973,7 @@ void CModListView::doInstallMod(const QString & modName)
{ {
auto mod = modStateModel->getMod(name); auto mod = modStateModel->getMod(name);
if(!mod.isInstalled()) if(!mod.isInstalled())
downloadFile(name + ".zip", mod.getDownloadUrl(), name, mod.getDownloadSizeBytes()); downloadMod(mod);
} }
} }

3
launcher/modManager/cmodlistview_moc.h
View File

@ -37,6 +37,8 @@ class CModListView : public QWidget
CModFilterModel * filterModel; CModFilterModel * filterModel;
CDownloadManager * dlManager; CDownloadManager * dlManager;
QStringList enqueuedModDownloads;
void setupModModel(); void setupModModel();
void setupFilterModel(); void setupFilterModel();
void setupModsView(); void setupModsView();
@ -112,6 +114,7 @@ public:
/// returns true if mod is currently installed /// returns true if mod is currently installed
bool isModInstalled(const QString & modName); bool isModInstalled(const QString & modName);
void downloadMod(const ModState & mod);
void downloadFile(QString file, QUrl url, QString description, qint64 sizeBytes = 0); void downloadFile(QString file, QUrl url, QString description, qint64 sizeBytes = 0);
public slots: public slots: