github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix error on download some symbols

Browse source
This commit is contained in:
Oleg Agafonov 2017-11-15 21:21:36 +04:00
parent feb53492e6
commit b53d57bce9
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java
View file

@ -64,8 +64,10 @@ public class GathererSets implements Iterable<DownloadJob> {
"POR", "P02", "PTK", "POR", "P02", "PTK",
"ARC", "DD3EVG", "ARC", "DD3EVG",
"W16", "W17", "W16", "W17",
"APAC", "ARENA", "CHR", "CLASH", "CP", "DD3GVL", "DPA", "EURO", "FNMP", "GPX", "GRC", "GUR", "H17", "JR", "MBP", "MGDC", "MLP", "MPRP", "MPS-AKH", "PTC", "S00", "S99", "SUS", "SWS", "UGIN", "UGL", "V10", "V17", "WMCQ", // need to fix //"APAC" -- gatherer do not have that set, scrly have PALP
"H09", "PD2", "PD3", "UNH", "CM1", "E02", "V11", "M25", "UST", "IMA", "DD2", "EVG", "DDC", "DDE", "DDD", "DDT", "8EB", "9EB" // ok //"ARENA" -- is't many set with different codes, not one
"CLASH", "CP", "DD3GVL", "DPA", "EURO", "FNMP", "GPX", "GRC", "GUR", "H17", "JR", "MBP", "MGDC", "MLP", "MPRP", "MPS-AKH", "PTC", "S00", "S99", "SUS", "SWS", "UGIN", "UGL", "V10", "V17", "WMCQ", // need to fix
"H09", "PD2", "PD3", "UNH", "CM1", "E02", "V11", "M25", "UST", "IMA", "DD2", "EVG", "DDC", "DDE", "DDD", "DDT", "8EB", "9EB", "CHR" // ok
// current testing // current testing
}; };
@ -145,6 +147,7 @@ public class GathererSets implements Iterable<DownloadJob> {
codeReplacements.put("WTH", "WL"); codeReplacements.put("WTH", "WL");
codeReplacements.put("8EB", "8ED"); // inner xmage set for 8th edition codeReplacements.put("8EB", "8ED"); // inner xmage set for 8th edition
codeReplacements.put("9EB", "8ED"); // inner xmage set for 9th edition codeReplacements.put("9EB", "8ED"); // inner xmage set for 9th edition
codeReplacements.put("CHR", "CH");
} }
public GathererSets(String path) { public GathererSets(String path) {
@ -156,26 +159,26 @@ public class GathererSets implements Iterable<DownloadJob> {
} }
// checks for wrong card settings and support (easy to control what all good) // checks for wrong card settings and support (easy to control what all good)
private static final HashMap<String, CheckResult> setsToDonwload = new HashMap<>(); private static final HashMap<String, CheckResult> setsToDownload = new HashMap<>();
private static final HashMap<String, String> codesToIgnoreCheck = new HashMap<>(); private static final HashMap<String, String> codesToIgnoreCheck = new HashMap<>();
static { static {
// xMage have inner sets for 8th and 9th Edition for booster workaround (cards from core game do not include in boosters) // xMage have inner sets for 8th and 9th Edition for booster workaround (cards from core game do not include in boosters)
// see https://mtg.gamepedia.com/8th_Edition/Core_Game // see https://mtg.gamepedia.com/8th_Edition/Core_Game
// check must ignore that sets // check must ignore that sets
//codesToIgnoreCheck.put("8EB", "8th Edition Box"); codesToIgnoreCheck.put("8EB", "8th Edition Box");
//codesToIgnoreCheck.put("9EB", "9th Edition Box"); codesToIgnoreCheck.put("9EB", "9th Edition Box");
} }
private void CheckSearchResult(String searchCode, ExpansionSet foundedExp, boolean canDownloadTask, private void CheckSearchResult(String searchCode, ExpansionSet foundedExp, boolean canDownloadTask,
boolean haveCommon, boolean haveUncommon, boolean haveRare, boolean haveMyth){ boolean haveCommon, boolean haveUncommon, boolean haveRare, boolean haveMyth){
// duplicated in settings // duplicated in settings
CheckResult res = setsToDonwload.get(searchCode); CheckResult res = setsToDownload.get(searchCode);
if (res != null) { if (res != null) {
logger.error(String.format("Symbols: founded duplicated code: %s", searchCode)); logger.error(String.format("Symbols: founded duplicated code: %s", searchCode));
} else { } else {
res = new CheckResult(searchCode, foundedExp, haveCommon, haveUncommon, haveRare, haveMyth); res = new CheckResult(searchCode, foundedExp, haveCommon, haveUncommon, haveRare, haveMyth);
setsToDonwload.put(searchCode, res); setsToDownload.put(searchCode, res);
} }
// not found // not found
@ -207,7 +210,7 @@ public class GathererSets implements Iterable<DownloadJob> {
continue; continue;
} }
CheckResult res = setsToDonwload.get(set.getCode()); CheckResult res = setsToDownload.get(set.getCode());
// 1. not configured at all // 1. not configured at all
if (res == null) { if (res == null) {
@ -215,10 +218,8 @@ public class GathererSets implements Iterable<DownloadJob> {
continue; // can't do other checks continue; // can't do other checks
} }
// 2. do not load needed card rarity: // 2. missing rarity icon:
// - simple check for base type, not all // WARNING, need too much time (60+ secs), only for debug mode
// - when card not implemented then download is not necessary
// WARNING, need too much time (60+ secs), only for debug mode, may be move to tests?
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
if ((set.getCardsByRarity(Rarity.COMMON).size() > 0) && !res.haveCommon) { if ((set.getCardsByRarity(Rarity.COMMON).size() > 0) && !res.haveCommon) {
logger.error(String.format("Symbols: set have common cards, but don't download icon: %s (%s)", set.getCode(), set.getName())); logger.error(String.format("Symbols: set have common cards, but don't download icon: %s (%s)", set.getCode(), set.getName()));
@ -237,7 +238,7 @@ public class GathererSets implements Iterable<DownloadJob> {
Date endedDate = new Date(); Date endedDate = new Date();
long secs = (endedDate.getTime() - startedDate.getTime()) / 1000; long secs = (endedDate.getTime() - startedDate.getTime()) / 1000;
logger.debug(String.format("Symbols: check time: %d seconds", secs)); logger.debug(String.format("Symbols: check completed after %d seconds", secs));
} }
@Override @Override
@ -249,7 +250,7 @@ public class GathererSets implements Iterable<DownloadJob> {
ArrayList<DownloadJob> jobs = new ArrayList<>(); ArrayList<DownloadJob> jobs = new ArrayList<>();
boolean canDownload; boolean canDownload;
setsToDonwload.clear(); setsToDownload.clear();
for (String symbol : symbolsBasic) { for (String symbol : symbolsBasic) {
ExpansionSet exp = Sets.findSet(symbol); ExpansionSet exp = Sets.findSet(symbol);