downloadedCards = Collections.synchronizedList(new ArrayList<>());
+ DownloadPicturesService.this.cardsMissing.parallelStream().forEach(cardDownloadData -> {
TFile file = new TFile(CardImageUtils.buildImagePathToCard(cardDownloadData));
- if (!file.exists()) {
- remainingCards.add(cardDownloadData);
+ if (file.exists()) {
+ downloadedCards.add(cardDownloadData);
}
});
- // remove the cards not downloaded to get the siccessfull downloaded cards
- DownloadPictures.this.cardsToDownload.removeAll(remainingCards);
- DownloadPictures.this.allCardsMissingImage.removeAll(DownloadPictures.this.cardsToDownload);
+ // remove all downloaded cards, missing must be remains
+ this.cardsDownloadQueue.removeAll(downloadedCards);
+ this.cardsMissing.removeAll(downloadedCards);
- count = remainingCards.size();
-
- if (count == 0) {
- bar.setString("0 images remaining! Please close!");
+ if (this.cardsDownloadQueue.size() == 0) {
+ // stop download
+ uiDialog.getProgressBar().setString("0 images remaining. Please close.");
} else {
-// bar.setString(String.format("%d cards remaining! Please choose another source!", count));
- startDownloadButton.setEnabled(true);
+ // try download again
}
+
+ this.uiDialog.getRedownloadCheckbox().setSelected(false);
+ uiDialog.enableActionControls(true);
+ uiDialog.getStartButton().setEnabled(true);
}
}
@@ -916,22 +920,21 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
}
-class LoadMissingCardData implements Runnable {
+class LoadMissingCardDataNew implements Runnable {
- private static DownloadPictures downloadPictures;
+ private static DownloadPicturesService downloadPicturesService;
- public LoadMissingCardData(DownloadPictures downloadPictures) {
- LoadMissingCardData.downloadPictures = downloadPictures;
+ public LoadMissingCardDataNew(DownloadPicturesService downloadPicturesService) {
+ this.downloadPicturesService = downloadPicturesService;
}
@Override
public void run() {
- downloadPictures.setAllMissingCards();
+ downloadPicturesService.findMissingCards();
}
public static void main() {
-
- (new Thread(new LoadMissingCardData(downloadPictures))).start();
+ (new Thread(new LoadMissingCardDataNew(downloadPicturesService))).start();
}
}
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
index 2edf005832..a3aac320d4 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
@@ -3,15 +3,6 @@ package org.mage.plugins.card.images;
import com.google.common.base.Function;
import com.google.common.collect.ComputationException;
import com.google.common.collect.MapMaker;
-import java.awt.*;
-import java.awt.geom.RoundRectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.imageio.ImageIO;
import mage.client.constants.Constants;
import mage.client.dialog.PreferencesDialog;
import mage.client.util.TransformedImageCache;
@@ -23,13 +14,23 @@ import org.apache.log4j.Logger;
import org.mage.plugins.card.dl.sources.DirectLinksForDownload;
import org.mage.plugins.card.utils.CardImageUtils;
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.geom.RoundRectangle2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
/**
* This class stores ALL card images in a cache with soft values. this means
* that the images may be garbage collected when they are not needed any more,
* but will be kept as long as possible.
- *
+ *
* Key format: "[cardname]#[setname]#[type]#[collectorID]#[param]"
- *
+ *
* where param is:
*
* - size of image
@@ -228,6 +229,10 @@ public final class ImageCache {
});
}
+ public static void clearCache() {
+ IMAGE_CACHE.clear();
+ }
+
public static String getFilePath(CardView card, int width) {
String key = getKey(card, card.getName(), Integer.toString(width));
boolean usesVariousArt = false;
@@ -389,7 +394,7 @@ public final class ImageCache {
return getImage(getKey(card, card.getName(), ""));
}
-// public static BufferedImage getImageFaceOriginal(CardView card) {
+ // public static BufferedImage getImageFaceOriginal(CardView card) {
// return getFaceImage(getFaceKey(card, card.getName(), card.getExpansionSetCode()));
// }
public static BufferedImage getImageOriginalAlternateName(CardView card) {
@@ -472,6 +477,7 @@ public final class ImageCache {
// return alternateName + "#" + card.getExpansionSetCode() + "#" +card.getType()+ "#" + card.getCardNumber() + "#"
// + (card.getTokenSetCode() == null ? "":card.getTokenSetCode());
// }
+
/**
* Load image from file
*
diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java
index 628472299c..448105209f 100644
--- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java
+++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java
@@ -111,9 +111,8 @@ public class ComputerPlayer7 extends ComputerPlayer6 {
Game sim = createSimulation(game);
SimulationNode2.resetCount();
root = new SimulationNode2(null, sim, maxDepth, playerId);
- addActionsTimed();
- if (root.children != null
- && !root.children.isEmpty()) {
+ addActionsTimed(); // TODO: root can be null again after addActionsTimed O_o need to research (it's a CPU AI problem?)
+ if (root != null && root.children != null && !root.children.isEmpty()) {
logger.trace("After add actions timed: root.children.size = " + root.children.size());
root = root.children.get(0);
// prevent repeating always the same action with no cost
diff --git a/Mage.Sets/src/mage/sets/UltimateBoxTopperPromos.java b/Mage.Sets/src/mage/sets/UltimateBoxTopperPromos.java
index 26eb20d571..545985a829 100644
--- a/Mage.Sets/src/mage/sets/UltimateBoxTopperPromos.java
+++ b/Mage.Sets/src/mage/sets/UltimateBoxTopperPromos.java
@@ -36,9 +36,9 @@ public final class UltimateBoxTopperPromos extends ExpansionSet {
cards.add(new SetCardInfo("Gaddock Teeg", "U21", Rarity.MYTHIC, mage.cards.g.GaddockTeeg.class));
cards.add(new SetCardInfo("Goryo's Vengeance", "U9", Rarity.MYTHIC, mage.cards.g.GoryosVengeance.class));
cards.add(new SetCardInfo("Karakas", "U36", Rarity.MYTHIC, mage.cards.k.Karakas.class));
- cards.add(new SetCardInfo("Karn Liberated", "U02", Rarity.MYTHIC, mage.cards.k.KarnLiberated.class));
+ cards.add(new SetCardInfo("Karn Liberated", "U2", Rarity.MYTHIC, mage.cards.k.KarnLiberated.class));
cards.add(new SetCardInfo("Kitchen Finks", "U27", Rarity.MYTHIC, mage.cards.k.KitchenFinks.class));
- cards.add(new SetCardInfo("Kozilek, Butcher of Truth", "U03", Rarity.MYTHIC, mage.cards.k.KozilekButcherOfTruth.class));
+ cards.add(new SetCardInfo("Kozilek, Butcher of Truth", "U3", Rarity.MYTHIC, mage.cards.k.KozilekButcherOfTruth.class));
cards.add(new SetCardInfo("Lavaclaw Reaches", "U37", Rarity.MYTHIC, mage.cards.l.LavaclawReaches.class));
cards.add(new SetCardInfo("Leovold, Emissary of Trest", "U22", Rarity.MYTHIC, mage.cards.l.LeovoldEmissaryOfTrest.class));
cards.add(new SetCardInfo("Life from the Loam", "U17", Rarity.MYTHIC, mage.cards.l.LifeFromTheLoam.class));
diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
index 0d11f3230a..6dc4d00213 100644
--- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
+++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
@@ -14,7 +14,7 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.mage.plugins.card.images.CardDownloadData;
-import org.mage.plugins.card.images.DownloadPictures;
+import org.mage.plugins.card.images.DownloadPicturesService;
import org.reflections.Reflections;
import java.io.IOException;
@@ -425,7 +425,7 @@ public class VerifyCardDataTest {
}
// tok file's data
- ArrayList tokFileTokens = DownloadPictures.getTokenCardUrls();
+ ArrayList tokFileTokens = DownloadPicturesService.getTokenCardUrls();
LinkedHashMap tokDataClassesIndex = new LinkedHashMap<>();
LinkedHashMap tokDataNamesIndex = new LinkedHashMap<>();
for (CardDownloadData tokData : tokFileTokens) {