jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-05 13:03:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[DeckLoader] Don't modify text deck files on load (#6888)

Browse source 
* [DeckLoader] Don't modify text deck files on load

* formatter
This commit is contained in:
RickyRister 2026-05-13 11:32:05 -07:00 • committed by GitHub
parent 7507103bb2
commit 67f6ab66f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cockatrice/src/interface/deck_loader/deck_loader.cpp
View file

@ -181,6 +181,11 @@ bool DeckLoader::saveToNewFile(LoadedDeck &deck, const QString &fileName, DeckFi
*/ */
bool DeckLoader::updateLastLoadedTimestamp(LoadedDeck &deck) bool DeckLoader::updateLastLoadedTimestamp(LoadedDeck &deck)
{ {
// text format doesn't support lastLoadedTimestamp, so there's no point in proceeding
if (deck.lastLoadInfo.fileFormat != DeckFileFormat::Cockatrice) {
return false;
}
QString fileName = deck.lastLoadInfo.fileName; QString fileName = deck.lastLoadInfo.fileName;
QFileInfo fileInfo(fileName); QFileInfo fileInfo(fileName);
@ -201,15 +206,8 @@ bool DeckLoader::updateLastLoadedTimestamp(LoadedDeck &deck)
bool result = false; bool result = false;
// Perform file modifications // Perform file modifications
switch (deck.lastLoadInfo.fileFormat) { deck.deckList.setLastLoadedTimestamp(QDateTime::currentDateTime().toString());
case DeckFileFormat::PlainText: result = deck.deckList.saveToFile_Native(&file);
result = deck.deckList.saveToFile_Plain(&file);
break;
case DeckFileFormat::Cockatrice:
deck.deckList.setLastLoadedTimestamp(QDateTime::currentDateTime().toString());
result = deck.deckList.saveToFile_Native(&file);
break;
}
file.close(); // Close the file to ensure changes are flushed file.close(); // Close the file to ensure changes are flushed
@ -429,8 +427,7 @@ void DeckLoader::saveToStream_DeckZoneCards(QTextStream &out,
} }
if (addSetNameAndNumber) { if (addSetNameAndNumber) {
if (!card->getCardSetShortName().isNull() && !card->getCardSetShortName().isEmpty()) { if (!card->getCardSetShortName().isNull() && !card->getCardSetShortName().isEmpty()) {
out << " " out << " " << "(" << card->getCardSetShortName() << ")";
<< "(" << card->getCardSetShortName() << ")";
} }
if (!card->getCardCollectorNumber().isNull()) { if (!card->getCardCollectorNumber().isNull()) {
out << " " << card->getCardCollectorNumber(); out << " " << card->getCardCollectorNumber();