games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

basic error reporting for launcher.

Browse Source
This commit is contained in:
Ivan Savenko 2013-09-05 21:25:03 +00:00
parent 0a627698d8
commit 8515bd037d
4 changed files with 67 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
launcher/modManager/cmodlistview_moc.cpp
View File

@ -341,6 +341,7 @@ void CModListView::on_enableButton_clicked()
for (auto & name : modModel->getRequirements(modName))
if (modModel->getMod(name).isDisabled())
manager->enableMod(name);
checkManagerErrors();
}
void CModListView::on_disableButton_clicked()
@ -351,6 +352,7 @@ void CModListView::on_disableButton_clicked()
if (modModel->hasMod(name) &&
modModel->getMod(name).isEnabled())
manager->disableMod(name);
checkManagerErrors();
}
void CModListView::on_updateButton_clicked()
@ -379,6 +381,7 @@ void CModListView::on_uninstallButton_clicked()
manager->disableMod(modName);
manager->uninstallMod(modName);
}
checkManagerErrors();
}
void CModListView::on_installButton_clicked()
@ -488,8 +491,6 @@ void CModListView::installFiles(QStringList files)
void CModListView::installMods(QStringList archives)
{
//TODO: check return status of all calls to manager!!!
QStringList modNames;
for (QString archive : archives)
@ -503,11 +504,17 @@ void CModListView::installMods(QStringList archives)
// disable mod(s), to properly recalculate dependencies, if changed
for (QString mod : boost::adaptors::reverse(modNames))
manager->disableMod(mod);
{
if (modModel->getMod(mod).isInstalled())
manager->disableMod(mod);
}
// uninstall old version of mod, if installed
for (QString mod : boost::adaptors::reverse(modNames))
manager->uninstallMod(mod);
{
if (modModel->getMod(mod).isInstalled())
manager->uninstallMod(mod);
}
for (int i=0; i<modNames.size(); i++)
manager->installMod(modNames[i], archives[i]);
@ -520,6 +527,8 @@ void CModListView::installMods(QStringList archives)
for (QString archive : archives)
QFile::remove(archive);
checkManagerErrors();
}
void CModListView::on_pushButton_clicked()
@ -534,3 +543,14 @@ void CModListView::modelReset()
//selectMod(filterModel->mapToSource(ui->allModsView->currentIndex()).row());
selectMod(filterModel->rowCount() > 0 ? 0 : -1);
}
void CModListView::checkManagerErrors()
{
QString errors = manager->getErrors().join('\n');
if (errors.size() != 0)
{
QString title = "Operation failed";
QString description = "Encountered errors:\n" + errors;
QMessageBox::warning(this, title, description, QMessageBox::Ok, QMessageBox::Ok );
}
}

2
launcher/modManager/cmodlistview_moc.h
View File

@ -36,6 +36,8 @@ class CModListView : public QWidget
void setupModsView();
void loadRepositories();
void checkManagerErrors();
// find mods unknown to mod list (not present in repo and not installed)
QStringList findInvalidDependencies(QString mod);
// find mods that block enabling of this mod: conflicting with this mod or one of required mods

60
launcher/modManager/cmodmanager.cpp
View File

