Skip to content

The Unified and Autonomous Development Platform

Add partial content support for mp4 seek

Robin Shen3606ab1f809e
diff --git a/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java b/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java
index 0c0232c973..fddcce2b2b 100644
--- a/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java
+++ b/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java
@@ -9,6 +9,7 @@ import java.util.Set;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
@@ -256,8 +257,12 @@ public class GitPlexWebApplication extends WebApplication {
return new ExpectedExceptionPage(expectedException);
}
}
-
- return new UnexpectedExceptionPage(e);
+
+ HttpServletResponse response = (HttpServletResponse) RequestCycle.get().getResponse().getContainerResponse();
+ if (!response.isCommitted())
+ return new UnexpectedExceptionPage(e);
+ else
+ return null;
}
}
diff --git a/web/src/main/java/com/gitplex/server/web/util/resource/RawBlobResource.java b/web/src/main/java/com/gitplex/server/web/util/resource/RawBlobResource.java
index 3358cf8a8e..c73f986107 100644
--- a/web/src/main/java/com/gitplex/server/web/util/resource/RawBlobResource.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resource/RawBlobResource.java
@@ -1,7 +1,9 @@
package com.gitplex.server.web.util.resource;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.ArrayList;
@@ -12,7 +14,7 @@ import javax.ws.rs.core.MediaType;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.UnauthorizedException;
-import org.apache.tika.io.IOUtils;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
@@ -31,11 +33,13 @@ public class RawBlobResource extends AbstractResource {
private static final long serialVersionUID = 1L;
private static final String PARAM_DEPOT = "project";
-
+
private static final String PARAM_REVISION = "revision";
-
+
private static final String PARAM_PATH = "path";
+ private static final int BUFFER_SIZE = 64*1024;
+
@Override
protected ResourceResponse newResourceResponse(Attributes attributes) {
PageParameters params = attributes.getParameters();
@@ -43,10 +47,10 @@ public class RawBlobResource extends AbstractResource {
String projectName = Preconditions.checkNotNull(params.get(PARAM_DEPOT).toString());
if (StringUtils.isBlank(projectName))
throw new IllegalArgumentException("project name has to be specified");
-
+
Project project = GitPlex.getInstance(ProjectManager.class).find(projectName);
-
- if (project == null)
+
+ if (project == null)
throw new EntityNotFoundException("Unable to find project " + projectName);
List<String> revisionAndPathSegments = new ArrayList<>();
@@ -56,54 +60,91 @@ public class RawBlobResource extends AbstractResource {
segment = params.get(PARAM_PATH).toString();
if (segment.length() != 0)
revisionAndPathSegments.add(segment);
-
- for (int i=0; i<params.getIndexedCount(); i++) {
+
+ for (int i = 0; i < params.getIndexedCount(); i++) {
segment = params.get(i).toString();
if (segment.length() != 0)
revisionAndPathSegments.add(segment);
}
-
+
BlobIdent blobIdent = new BlobIdent(project, revisionAndPathSegments);
-
+
String revision = blobIdent.revision;
String path = blobIdent.path;
if (StringUtils.isBlank(path))
throw new IllegalArgumentException("path parameter has to be specified");
- if (!SecurityUtils.canRead(project))
+ if (!SecurityUtils.canRead(project))
throw new UnauthorizedException();
final Blob blob = project.getBlob(new BlobIdent(revision, path, 0));
-
+
ResourceResponse response = new ResourceResponse();
+ response.setAcceptRange(ContentRangeType.BYTES);
response.setContentLength(blob.getSize());
response.setContentType(blob.getMediaType().toString());
if (response.getContentType().equals(MediaType.TEXT_HTML)) {
response.setContentType(MediaType.TEXT_PLAIN);
}
-
+
if (!GitUtils.isHash(revision))
response.disableCaching();
-
+
try {
response.setFileName(URLEncoder.encode(blob.getIdent().getName(), Charsets.UTF_8.name()));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
-
+
response.setWriteCallback(new WriteCallback() {
+ private void copyRange(InputStream in, OutputStream out, long start, long end) throws IOException {
+
+ long skipped = in.skip(start);
+
+ if (skipped < start) {
+ throw new IOException("Skipped only " + skipped + " bytes out of " + start + " required.");
+ }
+
+ long bytesToCopy = end - start + 1;
+
+ byte buffer[] = new byte[BUFFER_SIZE];
+ while (bytesToCopy > 0) {
+ int bytesRead = in.read(buffer);
+ if (bytesRead <= bytesToCopy) {
+ out.write(buffer, 0, bytesRead);
+ bytesToCopy -= bytesRead;
+ } else {
+ out.write(buffer, 0, (int) bytesToCopy);
+ bytesToCopy = 0;
+ }
+ if (bytesRead < buffer.length) {
+ break;
+ }
+ }
+ }
+
@Override
public void writeData(Attributes attributes) throws IOException {
- if (blob.isPartial()) {
- try (InputStream is = project.getInputStream(blob.getIdent());) {
- IOUtils.copy(is, attributes.getResponse().getOutputStream());
- }
- } else {
- attributes.getResponse().getOutputStream().write(blob.getBytes());
+ try (InputStream is = getInputStream(blob)) {
+ Long startByte = RequestCycle.get().getMetaData(CONTENT_RANGE_STARTBYTE);
+ Long endByte = RequestCycle.get().getMetaData(CONTENT_RANGE_ENDBYTE);
+
+ if (startByte == null)
+ startByte = 0L;
+ if (endByte == null || endByte == -1)
+ endByte = blob.getSize() - 1;
+ copyRange(is, attributes.getResponse().getOutputStream(), startByte, endByte);
}
}
-
+
+ private InputStream getInputStream(Blob blob) {
+ if (blob.isPartial())
+ return project.getInputStream(blob.getIdent());
+ else
+ return new ByteArrayInputStream(blob.getBytes());
+ }
+
});
return response;
@@ -114,8 +155,8 @@ public class RawBlobResource extends AbstractResource {
params.set(PARAM_DEPOT, project.getName());
params.set(PARAM_REVISION, blobIdent.revision);
params.set(PARAM_PATH, blobIdent.path);
-
+
return params;
}
-
+
}