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

Merge d38a8d9145 into 587c4b43c1

Browse source
This commit is contained in:
RickyRister 2026-11-13 02:18:39 -07:00 • committed by GitHub
commit 62aa00c97b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
View file

@ -128,16 +128,9 @@ void CardSetList::markAllAsKnownBatched(ICardSetPriorityController *controller)
continue; continue;
} }
bool changed = false; if (!set->getIsKnown()) {
if (!set->getIsKnown() && !set->getIsKnownIgnored()) {
set->setIsKnownInMemory(true); set->setIsKnownInMemory(true);
set->setEnabledInMemory(false); set->setEnabledInMemory(set->getIsKnownIgnored());
changed = true;
} else if (set->getIsKnownIgnored() && !set->getEnabled()) {
set->setEnabledInMemory(true);
changed = true;
}
if (changed) {
saveData.append({set->getShortName(), static_cast<unsigned int>(set->getSortKey()), set->getEnabled(), saveData.append({set->getShortName(), static_cast<unsigned int>(set->getSortKey()), set->getEnabled(),
set->getIsKnown()}); set->getIsKnown()});
} }

18
tests/carddatabase/carddatabase_test.cpp
View file

@ -663,6 +663,24 @@ TEST_F(CardDatabaseCacheInvalidationTest, MarkAllSetsAsKnownIsBatched)
EXPECT_TRUE(controller.isEnabled("XXX")); EXPECT_TRUE(controller.isEnabled("XXX"));
} }
TEST_F(CardDatabaseCacheInvalidationTest, MarkAllSetsAsKnownDoesNotOverwriteSettings)
{
SeededSetPriorityController controller;
CardSetList sets;
sets.append(CardSet::newInstance(&controller, "XXX")); // no metadata: ignored
// Ignored sets keep their known state but are enabled.
sets.markAllAsKnownBatched(&controller);
EXPECT_TRUE(controller.isEnabled("XXX")) << "unnamed set starts enabled";
// disable the set
controller.setEnabled("XXX", false);
// set should still be disabled after batching
sets.markAllAsKnownBatched(&controller);
EXPECT_FALSE(controller.isEnabled("XXX")) << "unnamed set should still be disabled after marking";
}
TEST_F(CardDatabaseCacheInvalidationTest, ReloadReleasesPreviousSnapshot) TEST_F(CardDatabaseCacheInvalidationTest, ReloadReleasesPreviousSnapshot)
{ {
NoopCardPreferenceProvider prefs; NoopCardPreferenceProvider prefs;