github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-05 17:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Now saves the versions already held.

Browse source
This commit is contained in:
Winston Li 2014-11-07 18:54:24 +00:00
parent f43fd39fc7
commit 0d7f5e4430
9 changed files with 79 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WLBridgedProject.java
View file

@ -42,14 +42,10 @@ public class WLBridgedProject {
try {
List<Snapshot> snapshotsToAdd = snapshotDBAPI.getSnapshotsToAddToProject(name);
for (Snapshot snapshot : snapshotsToAdd) {
snapshot.getData().writeAll(repositoryDirectory.getAbsolutePath());
snapshot.writeToDisk(repositoryDirectory.getAbsolutePath());
Git git = new Git(repository);
AddCommand add = git.add();
add.addFilepattern(".");
add.call();
CommitCommand commit = git.commit();
commit.setMessage("Commit");
commit.call();
git.add().addFilepattern(".").call();
git.commit().setAuthor(snapshot.getUserName(), snapshot.getUserEmail()).setMessage(snapshot.getComment()).call();
}
} catch (Throwable throwable) {
throwable.printStackTrace();

22
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/DummySnapshotAPI.java
View file

@ -1,22 +0,0 @@
package uk.ac.ic.wlgitbridge.writelatex.api;
import uk.ac.ic.wlgitbridge.writelatex.model.Snapshot;
import java.util.List;
/**
* Created by Winston on 03/11/14.
*/
public class DummySnapshotAPI implements SnapshotAPI {
@Override
public List<Snapshot> getSnapshots() {
return null;
}
@Override
public void putSnapshots(List<Snapshot> snapshots) {
}
}

9
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotData.java
View file

@ -36,14 +36,12 @@ public class SnapshotData implements JSONSource {
for (JsonElement json : jsonArray) {
srcs.add(new WLFile(json));
}
System.out.println(srcs);
}
private void populateAtts(JsonArray jsonArray) {
for (JsonElement json : jsonArray) {
atts.add(new WLAttachment(json));
}
System.out.println(atts);
}
public void writeAll(String repoDir) throws InterruptedException, ExecutionException, IOException {
@ -55,4 +53,11 @@ public class SnapshotData implements JSONSource {
}
}
public List<WLFile> getSrcs() {
return srcs;
}
public List<WLFile> getAtts() {
return atts;
}
}

23
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/WLFile.java
View file

@ -44,7 +44,6 @@ public class WLFile implements JSONSource {
}
public void writeToDisk(String repoDir) throws IOException, ExecutionException, InterruptedException {
System.out.println("write to " + repoDir);
File file = new File(repoDir, path);
file.getParentFile().mkdirs();
file.createNewFile();
@ -53,26 +52,4 @@ public class WLFile implements JSONSource {
out.close();
}
// @Override
// public String toString() {
// try {
// File file = new File("/Users/Roxy/git-test-files/" + path);
// file.getParentFile().mkdirs();
// file.createNewFile();
// OutputStream out = new FileOutputStream(file);
// out.write(getContents());
// out.close();
// return "{ path: " + path + ", contents: " + getContents().toString() + " }";
// } catch (ExecutionException e) {
// e.printStackTrace();
// } catch (InterruptedException e) {
// e.printStackTrace();
// } catch (FileNotFoundException e) {
// e.printStackTrace();
// } catch (IOException e) {
// e.printStackTrace();
// }
// return "Exception";
// }
}

5
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotInfo.java
View file

@ -13,6 +13,11 @@ public class SnapshotInfo {
private WLUser user;
private String createdAt;
public SnapshotInfo(int versionID) {
comment = "Update on WriteLatex.com.";
user = new WLUser();
}
public int getVersionId() {
return versionId;
}

5
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/WLUser.java
View file

@ -11,6 +11,11 @@ public class WLUser {
private String name;
private String email;
public WLUser() {
name = "Anonymous";
email = "anonymous@writelatex.com";
}
public String getName() {
return name;
}

57
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/Snapshot.java
View file

@ -2,38 +2,61 @@ package uk.ac.ic.wlgitbridge.writelatex.model;
import com.google.gson.JsonElement;
import uk.ac.ic.wlgitbridge.writelatex.api.request.getforversion.SnapshotData;
import uk.ac.ic.wlgitbridge.writelatex.api.request.getforversion.WLFile;
import uk.ac.ic.wlgitbridge.writelatex.api.request.getsavedvers.SnapshotInfo;
import uk.ac.ic.wlgitbridge.writelatex.api.request.getsavedvers.WLUser;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.ExecutionException;
/**
* Created by Winston on 03/11/14.
*/
public class Snapshot implements JSONModel {
public class Snapshot {
private int versionID;
private String comment;
private WLUser user;
private SnapshotData data;
private final int versionID;
private final String comment;
private final String userName;
private final String userEmail;
public Snapshot(int versionID, SnapshotData data) {
this.comment = comment;
private final List<WLFile> srcs;
private final List<WLFile> atts;
this.data = data;
public Snapshot(SnapshotInfo info, SnapshotData data) {
versionID = info.getVersionId();
comment = info.getComment();
WLUser user = info.getUser();
userName = user.getName();
userEmail = user.getEmail();
srcs = data.getSrcs();
atts = data.getAtts();
}
@Override
public void updateFromJSON(JsonElement json) {
public void writeToDisk(String basePath) throws InterruptedException, ExecutionException, IOException {
for (WLFile file : srcs) {
file.writeToDisk(basePath);
}
for (WLFile file : atts) {
file.writeToDisk(basePath);
}
}
public void writeToDisk() {
}
public SnapshotData getData() {
return data;
public int getVersionID() {
return versionID;
}
public String getComment() {
return comment;
}
public String getUserName() {
return userName;
}
public String getUserEmail() {
return userEmail;
}
}

5
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java
View file

@ -24,13 +24,10 @@ public class WLDataModel implements SnapshotDBAPI {
projects = new HashMap<String, WLProject>();
}
public void updateProjectWithName(String name) throws Throwable {
private void updateProjectWithName(String name) throws Throwable {
if (!projects.containsKey(name)) {
projects.put(name, new WLProject(name));
}
System.out.println(projects);
System.out.println(projects.get(name));
System.out.println(name);
projects.get(name).update();
}

42
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLProject.java
View file

@ -17,27 +17,17 @@ import java.util.concurrent.ExecutionException;
/**
* Created by Winston on 06/11/14.
*/
public class WLProject implements JSONModel {
public class WLProject {
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;
private List<Snapshot> snapshotsToAdd;
private SortedSet<Integer> idsToUpdate;
private HashMap<Integer, SnapshotInfo> msg;
public WLProject(String name) {
this.name = name;
snapshots = new HashMap<Integer, Snapshot>();
versions = new TreeSet<Integer>();
latestVersionID = VERSION_ID_INVALID;
}
@Override
public void updateFromJSON(JsonElement json) {
}
public void update() throws Throwable {
@ -51,22 +41,22 @@ public class WLProject implements JSONModel {
getDoc.request();
getSavedVers.request();
List<Integer> fetchedIDs = new LinkedList<Integer>();
fetchedIDs.add(getDoc.getResult().getVersionID());
Set<Integer> fetchedIDs = new HashSet<Integer>();
Map<Integer, SnapshotInfo> fetchedSnapshotInfos = new HashMap<Integer, SnapshotInfo>();
int latestVersionID = getDoc.getResult().getVersionID();
fetchedSnapshotInfos.put(latestVersionID, new SnapshotInfo(latestVersionID));
fetchedIDs.add(latestVersionID);
for (SnapshotInfo snapshotInfo : getSavedVers.getResult().getSavedVers()) {
msg = new HashMap<Integer, SnapshotInfo>();
msg.put(snapshotInfo.getVersionId(), snapshotInfo);
fetchedIDs.add(snapshotInfo.getVersionId());
int versionId = snapshotInfo.getVersionId();
fetchedSnapshotInfos.put(versionId, snapshotInfo);
fetchedIDs.add(versionId);
}
boolean result = false;
// ids.add(getLatestVersionID(getDoc.getResult()));
// ids.addAll(getLatestVersionIDs(getSavedVers.getResult()));
idsToUpdate = new TreeSet<Integer>();
List<Integer> idsToUpdate = new LinkedList<Integer>();
boolean hasNew = false;
for (Integer id : fetchedIDs) {
@ -77,12 +67,16 @@ public class WLProject implements JSONModel {
}
}
updateIDs(idsToUpdate);
versions.addAll(fetchedIDs);
versions.add(latestVersionID);
updateIDs(idsToUpdate, fetchedSnapshotInfos);
return result;
}
private void updateIDs(SortedSet<Integer> idsToUpdate) throws Throwable {
private void updateIDs(List<Integer> idsToUpdate, Map<Integer, SnapshotInfo> fetchedSnapshotInfos) throws Throwable {
System.out.println(idsToUpdate);
List<SnapshotGetForVersionRequest> requests = new LinkedList<SnapshotGetForVersionRequest>();
for (int id : idsToUpdate) {
SnapshotGetForVersionRequest request = new SnapshotGetForVersionRequest(name, id);
@ -92,7 +86,7 @@ public class WLProject implements JSONModel {
for (SnapshotGetForVersionRequest request : requests) {
SnapshotGetForVersionResult result = request.getResult();
SnapshotData data = result.getSnapshotData();
Snapshot snapshot = new Snapshot(request.getVersionID(), data);
Snapshot snapshot = new Snapshot(fetchedSnapshotInfos.get(request.getVersionID()), data);
snapshots.put(request.getVersionID(), snapshot);
}
snapshotsToAdd = new LinkedList<Snapshot>();