Display destination file name in progress message

Refers to #138
michel-kraemer · Jan 16, 2022 · e11dd7c · e11dd7c
1 parent 0f07235
commit e11dd7c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/src/main/java/de/undercouch/gradle/tasks/download/DownloadAction.java b/src/main/java/de/undercouch/gradle/tasks/download/DownloadAction.java
@@ -260,7 +260,9 @@ private void execute(URL src, HttpClientFactory clientFactory,
             upToDate.incrementAndGet();
             return;
         }
-
+
+        progressLogger.setDestFileName(destFile.getName());
+
         // in case offline mode is enabled don't try to download if
         // destination already exists
         if (isOffline) {

diff --git a/src/main/java/de/undercouch/gradle/tasks/download/internal/ProgressLoggerWrapper.java b/src/main/java/de/undercouch/gradle/tasks/download/internal/ProgressLoggerWrapper.java
@@ -14,12 +14,12 @@
 
 package de.undercouch.gradle.tasks.download.internal;
 
+import org.gradle.api.logging.Logger;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
-import org.gradle.api.logging.Logger;
-
 /**
  * Wraps around Gradle's internal progress logger. Uses reflection
  * to provide as much compatibility to different Gradle versions
@@ -32,6 +32,7 @@ public class ProgressLoggerWrapper {
     private Object progressLogger;
 
     private String size;
+    private String destFileName;
     private long processedBytes = 0;
     private long loggedKb = 0;
 
@@ -186,6 +187,14 @@ public void setSize(long size) {
         loggedKb = 0;
     }
 
+    /**
+     * Set the name of the destination file
+     * @param destFileName the file name
+     */
+    public void setDestFileName(String destFileName) {
+        this.destFileName = destFileName;
+    }
+
     /**
      * Increment the number of bytes processed
      * @param increment the increment
@@ -199,12 +208,18 @@ public void incrementProgress(long increment) {
 
         long processedKb = processedBytes / 1024;
         if (processedKb > loggedKb) {
-            String msg = toLengthText(processedBytes);
+            StringBuilder sb = new StringBuilder();
+            if (destFileName != null) {
+                sb.append(destFileName);
+                sb.append(" > ");
+            }
+            sb.append(toLengthText(processedBytes));
             if (size != null) {
-                msg += "/" + size;
+                sb.append("/");
+                sb.append(size);
             }
-            msg += " downloaded";
-            progress(msg);
+            sb.append(" downloaded");
+            progress(sb.toString());
             loggedKb = processedKb;
         }
     }