aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Import spoiler.xml as spoiler.xml and overwrite existing (#2784)

Browse source
This commit is contained in:
tritoch 2017-06-28 21:54:09 -05:00 committed by Zach H
parent bcda502b46
commit 5abfda49be
1 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
cockatrice/src/window_main.cpp
View file

@ -1027,14 +1027,14 @@ void MainWindow::actAddCustomSet()
if (!dialog.exec()) if (!dialog.exec())
return; return;
QString fileName = dialog.selectedFiles().at(0); QString fullFilePath = dialog.selectedFiles().at(0);
if (!QFile::exists(fileName)) { if (!QFile::exists(fullFilePath)) {
QMessageBox::warning(this, tr("Load sets/cards"), tr("Selected file cannot be found.")); QMessageBox::warning(this, tr("Load sets/cards"), tr("Selected file cannot be found."));
return; return;
} }
if (QFileInfo(fileName).suffix() != "xml") { // fileName = *.xml if (QFileInfo(fullFilePath).suffix() != "xml") { // fileName = *.xml
QMessageBox::warning(this, tr("Load sets/cards"), tr("You can only import XML databases at this time.")); QMessageBox::warning(this, tr("Load sets/cards"), tr("You can only import XML databases at this time."));
return; return;
} }
@ -1042,15 +1042,38 @@ void MainWindow::actAddCustomSet()
QDir dir = settingsCache->getCustomCardDatabasePath(); QDir dir = settingsCache->getCustomCardDatabasePath();
int nextPrefix = getNextCustomSetPrefix(dir); int nextPrefix = getNextCustomSetPrefix(dir);
bool res = QFile::copy( bool res = false;
fileName, dir.absolutePath() + "/" + (nextPrefix > 9 ? "" : "0") +
QString::number(nextPrefix) + "." + QFileInfo(fileName).fileName()
);
if (res) { QString fileName = QFileInfo(fullFilePath).fileName();
if (fileName.compare("spoiler.xml", Qt::CaseInsensitive) == 0)
{
/*
* If the file being added is "spoiler.xml"
* then we'll want to overwrite the old version
* and replace it with the new one
*/
if (QFile::exists(dir.absolutePath() + "/spoiler.xml"))
{
QFile::remove(dir.absolutePath() + "/spoiler.xml");
}
res = QFile::copy(fullFilePath, dir.absolutePath() + "/spoiler.xml");
}
else
{
res = QFile::copy(
fullFilePath,
dir.absolutePath() + "/" + (nextPrefix > 9 ? "" : "0") + QString::number(nextPrefix) + "." + fileName
);
}
if (res)
{
QMessageBox::information(this, tr("Load sets/cards"), tr("The new sets/cards have been added successfully.\nCockatrice will now reload the card database.")); QMessageBox::information(this, tr("Load sets/cards"), tr("The new sets/cards have been added successfully.\nCockatrice will now reload the card database."));
QtConcurrent::run(db, &CardDatabase::loadCardDatabases); QtConcurrent::run(db, &CardDatabase::loadCardDatabases);
} else { }
else
{
QMessageBox::warning(this, tr("Load sets/cards"), tr("Sets/cards failed to import.")); QMessageBox::warning(this, tr("Load sets/cards"), tr("Sets/cards failed to import."));
} }
} }