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

Timestamp:

Jan 15, 2013, 9:02:01 PM (12 years ago)

Author:

alloc

Message:

AEI2:

• Added offline detection (should run without internet connection)
• Update check (manual/on startup), not actually updating yet

Location:

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

Files:

• Settings.java (modified) (2 diffs)
• depot/DepotConfig.java (modified) (2 diffs)
• depot/DepotManager.java (modified) (3 diffs)
• mods/ModManager.java (modified) (2 diffs)
• mods/download/ModDownload.java (modified) (1 diff)
• network/DrupalJSONQuery.java (modified) (6 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java

@@ -65 +65 @@
 
         private boolean printNamesNotInMap = false;
+
+        private boolean offlineMode = false;
 
         /**
@@ -161 +163 @@
 
         /**
+         * @return Is offline?
+         */
+        public boolean isOfflineMode() {
+                return offlineMode;
+        }
+
+        /**
+         * @param offline
+         *            Is offline?
+         */
+        public void setOfflineMode(boolean offline) {
+                this.offlineMode = offline;
+        }
+
+        /**
          * @return Mod Depot cache filename
          */

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

@@ -1 +1 @@
 package net.oni2.aeinstaller.backend.depot;
+
+import net.oni2.aeinstaller.backend.Settings;
 
 /**
@@ -76 +78 @@
                 return 8000;
         }
+
+        /**
+         * @return URL of Depot
+         */
+        public static String getDepotUrl() {
+                return Settings.getInstance().get("depot_url", "http://mods.oni2.net/");
+        }
+
+        /**
+         * @return URL of Depot API
+         */
+        public static String getDepotApiUrl() {
+                return Settings.getInstance().get("depot_api_url",
+                                "http://mods.oni2.net/?q=api/");
+        }
 }

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

@@ -5 +5 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -21 +23 @@
 import net.oni2.aeinstaller.backend.network.DrupalJSONQuery;
 
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.impl.client.DefaultHttpClient;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -221 +227 @@
 
         /**
+         * @return Can we connect to the Depot?
+         */
+        public boolean checkConnection() {
+                HttpRequestBase httpQuery = null;
+
+                try {
+                        DefaultHttpClient httpclient = new DefaultHttpClient();
+                        httpQuery = new HttpGet(DepotConfig.getDepotUrl());
+
+                        HttpResponse response = httpclient.execute(httpQuery);
+
+                        int code = response.getStatusLine().getStatusCode();
+
+                        return (code >= 200) && (code <= 299);
+                } catch (UnknownHostException e) {
+                } catch (UnsupportedEncodingException e) {
+                        e.printStackTrace();
+                } catch (IOException e) {
+                        e.printStackTrace();
+                } finally {
+                        if (httpQuery != null)
+                                httpQuery.releaseConnection();
+                }
+                return false;
+        }
+
+        /**
          * @return All TaxVocabs
          */

AE/installer2/src/net/oni2/aeinstaller/backend/mods/ModManager.java

@@ -182 +182 @@
 
         /**
+         * @return Mods which are already locally available
+         */
+        public TreeSet<Mod> getLocalAvailableMods() {
+                TreeSet<Mod> res = new TreeSet<Mod>();
+                for (Mod m : mods.values()) {
+                        if (m.isLocalAvailable())
+                                res.add(m);
+                }
+                return res;
+        }
+
+        /**
+         * @return Mods which can be updated
+         */
+        public TreeSet<Mod> getUpdatableMods() {
+                TreeSet<Mod> res = new TreeSet<Mod>();
+                for (Mod m : getLocalAvailableMods()) {
+                        if (m.isNewerAvailable())
+                                res.add(m);
+                }
+                return res;
+        }
+
+        /**
          * @return Collection of tools valid on this platform and not mandatory
          */
@@ -199 +223 @@
                 for (Mod m : tools.values()) {
                         if (m.isValidOnPlatform() && m.isMandatoryMod())
+                                res.add(m);
+                }
+                return res;
+        }
+
+        /**
+         * @return Tools which are already locally available
+         */
+        public TreeSet<Mod> getLocalAvailableTools() {
+                TreeSet<Mod> res = new TreeSet<Mod>();
+                for (Mod m : tools.values()) {
+                        if (m.isLocalAvailable())
+                                res.add(m);
+                }
+                return res;
+        }
+
+        /**
+         * @return Tools which can be updated
+         */
+        public TreeSet<Mod> getUpdatableTools() {
+                TreeSet<Mod> res = new TreeSet<Mod>();
+                for (Mod m : getLocalAvailableTools()) {
+                        if (m.isNewerAvailable())
                                 res.add(m);
                 }

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

@@ -80 +80 @@
                         unpacker = new Unpacker(zipFile, targetFolder, this);
                 } catch (IOException e) {
-                        // TODO Auto-generated catch block
                         e.printStackTrace();
                 }

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

@@ -9 +9 @@
 import java.util.List;
 
-import net.oni2.aeinstaller.backend.Settings;
+import net.oni2.aeinstaller.backend.depot.DepotConfig;
 
 import org.apache.http.HttpEntity;
@@ -29 +29 @@
  */
 public class DrupalJSONQuery {
-
-        private static String getDepotUrl() {
-                return Settings.getInstance().get("depot_api_url",
-                                "http://mods.oni2.net/?q=api/");
-        }
 
         /**
@@ -56 +51 @@
                         }
                         HttpEntity data = new UrlEncodedFormEntity(nvps);
-                        return executeQuery(getDepotUrl() + resource + "/" + action
+                        return executeQuery(DepotConfig.getDepotApiUrl() + resource + "/" + action
                                         + ".json", data);
                 } catch (UnsupportedEncodingException e) {
@@ -80 +75 @@
                         String refName) throws Exception {
                 return executeQuery(
-                                getDepotUrl() + resource + "/" + Integer.toString(index) + "/"
+                                DepotConfig.getDepotApiUrl() + resource + "/" + Integer.toString(index) + "/"
                                                 + refName + ".json", null);
         }
@@ -100 +95 @@
                         String parameters) throws Exception {
                 return executeQuery(
-                                getDepotUrl() + resource + "/" + Integer.toString(index)
+                                DepotConfig.getDepotApiUrl() + resource + "/" + Integer.toString(index)
                                                 + ".json" + parameters, null);
         }
@@ -126 +121 @@
                 if (pagesize >= 0)
                         pagesizeN = "&pagesize=" + Integer.toString(pagesize);
-                return executeQuery(getDepotUrl() + resource + ".json" + pageN
+                return executeQuery(DepotConfig.getDepotApiUrl() + resource + ".json" + pageN
                                 + pagesizeN, null);
         }