Changeset 634 for AE/installer2/src/net/oni2/aeinstaller/backend/depot

Timestamp:

Jan 19, 2013, 12:58:17 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.92b:\n- Using zipped Depot cache

Location:

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

Files:

• DepotCacheUpdateProgressListener.java (deleted)
• DepotManager.java (modified) (5 diffs)

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

@@ -1 +1 @@
 package net.oni2.aeinstaller.backend.depot;
 
+import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.net.UnknownHostException;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Vector;
-
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.Settings.Platform;
@@ -21 +27 @@
 import net.oni2.aeinstaller.backend.depot.model.TaxonomyVocabulary;
 import net.oni2.aeinstaller.backend.mods.ECompatiblePlatform;
-import net.oni2.aeinstaller.backend.network.DrupalJSONQuery;
+import net.oni2.aeinstaller.backend.network.FileDownloader;
 
 import org.apache.http.HttpResponse;
@@ -64 +70 @@
          * @param forceRefreshAll
          *            Force refreshing all data, even if it seems to be cached
-         * @param listener
-         *            Listener for update status
-         */
-        public void updateInformation(boolean forceRefreshAll,
-                        DepotCacheUpdateProgressListener listener) {
+         */
+        public void updateInformation(boolean forceRefreshAll) {
                 taxonomyTerms.clear();
                 taxonomyVocabulary.clear();
@@ -77 +80 @@
 
                 try {
-                        JSONArray ja;
-                        JSONObject jo;
-
-                        ja = DrupalJSONQuery
-                                        .executeQuery("http://mods.oni2.net/jsoncache/vocabulary.json");
-                        for (int i = 0; i < ja.length(); i++) {
-                                jo = ja.getJSONObject(i);
-                                TaxonomyVocabulary tv = new TaxonomyVocabulary(jo);
-                                taxonomyVocabulary.put(tv.getVid(), tv);
+                        java.io.File zipName = new java.io.File(Paths.getDownloadPath(),
+                                        "jsoncache.zip");
+                        FileDownloader fd = new FileDownloader(DepotConfig.getDepotUrl()
+                                        + "jsoncache/jsoncache.zip", zipName);
+                        fd.start();
+                        while (fd.getState() != net.oni2.aeinstaller.backend.network.FileDownloader.EState.FINISHED) {
+                                Thread.sleep(50);
                         }
 
-                        ja = DrupalJSONQuery
-                                        .executeQuery("http://mods.oni2.net/jsoncache/terms.json");
-                        for (int i = 0; i < ja.length(); i++) {
-                                jo = ja.getJSONObject(i);
-                                TaxonomyTerm tt = new TaxonomyTerm(jo);
-                                taxonomyTerms.put(tt.getTid(), tt);
-                        }
-
-                        ja = DrupalJSONQuery
-                                        .executeQuery("http://mods.oni2.net/jsoncache/nodes.json");
-                        for (int i = 0; i < ja.length(); i++) {
-                                jo = ja.getJSONObject(i);
-
-                                int nid = jo.getInt("nid");
-                                String type = jo.getString("type");
-
-                                Node n = null;
-                                if (type.equalsIgnoreCase(DepotConfig.getNodeType_Mod()))
-                                        n = new NodeMod(jo);
-                                else
-                                        n = new Node(jo);
-
-                                nodes.put(nid, n);
-                                if (!nodesByType.containsKey(type))
-                                        nodesByType.put(type, new HashMap<Integer, Node>());
-                                nodesByType.get(type).put(nid, n);
-                        }
-
-                        ja = DrupalJSONQuery
-                                        .executeQuery("http://mods.oni2.net/jsoncache/files.json");
-                        for (int i = 0; i < ja.length(); i++) {
-                                jo = ja.getJSONObject(i);
-
-                                int fid = jo.getInt("fid");
-
-                                File f = new File(jo);
-                                files.put(fid, f);
+                        ZipFile zf = null;
+                        try {
+                                zf = new ZipFile(zipName);
+                                for (Enumeration<? extends ZipEntry> e = zf.entries(); e
+                                                .hasMoreElements();) {
+                                        ZipEntry ze = e.nextElement();
+                                        if (!ze.isDirectory()) {
+                                                BufferedReader input = new BufferedReader(
+                                                                new InputStreamReader(zf.getInputStream(ze)));
+                                                StringBuffer json = new StringBuffer();
+
+                                                char data[] = new char[1024];
+                                                int dataRead;
+                                                while ((dataRead = input.read(data, 0, 1024)) != -1) {
+                                                        json.append(data, 0, dataRead);
+                                                }
+
+                                                if (ze.getName().toLowerCase().contains("vocabulary"))
+                                                        initVocabulary(new JSONArray(json.toString()));
+                                                if (ze.getName().toLowerCase().contains("terms"))
+                                                        initTerms(new JSONArray(json.toString()));
+                                                if (ze.getName().toLowerCase().contains("nodes"))
+                                                        initNodes(new JSONArray(json.toString()));
+                                                if (ze.getName().toLowerCase().contains("files"))
+                                                        initFiles(new JSONArray(json.toString()));
+                                        }
+                                }
+                        } finally {
+                                if (zf != null)
+                                        zf.close();
+                                zipName.delete();
                         }
 
@@ -135 +130 @@
                 } catch (JSONException e) {
                         e.printStackTrace();
-                } catch (Exception e) {
-                        System.err.println(e.getMessage());
-                        e.printStackTrace();
+                } catch (IOException e1) {
+                        e1.printStackTrace();
+                } catch (InterruptedException e) {
+                        e.printStackTrace();
+                }
+        }
+
+        private void initFiles(JSONArray ja) throws JSONException {
+                JSONObject jo;
+
+                for (int i = 0; i < ja.length(); i++) {
+                        jo = ja.getJSONObject(i);
+
+                        int fid = jo.getInt("fid");
+
+                        File f = new File(jo);
+                        files.put(fid, f);
+                }
+        }
+
+        private void initNodes(JSONArray ja) throws JSONException {
+                JSONObject jo;
+
+                for (int i = 0; i < ja.length(); i++) {
+                        jo = ja.getJSONObject(i);
+
+                        int nid = jo.getInt("nid");
+                        String type = jo.getString("type");
+
+                        Node n = null;
+                        if (type.equalsIgnoreCase(DepotConfig.getNodeType_Mod()))
+                                n = new NodeMod(jo);
+                        else
+                                n = new Node(jo);
+
+                        nodes.put(nid, n);
+                        if (!nodesByType.containsKey(type))
+                                nodesByType.put(type, new HashMap<Integer, Node>());
+                        nodesByType.get(type).put(nid, n);
+                }
+        }
+
+        private void initTerms(JSONArray ja) throws JSONException {
+                JSONObject jo;
+
+                for (int i = 0; i < ja.length(); i++) {
+                        jo = ja.getJSONObject(i);
+                        TaxonomyTerm tt = new TaxonomyTerm(jo);
+                        taxonomyTerms.put(tt.getTid(), tt);
+                }
+        }
+
+        private void initVocabulary(JSONArray ja) throws JSONException {
+                JSONObject jo;
+
+                for (int i = 0; i < ja.length(); i++) {
+                        jo = ja.getJSONObject(i);
+                        TaxonomyVocabulary tv = new TaxonomyVocabulary(jo);
+                        taxonomyVocabulary.put(tv.getVid(), tv);
                 }
         }