From 7f4573f8cea10221b5bf426100a93366336c804f Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 7 Aug 2018 00:14:22 +0200 Subject: [PATCH] Added some sets to the download sources. --- .../plugins/card/dl/sources/MythicspoilerComSource.java | 6 +++--- .../mage/plugins/card/dl/sources/ScryfallImageSource.java | 5 ++--- .../plugins/card/dl/sources/WizardCardsImageSource.java | 2 +- Mage.Client/src/main/resources/image.url.properties | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java index 9a1f95093d..ca5deac71a 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java @@ -1,4 +1,3 @@ - package org.mage.plugins.card.dl.sources; import java.io.BufferedReader; @@ -18,7 +17,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.prefs.Preferences; - import mage.client.MageFrame; import mage.remote.Connection; import mage.remote.Connection.ProxyType; @@ -232,6 +230,8 @@ public enum MythicspoilerComSource implements CardImageSource { supportedSets.add("RIX"); supportedSets.add("DOM"); supportedSets.add("BBD"); + supportedSets.add("M19"); + supportedSets.add("C18"); // supportedSets.add("CM2"); sets = new LinkedHashMap<>(); @@ -329,7 +329,7 @@ public enum MythicspoilerComSource implements CardImageSource { } private Map getSetLinksFromPage(String cardSet, Set aliasesStart, Preferences prefs, - ProxyType proxyType, String baseUrl, String pageUrl) throws IOException { + ProxyType proxyType, String baseUrl, String pageUrl) throws IOException { Map pageLinks = new HashMap<>(); String urlDocument; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java index a99cf3f287..156fce34ed 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java @@ -6,7 +6,6 @@ import java.util.LinkedHashSet; import java.util.Locale; import java.util.Map; import java.util.Set; - import mage.client.dialog.PreferencesDialog; import org.mage.plugins.card.images.CardDownloadData; @@ -227,7 +226,8 @@ public enum ScryfallImageSource implements CardImageSource { supportedSets.add("A25"); supportedSets.add("DOM"); supportedSets.add("BBD"); -// supportedSets.add("CM2"); + supportedSets.add("C18"); + supportedSets.add("CM2"); supportedSets.add("M19"); } @@ -240,7 +240,6 @@ public enum ScryfallImageSource implements CardImageSource { // loc example: https://api.scryfall.com/cards/xln/121/ru?format=image // TODO: do not use API at all? It's can help with scryfall request limits (1 request instead 2) - String baseUrl = null; String alternativeUrl = null; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java index 142a1866b4..17e98c7343 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java @@ -239,7 +239,7 @@ public enum WizardCardsImageSource implements CardImageSource { supportedSets.add("M19"); // Core 2019 // supportedSets.add("GRN"); // Guilds of Ravnica // supportedSets.add("RNA"); // Ravnica Allegiance -// supportedSets.add("C18"); // Commander 2018 + supportedSets.add("C18"); // Commander 2018 sets = new HashMap<>(); setsAliases = new HashMap<>(); diff --git a/Mage.Client/src/main/resources/image.url.properties b/Mage.Client/src/main/resources/image.url.properties index 59252e0923..d3ab400892 100644 --- a/Mage.Client/src/main/resources/image.url.properties +++ b/Mage.Client/src/main/resources/image.url.properties @@ -75,4 +75,4 @@ dd3jvc=ddajvc # Remove setname as soon as the images can be downloaded ignore.urls=TOK,H17 # sets ordered by release time (newest goes first) -token.lookup.order=M19,A25,DOM,E02,RIX,UST,XLN,IMA,H17,C17,V17,E01,DDT,CMA,HOU,MM3,DDS,AKH,DD3DVD,DD3EVG,DD3GVL,DD3JVC,H09,AER,PCA,C16,V16,MPS,KLD,DDR,CN2,EMN,EMA,SOI,DDQ,CP,CMA,ARENA,SUS,APAC,EURO,UGIN,C15,OGW,EXP,DDP,BFZ,DRB,V09,V10,V11,V12,V13,V14,V15,TPR,MPRP,DD3,DDO,ORI,MM2,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC \ No newline at end of file +token.lookup.order=C18,M19,A25,DOM,E02,RIX,UST,XLN,IMA,H17,C17,V17,E01,DDT,CMA,HOU,MM3,DDS,AKH,DD3DVD,DD3EVG,DD3GVL,DD3JVC,H09,AER,PCA,C16,V16,MPS,KLD,DDR,CN2,EMN,EMA,SOI,DDQ,CP,CMA,ARENA,SUS,APAC,EURO,UGIN,C15,OGW,EXP,DDP,BFZ,DRB,V09,V10,V11,V12,V13,V14,V15,TPR,MPRP,DD3,DDO,ORI,MM2,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC \ No newline at end of file