Changeset 641 for AE/installer2/src/net/oni2/aeinstaller/backend

Timestamp:

Jan 21, 2013, 12:14:52 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.98:

• Reduced number+size of HTTP queries
• Removed "submitter" field
• Added output of dependencies to be selected before continuing

Location:

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

Files:

• depot/DepotManager.java (modified) (2 diffs)
• network/FileDownloader.java (modified) (7 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotManager.java

@@ -27 +27 @@
 
 import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpHead;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.impl.client.DefaultHttpClient;
@@ -196 +196 @@
                 try {
                         DefaultHttpClient httpclient = new DefaultHttpClient();
-                        httpQuery = new HttpGet(DepotConfig.getDepotUrl());
+                        httpQuery = new HttpHead(DepotConfig.getDepotUrl());
 
                         HttpResponse response = httpclient.execute(httpQuery);

AE/installer2/src/net/oni2/aeinstaller/backend/network/FileDownloader.java

@@ -48 +48 @@
         private URL url = null;
         private File target = null;
-        private int size = -1;
+        private int fileLength = Integer.MAX_VALUE;
         private int downloaded = 0;
 
@@ -64 +64 @@
                 this.url = new URL(url);
                 this.target = target;
-
-                URLConnection connection = this.url.openConnection();
-                connection.connect();
-                size = connection.getContentLength();
         }
 
@@ -94 +90 @@
                         t.start();
                         state = EState.RUNNING;
-                        updateStatus(downloaded, size);
                 }
         }
@@ -108 +103 @@
                         else
                                 state = EState.RUNNING;
-                        updateStatus(downloaded, size);
+                        updateStatus(downloaded, fileLength);
                 }
         }
@@ -149 +144 @@
         public void run() {
                 int downloaded = 0;
-                int fileLength = Integer.MAX_VALUE;
                 String strLastModified = null;
                 String strEtag = null;
@@ -181 +175 @@
                                                 try {
                                                         URLConnection connection = url.openConnection();
+                                                        connection.setRequestProperty("Cache-Control", "no-cache");
                                                         if (downloaded == 0) {
                                                                 connection.connect();
@@ -257 +252 @@
 
         /**
-         * @return the size
-         */
-        public int getSize() {
-                return size;
-        }
-
-        /**
          * @return the downloaded size
          */