Changeset 698 for AE/installer2/src/net/oni2/aeinstaller/backend/packages

Timestamp:

Mar 13, 2013, 8:00:39 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99s:

• Fix for update window file size display
• Fix for download speed/time estimation
• Added patches-support

File:

• AE/installer2/src/net/oni2/aeinstaller/backend/packages/download/ModDownloader.java (modified) (3 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/packages/download/ModDownloader.java

@@ -82 +82 @@
 
         private int getTimeElapsed() {
-                int total = (int) (new Date().getTime() - startMS) / 1000;
+                int total = (int) (new Date().getTime() - startMS);
                 return total;
         }
@@ -88 +88 @@
         private int getDownloadSpeed() {
                 int elap = getTimeElapsed();
-                int down = downloadedComplete + downloadedCurrent;
+                long down = downloadedComplete + downloadedCurrent;
                 if (elap > 0)
-                        return down / elap;
+                        return (int)(down * 1000 / elap);
                 else
                         return 1;
@@ -106 +106 @@
                                         downloads.get(currentDownload).getMod(), state, unpacked,
                                         downloads.size(), downloadedComplete + downloadedCurrent,
-                                        totalSize, getTimeElapsed(), getTimeRemaining(),
+                                        totalSize, getTimeElapsed() / 1000, getTimeRemaining(),
                                         getDownloadSpeed());
                 } else {
                         listener.updateStatus(this, null, state, unpacked,
                                         downloads.size(), downloadedComplete + downloadedCurrent,
-                                        totalSize, getTimeElapsed(), getTimeRemaining(),
+                                        totalSize, getTimeElapsed() / 1000, getTimeRemaining(),
                                         getDownloadSpeed());
                 }