Add download speed

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java

@@ -1173,4 +1173,11 @@ public static void releaseRenderersCache() {
         sCompatibleRenderers = null;
         System.gc();
     }
+
+    public static String trimSecondsToMiniutes(double seconds) {
+        if (seconds >= 60) {
+            return (seconds / 60.0) + "min" + (seconds % 60.0) + "s";
+        }
+        return seconds + "s";
+    }
 }

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloader.java

@@ -37,12 +37,12 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 public class MinecraftDownloader {
+    private static final double BYTES_TO_MB = 1024d * 1024d;
     public static final String MINECRAFT_RES = "https://resources.download.minecraft.net/";
     private AtomicReference<Exception> mDownloaderThreadException;
     private ArrayList<DownloaderTask> mScheduledDownloadTasks;
-    private AtomicLong mDownloadFileCounter;
     private AtomicLong mDownloadSizeCounter;
-    private long mDownloadFileCount;
+    private long mTotalDownloadFileSize;
     private File mSourceJarFile; // The source client JAR picked during the inheritance process
     private File mTargetJarFile; // The destination client JAR to which the source will be copied to.
 
@@ -83,7 +83,6 @@ private void downloadGame(Activity activity, JMinecraftVersionList.Version verIn
 
         mTargetJarFile = createGameJarPath(versionName);
         mScheduledDownloadTasks = new ArrayList<>();
-        mDownloadFileCounter = new AtomicLong(0);
         mDownloadSizeCounter = new AtomicLong(0);
         mDownloaderThreadException = new AtomicReference<>(null);
 
@@ -102,13 +101,25 @@ private void downloadGame(Activity activity, JMinecraftVersionList.Version verIn
         downloaderPool.shutdown();
 
         try {
+            long startTime = System.currentTimeMillis();
             while (mDownloaderThreadException.get() == null &&
                     !downloaderPool.awaitTermination(33, TimeUnit.MILLISECONDS)) {
-                long dlFileCounter = mDownloadFileCounter.get();
-                int progress = (int)((dlFileCounter * 100L) / mDownloadFileCount);
+                long elapsedTime = System.currentTimeMillis() - startTime;
+                long downloadedSize = mDownloadSizeCounter.get();
+
+                double downloadSpeed = 0.0; // bytes per second
+                double remainTime = 0.0; // seconds
+                if (elapsedTime > 0) { // Prevent divide by zero
+                    downloadSpeed = downloadedSize / (elapsedTime / 1000.0);
+                    remainTime = (mTotalDownloadFileSize - downloadedSize) / (long) downloadSpeed;
+                }
+                // Some files are relatively large, but others are relatively small.
+                // Using the number of files as a basis for progress bars is inaccurate
+                int progress = (int)((downloadedSize * 100L) / mTotalDownloadFileSize);
                 ProgressLayout.setProgress(ProgressLayout.DOWNLOAD_MINECRAFT, progress,
-                        R.string.newdl_downloading_game_files, dlFileCounter,
-                        mDownloadFileCount, (double)mDownloadSizeCounter.get() / (1024d * 1024d));
+                        R.string.newdl_downloading_game_files, 
+                        downloadSpeed / BYTES_TO_MB, Tools.trimSecondsToMiniutes(remainTime),
+                        (double) downloadedSize / BYTES_TO_MB, mTotalDownloadFileSize / BYTES_TO_MB);
             }
             Exception thrownException = mDownloaderThreadException.get();
             if(thrownException != null) {
@@ -233,7 +244,6 @@ private void growDownloadList(int addedElementCount) {
     private void scheduleDownload(File targetFile, int downloadClass, String url, String sha1,
                                   long size, boolean skipIfFailed) throws IOException {
         FileUtils.ensureParentDirectory(targetFile);
-        mDownloadFileCount++;
         mScheduledDownloadTasks.add(
                 new DownloaderTask(targetFile, downloadClass, url, sha1, size, skipIfFailed)
         );
@@ -359,6 +369,8 @@ private final class DownloaderTask implements Runnable, Tools.DownloaderFeedback
             this.mDownloadClass = downloadClass;
             this.mDownloadSize = downloadSize;
             this.mSkipIfFailed = skipIfFailed;
+
+            mTotalDownloadFileSize += downloadSize;
         }
 
         @Override
@@ -401,11 +413,9 @@ private void downloadFile() throws Exception {
             }catch (Exception e) {
                 if(!mSkipIfFailed) throw e;
             }
-            mDownloadFileCounter.incrementAndGet();
         }
 
         private void finishWithoutDownloading() {
-            mDownloadFileCounter.incrementAndGet();
             mDownloadSizeCounter.addAndGet(mDownloadSize);
         }
 

app_pojavlauncher/src/main/res/values/strings.xml

@@ -370,7 +370,7 @@
     <string name="exception_failed_to_unpack_jre17">Failed to install JRE 17</string>
     <string name="newdl_starting">Reading game metadata…</string>
     <string name="newdl_downloading_metadata">Downloading game metadata (%s)</string>
-    <string name="newdl_downloading_game_files">Downloading game files… (%d/%d, %.2f MB)</string>
+    <string name="newdl_downloading_game_files">Downloading at %.2f MB/s ETA: %s(%.2f MB/%.2f MB) </string>
     <string name="cropper_title">Select image region</string>
     <string name="cropper_lock_vertical">V. lock</string>
     <string name="cropper_lock_horizontal">H. lock</string>