From d10bffa4fc8a1b97bbf5bfbe5219ccd27d9973d4 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 06:12:35 +0000
Subject: [PATCH] better/more useful error reporting for cards with bad URLs in
 cards.txt when downloading LQ pics

---
 src/forge/Gui_DownloadPictures_LQ.java | 51 +++++++++++++++-----------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/forge/Gui_DownloadPictures_LQ.java b/src/forge/Gui_DownloadPictures_LQ.java
index f10d832e898..4a5d969c08a 100644
--- a/src/forge/Gui_DownloadPictures_LQ.java
+++ b/src/forge/Gui_DownloadPictures_LQ.java
@@ -16,6 +16,7 @@ import java.io.FileReader;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.URL;
+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 
@@ -216,28 +217,34 @@ public class Gui_DownloadPictures_LQ extends DefaultBoundedRangeModel implements
                     
                     File f = new File(base, cName);
                     
-                    in = new BufferedInputStream(new URL(url).openConnection(p).getInputStream());
-                    out = new BufferedOutputStream(new FileOutputStream(f));
-                    
-                    while((len = in.read(buf)) != -1) {
-                        //user cancelled
-                        if(cancel) {
-                            in.close();
-                            out.flush();
-                            out.close();
-                            
-                            //delete what was written so far
-                            f.delete();
-                            
-                            return;
-                        }//if - cancel
-                        
-                        out.write(buf, 0, len);
-                    }//while - read and write file
-                    
-                    in.close();
-                    out.flush();
-                    out.close();
+                    try {
+                    	in = new BufferedInputStream(new URL(url).openConnection(p).getInputStream());
+                    	out = new BufferedOutputStream(new FileOutputStream(f));
+
+                    	while((len = in.read(buf)) != -1) {
+                    		//user cancelled
+                    		if(cancel) {
+                    			in.close();
+                    			out.flush();
+                    			out.close();
+
+                    			//delete what was written so far
+                    			f.delete();
+
+                    			return;
+                    		}//if - cancel
+
+                    		out.write(buf, 0, len);
+                    	}//while - read and write file
+
+                    	in.close();
+                    	out.flush();
+                    	out.close();
+                    }
+                    catch(MalformedURLException mURLe) {
+                    	System.out.println("bad URL for: "+cards[card].name);
+                    	//Log.error("LQ Pictures", "Malformed URL for: "+cards[card].name, mURLe);
+                    }
                 } catch(Exception ex) {
                 	Log.error("LQ Pictures", "Error downloading pictures", ex);
                 }