Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Improved new version cleanup and more:

Browse source 
* fixed db cleanup on new version (sets + cards);
 * fixed empty sets list after update;
 * fixed NPE errors in sets list on new install/version;
 * added joke sets filter to deckeditor.
This commit is contained in:
Oleg Agafonov 2019-01-06 15:41:30 +04:00
parent 554e8076cf
commit f01b3d3ca3
11 changed files with 243 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Mage/src/main/java/mage/cards/repository/CardScanner.java
View file

@ -1,13 +1,12 @@
package mage.cards.repository;
import java.util.ArrayList;
import java.util.List;
import mage.cards.*;
import org.apache.log4j.Logger;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author North
*/
public final class CardScanner {
@ -27,14 +26,15 @@ public final class CardScanner {
scanned = true;
List<CardInfo> cardsToAdd = new ArrayList<>();
int setsUpdatedCount = 0;
int setsAddedCount = 0;
List<ExpansionInfo> setsToAdd = new ArrayList<>();
List<ExpansionInfo> setsToUpdate = new ArrayList<>();
// check sets
for (ExpansionSet set : Sets.getInstance().values()) {
ExpansionInfo expansionInfo = ExpansionRepository.instance.getSetByCode(set.getCode());
if (expansionInfo == null) {
setsAddedCount += 1;
ExpansionRepository.instance.add(new ExpansionInfo(set));
// need add
setsToAdd.add(new ExpansionInfo(set));
} else if (!expansionInfo.name.equals(set.getName())
|| !expansionInfo.code.equals(set.getCode())
|| (expansionInfo.blockName == null ? set.getBlockName() != null : !expansionInfo.blockName.equals(set.getBlockName()))
@ -42,22 +42,17 @@ public final class CardScanner {
|| expansionInfo.type != set.getSetType()
|| expansionInfo.boosters != set.hasBoosters()
|| expansionInfo.basicLands != set.hasBasicLands()) {
setsUpdatedCount += 1;
ExpansionRepository.instance.update(expansionInfo);
// need update
setsToUpdate.add(expansionInfo);
}
}
ExpansionRepository.instance.setContentVersion(ExpansionRepository.instance.getContentVersionConstant());
if (setsAddedCount > 0) {
logger.info("DB: need to add " + setsAddedCount + " new sets");
}
if (setsUpdatedCount > 0) {
logger.info("DB: need to update " + setsUpdatedCount + " sets");
}
ExpansionRepository.instance.saveSets(setsToAdd, setsToUpdate, ExpansionRepository.instance.getContentVersionConstant());
// check cards (only add mode, without updates)
for (ExpansionSet set : Sets.getInstance().values()) {
for (ExpansionSet.SetCardInfo setInfo : set.getSetCardInfo()) {
if (CardRepository.instance.findCard(set.getCode(), setInfo.getCardNumber()) == null) {
// need add
Card card = CardImpl.createCard(
setInfo.getCardClass(),
new CardSetInfo(setInfo.getName(), set.getCode(), setInfo.getCardNumber(), setInfo.getRarity(), setInfo.getGraphicInfo()),
@ -73,11 +68,6 @@ public final class CardScanner {
}
}
}
if (!cardsToAdd.isEmpty()) {
logger.info("DB: need to add " + cardsToAdd.size() + " new cards");
CardRepository.instance.addCards(cardsToAdd);
}
CardRepository.instance.setContentVersion(CardRepository.instance.getContentVersionConstant());
CardRepository.instance.saveCards(cardsToAdd, CardRepository.instance.getContentVersionConstant());
}
}