Changeset 605 for AE/installer2/src/net/oni2/aeinstaller/backend/mods/download

Timestamp:

Jan 13, 2013, 8:11:07 PM (12 years ago)

Author:

alloc

Message:

AEI2:

• Added mod download prior to installation
• Dependency checking (needs verification)
• Conflicts checking basis (not implemented)
• Run Oni through AEI

Location:

AE/installer2/src/net/oni2/aeinstaller/backend/mods/download

Files:

• ModDownload.java (modified) (1 diff)
• ModDownloader.java (modified) (4 diffs)
• ModDownloaderListener.java (modified) (1 diff)

AE/installer2/src/net/oni2/aeinstaller/backend/mods/download/ModDownload.java

@@ -96 +96 @@
          */
         public void start() {
+                state = ModDownloadState.RUNNING;
                 downloader.start();
         }

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

@@ -67 +67 @@
                 currentDownload++;
                 downloadedCurrent = 0;
-                if (currentDownload < downloads.size()) {
+                if ((state == State.RUNNING) && (currentDownload < downloads.size())) {
                         downloads.get(currentDownload).start();
                 } else {
@@ -74 +74 @@
         }
 
-        /**
-         * @return Average download speed for up to now in B/s
-         */
-        public int getDownloadSpeed() {
-                long duration = new Date().getTime() - startMS;
-                int down = downloadedComplete + downloadedCurrent;
-                return (int) (down * 1000 / duration);
+        private int getTimeElapsed() {
+                int total = (int) (new Date().getTime() - startMS)
+                                / 1000;
+                return total;
         }
 
-        /**
-         * @return Remaining time for all downloads by avg-speed in seconds
-         */
-        public int getTimeRemaining() {
+        private int getDownloadSpeed() {
+                int elap = getTimeElapsed();
+                int down = downloadedComplete + downloadedCurrent;
+                if (elap > 0)
+                        return down / elap;
+                else
+                        return 1;
+        }
+
+        private int getTimeRemaining() {
                 int remainingSize = totalSize
                                 - (downloadedComplete + downloadedCurrent);
@@ -94 +97 @@
         private void notifyListener() {
                 listener.updateStatus(this, state, unpacked, downloads.size(),
-                                downloadedComplete + downloadedCurrent, totalSize);
+                                downloadedComplete + downloadedCurrent, totalSize,
+                                getTimeElapsed(), getTimeRemaining(), getDownloadSpeed());
+        }
+
+        /**
+         * @return total download size
+         */
+        public int getTotalSize() {
+                return totalSize;
         }
 
@@ -133 +144 @@
         }
 
+        /**
+         * Abort download process
+         */
+        public void abort() {
+                if (currentDownload < downloads.size()) {
+                        state = State.INTERRUPTED;
+                        ModDownload md = downloads.get(currentDownload);
+                        md.abort();
+                }
+        }
+
 }

AE/installer2/src/net/oni2/aeinstaller/backend/mods/download/ModDownloaderListener.java

@@ -22 +22 @@
          * @param bytesTotal
          *            Bytes in total to handle
+         * @param duration
+         *            Duration of downloads in seconds
+         * @param remaining
+         *            Remaining time in seconds
+         * @param speed
+         *            Average download speed in B/s
          */
         public void updateStatus(ModDownloader source, State state, int filesDown,
-                        int filesTotal, int bytesDown, int bytesTotal);
+                        int filesTotal, int bytesDown, int bytesTotal, int duration,
+                        int remaining, int speed);
 }