Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename methods to use 'printed' when referring to card images that reflect original printed card.

master
lodici 2017-01-21 08:21:40 +00:00
parent d1559e5d01
commit 9520f5e91f
6 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/magic/cardBuilder/renderers/ImageFrame.java
View File

@ -116,7 +116,7 @@ public class ImageFrame {
}
public static BufferedImage getCardImage(IRenderableCard cardDef) {
File cropFile = MagicFileSystem.getCroppedCardImageFile(cardDef);
File cropFile = MagicFileSystem.getCroppedCardImage(cardDef);
if (cropFile.exists()) {
if (cardDef.isPlaneswalker()) {
BufferedImage crop = ImageHelper.scale(ImageFileIO.toImg(cropFile, MagicImages.MISSING_CARD), 320, 234);
@ -153,7 +153,7 @@ public class ImageFrame {
}
private static BufferedImage buildDefaultImage(IRenderableCard cardDef) {
File fullImage = MagicFileSystem.getCardImageFile(cardDef);
File fullImage = MagicFileSystem.getPrintedCardImage(cardDef);
if (fullImage.exists()) {
BufferedImage full = ImageHelper.scale(ImageFileIO.toImg(fullImage, MagicImages.MISSING_CARD),375,523);
return full.getSubimage(29, 60, 316, 231);

4
src/magic/data/CardImageFile.java
View File

@ -12,7 +12,7 @@ public class CardImageFile extends DownloadableFile {
public CardImageFile(IRenderableCard face) throws MalformedURLException {
super(
MagicFileSystem.getCardImageFile(face),
MagicFileSystem.getPrintedCardImage(face),
new URL(face.getImageUrl())
);
this.card = face.getCardDefinition();
@ -20,7 +20,7 @@ public class CardImageFile extends DownloadableFile {
public CardImageFile(final MagicCardDefinition aCard) throws MalformedURLException {
super(
MagicFileSystem.getCardImageFile(aCard),
MagicFileSystem.getPrintedCardImage(aCard),
new URL(aCard.getImageURL())
);
this.card = aCard;

14
src/magic/ui/MagicCardImages.java
View File

@ -35,16 +35,16 @@ public final class MagicCardImages {
return ImageType.CUSTOM;
}
if (MagicFileSystem.getCroppedCardImageFile(face).exists()) {
if (MagicFileSystem.getCroppedCardImage(face).exists()) {
return ImageType.PROXY;
}
if (CONFIG.getImagesOnDemand()
&& !MagicFileSystem.getCardImageFile(face).exists()) {
&& !MagicFileSystem.getPrintedCardImage(face).exists()) {
return ImageType.FULL;
}
if (MagicFileSystem.getCardImageFile(face).exists()) {
if (MagicFileSystem.getPrintedCardImage(face).exists()) {
return ImageType.FULL;
}
@ -74,15 +74,15 @@ public final class MagicCardImages {
case PROXY:
return CardBuilder.getCardBuilderImage(face);
case FULL:
if (!MagicFileSystem.getCardImageFile(face).exists()) {
if (!MagicFileSystem.getPrintedCardImage(face).exists()) {
tryDownloadingImage(face);
}
if (MagicFileSystem.getCardImageFile(face).exists()) {
if (MagicFileSystem.getPrintedCardImage(face).exists()) {
if (CONFIG.getCardsDownloadMode() == DownloadMode.CARDS || CONFIG.getCardTextLanguage() != CardTextLanguage.ENGLISH) {
return ImageFileIO.getOptimizedImage(MagicFileSystem.getCardImageFile(face));
return ImageFileIO.getOptimizedImage(MagicFileSystem.getPrintedCardImage(face));
} else {
return face.isPlaneswalker() || face.isFlipCard() || face.isToken()
? ImageFileIO.getOptimizedImage(MagicFileSystem.getCardImageFile(face))
? ImageFileIO.getOptimizedImage(MagicFileSystem.getPrintedCardImage(face))
: CardBuilder.getCardBuilderImage(face);
}
}

23
src/magic/ui/screen/images/download/DownloadPanel.java
View File

@ -16,13 +16,13 @@ import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
import magic.data.CardImageFile;
import magic.data.DownloadableFile;
import magic.data.ImagesDownloadList;
import magic.data.GeneralConfig;
import magic.data.ImagesDownloadList;
import magic.data.MagicIcon;
import magic.model.MagicCardDefinition;
import magic.ui.MagicImages;
import magic.translate.MText;
import magic.ui.CardTextLanguage;
import magic.ui.MagicImages;
import magic.utility.MagicFileSystem;
import net.miginfocom.swing.MigLayout;
@ -225,20 +225,21 @@ abstract class DownloadPanel extends JPanel implements IScanListener, IDownloadL
return countInteger;
}
protected static Stream<MagicCardDefinition> getCards(Collection<MagicCardDefinition> cards, Date aDate, DownloadMode mode) {
private static boolean isImageFileMissing(MagicCardDefinition card, DownloadMode mode) {
if (mode == DownloadMode.CARDS) {
return cards.stream()
.filter(MagicCardDefinition::hasImageUrl)
.filter(card -> card.isImageUpdatedAfter(aDate)
|| !MagicFileSystem.getCardImageFile(card).exists());
return !MagicFileSystem.getPrintedCardImage(card).exists();
} else {
return cards.stream()
.filter(MagicCardDefinition::hasImageUrl)
.filter(card -> card.isImageUpdatedAfter(aDate)
|| !MagicFileSystem.getCroppedCardImageFile(card).exists());
return !MagicFileSystem.getCroppedCardImage(card).exists()
&& !MagicFileSystem.getPrintedCardImage(card).exists();
}
}
protected static Stream<MagicCardDefinition> getCards(Collection<MagicCardDefinition> cards, Date aDate, DownloadMode mode) {
return cards.stream()
.filter(MagicCardDefinition::hasImageUrl)
.filter(card -> card.isImageUpdatedAfter(aDate) || isImageFileMissing(card, mode));
}
void setLocked(boolean b) {
downloadButton.setEnabled(!b && files != null && !files.isEmpty());
}

6
src/magic/ui/screen/images/download/DownloadWorker.java
View File

@ -1,7 +1,6 @@
package magic.ui.screen.images.download;
import java.io.File;
import magic.ui.CardTextLanguage;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.Proxy;
@ -18,9 +17,10 @@ import magic.data.DownloadableFile;
import magic.data.GeneralConfig;
import magic.data.ImagesDownloadList;
import magic.model.MagicCardDefinition;
import magic.ui.CardTextLanguage;
import magic.ui.MagicImages;
import magic.ui.helpers.UrlHelper;
import magic.ui.MagicLogFile;
import magic.ui.helpers.UrlHelper;
import magic.utility.MagicFileSystem;
import magic.utility.MagicSystem;
@ -195,7 +195,7 @@ class DownloadWorker extends SwingWorker<Void, Integer> {
private boolean doDownloadCroppedImage(CardImageFile imageFile) throws MalformedURLException {
final MagicCardDefinition card = imageFile.getCard();
final File local = MagicFileSystem.getCroppedCardImageFile(imageFile.getCard());
final File local = MagicFileSystem.getCroppedCardImage(imageFile.getCard());
if (card.getImageURL().contains("magiccards.info/scans/")) {
final URL remote = new URL(card.getImageURL().replace("/scans/", "/crop/"));
if (UrlHelper.isUrlValid(remote)) {

12
src/magic/utility/MagicFileSystem.java
View File

@ -135,21 +135,21 @@ public final class MagicFileSystem {
/**
* Returns a File object representing the given card's image file.
*/
public static File getCardImageFile(final MagicCardDefinition card) {
public static File getPrintedCardImage(final MagicCardDefinition card) {
final Path imageDirectory = card.isToken() ?
getImagesPath(ImagesPath.TOKENS) :
getImagesPath(ImagesPath.CARDS);
return new File(imageDirectory.toFile(), getImageFilename(card));
}
public static File getCardImageFile(IRenderableCard face) {
return getCardImageFile(face.getCardDefinition());
public static File getPrintedCardImage(IRenderableCard face) {
return getPrintedCardImage(face.getCardDefinition());
}
/**
* Returns a File object representing the given card's cropped image file.
*/
public static File getCroppedCardImageFile(final IRenderableCard cardDef) {
public static File getCroppedCardImage(final IRenderableCard cardDef) {
final Path imageDirectory = getImagesPath(ImagesPath.CROPS);
return new File(imageDirectory.toFile(), cardDef.getImageName() + ".jpg");
}
@ -302,10 +302,10 @@ public final class MagicFileSystem {
if (getCustomCardImageFile(aCard).exists()) {
return false;
}
if (getCroppedCardImageFile(aCard).exists()) {
if (getCroppedCardImage(aCard).exists()) {
return false;
}
if (getCardImageFile(aCard).exists()) {
if (getPrintedCardImage(aCard).exists()) {
return false;
}
return true;