Now fetching missing version IDs.

2014-11-06 12:30:45 +00:00
parent d59c3da400
commit acd2a52b86
4 changed files with 262 additions and 131 deletions
@@ -2,12 +2,14 @@ package uk.ac.ic.wlgitbridge.writelatex.model;

 import com.google.gson.JsonElement;

+import java.io.IOException;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;

 /**
 * Created by Winston on 06/11/14.
 */
-public class WLDataModel implements JSONModel {
+public class WLDataModel {

    private final Map<String, WLProject> projects;

@@ -15,8 +17,8 @@ public class WLDataModel implements JSONModel {
        this.projects = projects;
    }

-    @Override
-    public void updateFromJSON(JsonElement json) {
-
+    public void updateProjectWithName(String name) throws InterruptedException, ExecutionException, IOException {
+        projects.get(name).update();
    }
+
 }
@@ -1,21 +1,34 @@
 package uk.ac.ic.wlgitbridge.writelatex.model;

+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.sun.javafx.collections.transformation.SortedList;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.Request;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.SnapshotGetDocRequest;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.SnapshotGetForVersionRequest;
+import uk.ac.ic.wlgitbridge.writelatex.api.request.SnapshotGetSavedVersRequest;

-import java.util.HashMap;
-import java.util.Map;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ExecutionException;

 /**
 * Created by Winston on 06/11/14.
 */
 public class WLProject implements JSONModel {

+    private final String name;
    public static final int VERSION_ID_INVALID = -1;
    private final Map<Integer, Snapshot> snapshots;
+    private final SortedSet<Integer> versions;
    private int latestVersionID;

-    public WLProject() {
+    public WLProject(String name) {
+        this.name = name;
        snapshots = new HashMap<Integer, Snapshot>();
+        versions = new TreeSet<Integer>();
        latestVersionID = VERSION_ID_INVALID;
    }

@@ -24,4 +37,69 @@ public class WLProject implements JSONModel {

    }

+    public void update() throws InterruptedException, ExecutionException, IOException {
+        getNew();
+    }
+
+    private boolean getNew() throws InterruptedException, ExecutionException, IOException {
+        Request getDoc = new SnapshotGetDocRequest(name);
+        Request getSavedVers = new SnapshotGetSavedVersRequest(name);
+
+        getDoc.request();
+        getSavedVers.request();
+
+        List<Integer> ids = new LinkedList<Integer>();
+
+        boolean result = false;
+
+        ids.add(getLatestVersionID(getDoc.getResponse()));
+
+        ids.addAll(getLatestVersionIDs(getSavedVers.getResponse()));
+
+        List<Integer> idsToUpdate = new LinkedList<Integer>();
+
+        boolean hasNew = false;
+        for (Integer id : ids) {
+            boolean contains = versions.contains(id);
+            result = result || contains;
+            if (!contains) {
+                idsToUpdate.add(id);
+            }
+        }
+
+        updateIDs(idsToUpdate);
+
+        return result;
+    }
+
+    private void updateIDs(List<Integer> idsToUpdate) {
+        List<Request> requests = new LinkedList<Request>();
+        for (int id : idsToUpdate) {
+            SnapshotGetForVersionRequest request = new SnapshotGetForVersionRequest(name, id);
+            requests.add(request);
+            request.request();
+        }
+        
+    }
+
+    private int getLatestVersionID(String response) {
+        Gson gson = new Gson();
+        JsonObject responseObject = gson.fromJson(response, JsonObject.class);
+        return responseObject.get("latestVerId").getAsInt();
+    }
+
+    private Collection<? extends Integer> getLatestVersionIDs(String response) {
+        List<Integer> ids = new LinkedList<Integer>();
+        Gson gson = new Gson();
+        JsonArray responseArray = gson.fromJson(response, JsonArray.class);
+        for (JsonElement elem : responseArray) {
+            ids.add(getVersionID(elem.getAsJsonObject()));
+        }
+        return ids;
+    }
+
+    private Integer getVersionID(JsonObject object) {
+        return object.get("versionId").getAsInt();
+    }
+
 }