github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Testing candidate snapshot approval.

Browse source
This commit is contained in:
Winston Li 2014-11-16 21:49:16 +00:00
parent 06a7ee6614
commit 48305d963f
9 changed files with 69 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java
View file

@ -1,11 +1,15 @@
package uk.ac.ic.wlgitbridge.application;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.AbstractHandler;
import uk.ac.ic.wlgitbridge.bridge.WriteLatexDataSource;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.io.IOException;
/**
@ -13,27 +17,29 @@ import java.io.IOException;
*/
public class SnapshotPushPostbackHandler extends AbstractHandler {
private final WriteLatexDataSource writeLatexDataSource;
public SnapshotPushPostbackHandler(WriteLatexDataSource writeLatexDataSource) {
this.writeLatexDataSource = writeLatexDataSource;
}
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
// System.out.println("handling");
// System.out.println(request.getMethod());
// response.setContentType("text/html;charset=utf-8");
// response.setStatus(HttpServletResponse.SC_OK);
baseRequest.setHandled(false);
if (request.getMethod().equals("POST") && request.getPathInfo().endsWith("postback")) {
System.out.println(request.getHeaderNames());
BufferedReader reader = request.getReader();
StringBuilder sb = new StringBuilder();
for (String line; (line = reader.readLine()) != null; ) {
sb.append(line);
}
String data = sb.toString();
JsonObject dataObj = new Gson().fromJson(data, JsonObject.class);
writeLatexDataSource.postbackReceivedSuccessfully(request.getRequestURI().split("/")[0]);
baseRequest.setHandled(true);
}
System.out.println(request.getRemoteAddr());
System.out.println(request.getLocalName());
System.out.println("method: " + request.getMethod());
System.out.println("pathInfo: " + request.getPathInfo());
System.out.println("contextPath: " + request.getContextPath());
System.out.println("pathtranslated: " + request.getPathTranslated());
System.out.println("queryString: " + request.getQueryString());
System.out.println("remoteUser: " + request.getRemoteUser());
System.out.println("requestURI: " + request.getRequestURI());
// response.getWriter().println("<h1>Hello World</h1>");
}
}

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

