From f39e4fd4eec6a30f3ffae50b72229b40a0c68b71 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sun, 10 Dec 2017 17:43:37 +0400 Subject: [PATCH] - added card download for unstable set from scryfall; - changed client version from 9 to 10b; --- .../org/mage/plugins/card/dl/sources/ScryfallImageSource.java | 4 ++-- .../java/org/mage/plugins/card/images/DownloadPictures.java | 3 +++ Mage.Client/src/main/resources/image.url.properties | 3 +-- Mage.Common/src/main/java/mage/utils/MageVersion.java | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) 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 b95cc3fefd3..111e4480a3f 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 @@ -204,8 +204,8 @@ public enum ScryfallImageSource implements CardImageSource { supportedSets.add("IMA"); // supportedSets.add("E02"); // supportedSets.add("V17"); -// supportedSets.add("UST"); -// supportedSets.add("RIX"); + supportedSets.add("UST"); + supportedSets.add("RIX"); // supportedSets.add("A25"); // supportedSets.add("DOM"); // supportedSets.add("M19"); diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java index 59a6be5bc5a..02ba9bb2a01 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java @@ -43,6 +43,8 @@ import static org.mage.plugins.card.utils.CardImageUtils.getImagesDir; public class DownloadPictures extends DefaultBoundedRangeModel implements Runnable { + // don't forget to remove new sets from ignore.urls to download (propeties file in resources) + private static DownloadPictures instance; private static final Logger logger = Logger.getLogger(DownloadPictures.class); @@ -772,6 +774,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab // START to download cardImageSource.doPause(url.getPath()); URLConnection httpConn = url.openConnection(p); + httpConn.setRequestProperty("User-Agent", "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.4; en-US; rv:1.9.2.2) Gecko/20100316 Firefox/3.6.2"); httpConn.connect(); int responseCode = ((HttpURLConnection) httpConn).getResponseCode(); diff --git a/Mage.Client/src/main/resources/image.url.properties b/Mage.Client/src/main/resources/image.url.properties index 4b3146cc6ee..620a028344e 100644 --- a/Mage.Client/src/main/resources/image.url.properties +++ b/Mage.Client/src/main/resources/image.url.properties @@ -29,7 +29,6 @@ ulg=ul 6ed=6e btd=bd sth=sh -nem=ne por=po s99=st lgn=le @@ -74,6 +73,6 @@ dd3evg=ddaevg dd3gvl=ddagvl dd3jvc=ddajvc # Remove setname as soon as the images can be downloaded -ignore.urls=TOK,DDT,V17,E02,M19,M25,DOM,UST,H17 +ignore.urls=TOK,DDT,V17,E02,M19,M25,DOM,H17 # sets ordered by release time (newest goes first) token.lookup.order=M19,M25,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 diff --git a/Mage.Common/src/main/java/mage/utils/MageVersion.java b/Mage.Common/src/main/java/mage/utils/MageVersion.java index 962b0e65972..2ef3e3430b0 100644 --- a/Mage.Common/src/main/java/mage/utils/MageVersion.java +++ b/Mage.Common/src/main/java/mage/utils/MageVersion.java @@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable { public final static int MAGE_VERSION_MAJOR = 1; public final static int MAGE_VERSION_MINOR = 4; public final static int MAGE_VERSION_PATCH = 26; - public final static String MAGE_VERSION_MINOR_PATCH = "V9"; + public final static String MAGE_VERSION_MINOR_PATCH = "V10b"; public final static String MAGE_VERSION_INFO = ""; private final int major;