@ -93,6 +93,19 @@ void CModManager::loadMods()
modList->setLocalModList(localMods);
}
bool CModManager::addError(QString modname, QString message)
{
recentErrors.push_back(QString("%1: %2").arg(modname).arg(message));
return false;
}
QStringList CModManager::getErrors()
{
QStringList ret = recentErrors;
recentErrors.clear();
return ret;
}
bool CModManager::installMod(QString modname, QString archivePath)
{
return canInstallMod(modname) && doInstallMod(modname, archivePath);
@ -118,10 +131,10 @@ bool CModManager::canInstallMod(QString modname)
auto mod = modList->getMod(modname);
if (mod.isInstalled())
return false;
return addError(modname, "Mod is already installed");
if (!mod.isAvailable())
return false;
return addError(modname, "Mod is not available");
return true;
}
@ -130,10 +143,10 @@ bool CModManager::canUninstallMod(QString modname)
auto mod = modList->getMod(modname);
if (!mod.isInstalled())
return false;
return addError(modname, "Mod is not installed");
if (mod.isEnabled())
return false;
return addError(modname, "Mod must be disabled first");
return true;
}
@ -142,32 +155,33 @@ bool CModManager::canEnableMod(QString modname)
auto mod = modList->getMod(modname);
if (mod.isEnabled())
return false;
return addError(modname, "Mod is already enabled");
if (!mod.isInstalled())
return false;
return addError(modname, "Mod must be installed first");
for (auto modEntry : mod.getValue("depends").toStringList())
{
if (!modList->hasMod(modEntry)) // required mod is not available
return false;
return addError(modname, QString("Required mod %1 is missing").arg(modEntry));
if (!modList->getMod(modEntry).isEnabled())
return false;
return addError(modname, QString("Required mod %1 is not enabled").arg(modEntry));
}
for (QString name : modList->getModList())
for (QString modEntry : modList->getModList())
{
auto mod = modList->getMod(name);
auto mod = modList->getMod(modEntry);
// "reverse conflict" - enabled mod has this one as conflict
if (mod.isEnabled() && mod.getValue("conflicts").toStringList().contains(modname))
return false; // "reverse conflict" - enabled mod has this one as conflict
return addError(modname, QString("This mod conflicts with %1").arg(modEntry));
}
for (auto modEntry : mod.getValue("conflicts").toStringList())
{
if (modList->hasMod(modEntry) &&
modList->getMod(modEntry).isEnabled()) // conflicting mod installed and enabled
return false;
return addError(modname, QString("This mod conflicts with %1").arg(modEntry));
}
return true;
}
@ -177,10 +191,10 @@ bool CModManager::canDisableMod(QString modname)
auto mod = modList->getMod(modname);
if (mod.isDisabled())
return false;
return addError(modname, "Mod is already disabled");
if (!mod.isInstalled())
return false;
return addError(modname, "Mod must be installed first");
for (QString modEntry : modList->getModList())
{
@ -188,7 +202,7 @@ bool CModManager::canDisableMod(QString modname)
if (current.getValue("depends").toStringList().contains(modname) &&
current.isEnabled())
return false; // this mod must be disabled first
return addError(modname, QString("This mod is needed to run %1").arg(modEntry));
}
return true;
}
@ -213,22 +227,22 @@ bool CModManager::doInstallMod(QString modname, QString archivePath)
QString destDir = CLauncherDirs::get().modsPath() + "/";
if (!QFile(archivePath).exists())
return false; // archive with mod data exists
return addError(modname, "Mod archive is missing");
if (QDir(destDir + modname).exists()) // FIXME: recheck wog/vcmi data behavior - they have bits of data in our trunk
return false; // no mod with such name installed
return addError(modname, "Mod with such name is already installed");
if (localMods.contains(modname))
return false; // no installed data known
return addError(modname, "Mod with such name is already installed");
QString modDirName = detectModArchive(archivePath, modname);
if (!modDirName.size())
return false; // archive content looks like mod FS
return addError(modname, "Mod archive is invalid or corrupted");
if (!ZipArchive::extract(archivePath.toUtf8().data(), destDir.toUtf8().data()))
{
QDir(destDir + modDirName).removeRecursively();
return false; // extraction failed
return addError(modname, "Failed to extract mod data");
}
QJsonObject json = JsonFromFile(destDir + modDirName + "/mod.json");
@ -246,13 +260,13 @@ bool CModManager::doUninstallMod(QString modname)
QString modDir = QString::fromUtf8(CResourceHandler::get()->getResourceName(resID)->c_str());
if (!QDir(modDir).exists())
return false;
return addError(modname, "Data with this mod was not found");
if (!localMods.contains(modname))
return false;
return addError(modname, "Data with this mod was not found");
if (!QDir(modDir).removeRecursively())
return false;
return addError(modname, "Failed to delete mod data");
localMods.remove(modname);
modList->setLocalModList(localMods);

4
launcher/modManager/cmodmanager.h
View File

@ -16,6 +16,8 @@ class CModManager
QJsonObject modSettings;
QJsonObject localMods;
QStringList recentErrors;
bool addError(QString modname, QString message);
public:
CModManager(CModList * modList);
@ -24,6 +26,8 @@ public:
void loadModSettings();
void loadMods();
QStringList getErrors();
/// mod management functions. Return true if operation was successful
/// installs mod from zip archive located at archivePath