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

Added some additional logic to prevent the ExpansionRepository update errors.

Browse source
This commit is contained in:
LevelX2 2017-01-08 20:41:29 +01:00
parent ac9d525e75
commit 0ec712fcd9
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,12 +25,10 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.cards.repository;
import java.util.ArrayList;
import java.util.List;
import mage.cards.*;
import org.apache.log4j.Logger;
@ -53,7 +51,18 @@ public class CardScanner {
List<CardInfo> cardsToAdd = new ArrayList<>();
for (ExpansionSet set : Sets.getInstance().values()) {
ExpansionRepository.instance.add(new ExpansionInfo(set));
ExpansionInfo expansionInfo = ExpansionRepository.instance.getSetByCode(set.getCode());
if (expansionInfo == null) {
ExpansionRepository.instance.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()))
|| !expansionInfo.releaseDate.equals(set.getReleaseDate())
|| !expansionInfo.type.equals(set.getSetType())
|| expansionInfo.boosters != set.hasBoosters()
|| expansionInfo.basicLands != set.hasBasicLands()) {
ExpansionRepository.instance.update(expansionInfo);
}
}
ExpansionRepository.instance.setContentVersion(ExpansionRepository.instance.getContentVersionConstant());
@ -62,7 +71,7 @@ public class CardScanner {
if (CardRepository.instance.findCard(set.getCode(), setInfo.getCardNumber()) == null) {
Card card = CardImpl.createCard(setInfo.getCardClass(),
new CardSetInfo(setInfo.getName(), set.getCode(), setInfo.getCardNumber(),
setInfo.getRarity(), setInfo.getGraphicInfo()));
setInfo.getRarity(), setInfo.getGraphicInfo()));
if (card != null) {
cardsToAdd.add(new CardInfo(card));
if (card instanceof SplitCard) {

11
Mage/src/main/java/mage/cards/repository/ExpansionRepository.java
View file

@ -7,14 +7,13 @@ import com.j256.ormlite.stmt.QueryBuilder;
import com.j256.ormlite.stmt.SelectArg;
import com.j256.ormlite.support.ConnectionSource;
import com.j256.ormlite.table.TableUtils;
import org.apache.log4j.Logger;
import java.io.File;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import org.apache.log4j.Logger;
/**
*
@ -61,6 +60,14 @@ public enum ExpansionRepository {
}
}
public void update(ExpansionInfo expansion) {
try {
expansionDao.update(expansion);
} catch (SQLException ex) {
logger.error(ex);
}
}
public List<String> getSetCodes() {
List<String> setCodes = new ArrayList<>();
try {