@ -8,6 +8,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.log.Log;
import uk.ac.ic.wlgitbridge.application.jetty.NullLogger;
import uk.ac.ic.wlgitbridge.bridge.WriteLatexDataSource;
import uk.ac.ic.wlgitbridge.git.exception.InvalidRootDirectoryPathException;
import uk.ac.ic.wlgitbridge.git.servlet.WLGitServlet;
import uk.ac.ic.wlgitbridge.writelatex.WriteLatexAPI;
@ -67,20 +68,21 @@ public class WLGitBridgeServer {
private void configureJettyServer() throws ServletException, InvalidRootDirectoryPathException {
HandlerCollection handlers = new HandlerCollection();
WriteLatexAPI writeLatexDataSource = new WriteLatexAPI(new WLDataModel(rootGitDirectoryPath));
handlers.setHandlers(new Handler[] {
initResourceHandler(),
new SnapshotPushPostbackHandler(),
initGitHandler()
new SnapshotPushPostbackHandler(writeLatexDataSource),
initGitHandler(writeLatexDataSource)
});
jettyServer.setHandler(handlers);
}
private Handler initGitHandler() throws ServletException, InvalidRootDirectoryPathException {
private Handler initGitHandler(WriteLatexDataSource writeLatexDataSource) throws ServletException, InvalidRootDirectoryPathException {
final ServletContextHandler servletContextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
servletContextHandler.setContextPath("/");
servletContextHandler.addServlet(
new ServletHolder(
new WLGitServlet(servletContextHandler, new WriteLatexAPI(new WLDataModel(rootGitDirectoryPath)), rootGitDirectoryPath)),
new WLGitServlet(servletContextHandler, writeLatexDataSource, rootGitDirectoryPath)),
"/*"
);
return servletContextHandler;

3
services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java
View file

@ -19,6 +19,7 @@ public interface WriteLatexDataSource {
public void expectPostback(String projectName);
/* Called by postback thread. */
public void postbackReceived(String projectName);
public void postbackReceivedSuccessfully(String projectName);
public void postbackReceivedWithException(String projectName, SnapshotPostException exception);
}

4
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/SnapshotFetcher.java
View file

@ -38,6 +38,10 @@ public class SnapshotFetcher {
return snapshots.get(versions.last());
}
public void putLatestVersion(int versionID) {
versions.add(versionID);
}
private boolean getNew(SortedSet<Snapshot> newSnapshots) throws FailedConnectionException, InvalidProjectException {
SnapshotGetDocRequest getDoc = new SnapshotGetDocRequest(projectName);
SnapshotGetSavedVersRequest getSavedVers = new SnapshotGetSavedVersRequest(projectName);

2
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java
View file

@ -21,7 +21,7 @@ public class WLDirectoryNodeSnapshot implements CandidateSnapshot {
private final CandidateSnapshotCallback callback;
public WLDirectoryNodeSnapshot(WLProject project, WLDirectoryNode directoryNode, String hostname, CandidateSnapshotCallback callback) {
previousVersionID = project.getLatestSnapshot().getVersionID();
previousVersionID = project.getLatestSnapshotID();
projectName = project.getName();
projectURL = "http://" + hostname + "/" + projectName;
this.directoryNode = directoryNode;

35
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java
View file

@ -11,8 +11,9 @@ import uk.ac.ic.wlgitbridge.writelatex.api.request.push.SnapshotPushRequest;
import uk.ac.ic.wlgitbridge.writelatex.model.WLDataModel;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Created by Winston on 16/11/14.
@ -20,9 +21,11 @@ import java.util.List;
public class WriteLatexAPI implements WriteLatexDataSource {
private final WLDataModel dataModel;
private final Map<String, Object> postbackConds;
public WriteLatexAPI(WLDataModel dataModel) {
this.dataModel = dataModel;
postbackConds = new HashMap<String, Object>();
}
@Override
@ -46,29 +49,31 @@ public class WriteLatexAPI implements WriteLatexDataSource {
public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents, String hostname) throws SnapshotPostException, IOException, FailedConnectionException {
CandidateSnapshot candidate = dataModel.createCandidateSnapshotFromProjectWithContents(projectName, directoryContents, hostname);
new SnapshotPushRequest(candidate).request();
throw new SnapshotPostException() {
@Override
public String getMessage() {
return "unimplemented";
}
@Override
public List<String> getDescriptionLines() {
return Arrays.asList("Currently implemented");
}
};
expectPostback(projectName);
candidate.approveWithVersionID(100);
}
@Override
public void expectPostback(String projectName) {
Object value = new Object();
postbackConds.put(projectName, value);
try {
value.wait();
} catch (InterruptedException e) {
e.printStackTrace();
}
}
/* Called by postback thread. */
@Override
public void postbackReceived(String projectName) {
public void postbackReceivedSuccessfully(String projectName) {
System.out.println("successfully received postback for " + projectName);
postbackConds.get(projectName).notifyAll();
}
@Override
public void postbackReceivedWithException(String projectName, SnapshotPostException exception) {
postbackReceivedSuccessfully(projectName);
}
}

5
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/store/WLFileStore.java
View file

@ -1,5 +1,6 @@
package uk.ac.ic.wlgitbridge.writelatex.filestore.store;
import uk.ac.ic.wlgitbridge.bridge.CandidateSnapshot;
import uk.ac.ic.wlgitbridge.bridge.RawDirectoryContents;
import uk.ac.ic.wlgitbridge.bridge.WritableRepositoryContents;
import uk.ac.ic.wlgitbridge.writelatex.api.request.exception.FailedConnectionException;
@ -59,6 +60,10 @@ public class WLFileStore {
return getDirectoryNodeForProjectName(project.getName()).createFromRawDirectoryContents(directoryContents, attDirectory);
}
public void approveCandidateSnapshot(int versionID, CandidateSnapshot candidateSnapshot) {
fileStore.put(candidateSnapshot.getProjectName(), candidateSnapshot.getDirectoryNode());
}
private WLDirectoryNode getDirectoryNodeForProjectName(String projectName) {
WLDirectoryNode directoryNode = fileStore.get(projectName);
if (directoryNode == null) {

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

@ -53,7 +53,8 @@ public class WLDataModel implements CandidateSnapshotCallback {
@Override
public void approveSnapshot(int versionID, CandidateSnapshot candidateSnapshot) {
getProjectWithName(candidateSnapshot.getProjectName()).putLatestSnapshot(versionID);
fileStore.approveCandidateSnapshot(versionID, candidateSnapshot);
}
}

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

@ -17,7 +17,7 @@ public class WLProject {
private final Map<Integer, Snapshot> snapshots;
private final SnapshotFetcher snapshotFetcher;
private Snapshot latestSnapshot;
private int latestSnapshotID;
public WLProject(String name) {
this.name = name;
@ -27,7 +27,7 @@ public class WLProject {
public SortedSet<Snapshot> fetchNewSnapshots() throws FailedConnectionException, InvalidProjectException {
SortedSet<Snapshot> newSnapshots = snapshotFetcher.fetchNewSnapshots();
latestSnapshot = snapshotFetcher.getLatestSnapshot();
latestSnapshotID = snapshotFetcher.getLatestSnapshot().getVersionID();
return newSnapshots;
}
@ -35,8 +35,14 @@ public class WLProject {
return name;
}
public Snapshot getLatestSnapshot() {
return latestSnapshot;
public int getLatestSnapshotID() {
return latestSnapshotID;
}
public void putLatestSnapshot(int versionID) {
snapshots.put(versionID, null);
snapshotFetcher.putLatestVersion(versionID);
latestSnapshotID = versionID;
}
}