From ff777670985891eed17edaafada008a9267e3240 Mon Sep 17 00:00:00 2001
From: North <robyter@gmail>
Date: Tue, 25 Sep 2012 22:10:28 +0300
Subject: [PATCH] Already downloaded image files are moved to the zip file.

---
 .../plugins/card/images/DownloadPictures.java    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

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 c5a16a4e0f1..5468d41617c 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
@@ -440,6 +440,21 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
         public void run() {
             try {
                 File temporaryFile = new File(Constants.IO.imageBaseDir + File.separator + card.hashCode() + "." + card.getName() + ".jpg");
+                String imagePath = CardImageUtils.getImagePath(card, imagesPath);
+                TFile outputFile = new TFile(imagePath);
+                File existingFile = new File(imagePath.replaceFirst("\\w{3}.zip", ""));
+                if (existingFile.exists()) {
+                    new TFile(existingFile).cp_rp(outputFile);
+                    synchronized (sync) {
+                        update(cardIndex + 1);
+                    }
+                    existingFile.delete();
+                    File parent = existingFile.getParentFile();
+                    if (parent != null && parent.isDirectory() && parent.list().length == 0) {
+                        parent.delete();
+                    }
+                    return;
+                }
 
                 BufferedInputStream in = new BufferedInputStream(url.openConnection(p).getInputStream());
                 BufferedOutputStream out = new BufferedOutputStream(new TFileOutputStream(temporaryFile));
@@ -462,7 +477,6 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
                 out.flush();
                 out.close();
 
-                TFile outputFile = new TFile(CardImageUtils.getImagePath(card, imagesPath));
                 if (card.isTwoFacedCard()) {
                     BufferedImage image = ImageIO.read(temporaryFile);
                     if (image.getHeight() == 470) {