On download failure, re-throw with URL info

Author: Jonathing

download-utils/src/java11/java/net/minecraftforge/util/download/DownloadUtils.java

@@ -107,10 +107,8 @@ private static InputStream connect(String address) throws IOException, Interrupt
     public static String downloadString(String url) throws IOException {
         try (InputStream stream = connect(url)) {
             return new String(stream.readAllBytes(), StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            throw e;
         } catch (Exception e) {
-            throw new IOException(e);
+            throw new DownloadFailedException(url, e);
         }
     }
 
@@ -126,7 +124,6 @@ public static String downloadString(String url) throws IOException {
             return downloadString(url);
         } catch (IOException e) {
             if (!silent) {
-                Log.warn("Failed to download " + url);
                 e.printStackTrace(Log.WARN);
             }
 
@@ -160,10 +157,8 @@ public static void downloadFile(boolean silent, File target, String url) throws
             Path path = target.toPath();
             Files.createDirectories(path.getParent());
             Files.copy(stream, path, StandardCopyOption.REPLACE_EXISTING);
-        } catch (IOException e) {
-            throw e;
         } catch (Exception e) {
-            throw new IOException(e);
+            throw new DownloadFailedException(url, e);
         }
     }
 
@@ -180,11 +175,16 @@ public static boolean tryDownloadFile(boolean silent, File target, String url) {
             return true;
         } catch (IOException e) {
             if (!silent) {
-                Log.warn("Failed to download " + url);
                 e.printStackTrace(Log.WARN);
             }
 
             return false;
         }
     }
+
+    private static final class DownloadFailedException extends IOException {
+        public DownloadFailedException(String url, Throwable cause) {
+            super("Failed to download " + url, cause);
+        }
+    }
 }

download-utils/src/main/java/net/minecraftforge/util/download/DownloadUtils.java

@@ -111,6 +111,8 @@ public static String downloadString(String url) throws IOException {
             }
 
             return new String(out.toByteArray(), StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            throw new DownloadFailedException(url, e);
         }
     }
 
@@ -126,7 +128,6 @@ public static String downloadString(String url) throws IOException {
             return downloadString(url);
         } catch (IOException e) {
             if (!silent) {
-                Log.warn("Failed to download " + url);
                 e.printStackTrace(Log.WARN);
             }
 
@@ -160,10 +161,8 @@ public static void downloadFile(boolean silent, File target, String url) throws
             Path path = target.toPath();
             Files.createDirectories(path.getParent());
             Files.copy(stream, path, StandardCopyOption.REPLACE_EXISTING);
-        } catch (IOException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new IOException(e);
+        } catch (DownloadFailedException e) {
+            throw new IOException(url, e);
         }
     }
 
@@ -180,11 +179,16 @@ public static boolean tryDownloadFile(boolean silent, File target, String url) {
             return true;
         } catch (IOException e) {
             if (!silent) {
-                Log.warn("Failed to download " + url);
                 e.printStackTrace(Log.WARN);
             }
 
             return false;
         }
     }
+
+    private static final class DownloadFailedException extends IOException {
+        public DownloadFailedException(String url, Throwable cause) {
+            super("Failed to download " + url, cause);
+        }
+    }
 }