Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-19 14:02:13 +01:00
Code Issues Packages Projects Releases Activity

Introduce content resource with content type detection

Browse Source
This commit is contained in:
René Pfeuffer
2018-08-10 16:31:22 +02:00
parent 8c541b8dec
commit 7e31498fa4
5 changed files with 118 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scm-webapp/pom.xml
View File

@@ -226,7 +226,18 @@
<artifactId>compiler</artifactId>
<version>${mustache.version}</version>
</dependency>
<dependency>
<groupId>com.github.sdorra</groupId>
<artifactId>spotter-core</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>1.18</version>
</dependency>
<!-- test scope -->
<dependency>

96
scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java Normal file
View File

@@ -0,0 +1,96 @@
package sonia.scm.api.v2.resources;
import com.github.sdorra.spotter.ContentType;
import com.github.sdorra.spotter.ContentTypes;
import com.github.sdorra.spotter.Language;
import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.PathNotFoundException;
import sonia.scm.repository.RepositoryException;
import sonia.scm.repository.RepositoryNotFoundException;
import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory;
import javax.inject.Inject;
import javax.ws.rs.GET;
import javax.ws.rs.HEAD;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.core.Response;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Optional;
public class ContentResource {
private final RepositoryServiceFactory servicefactory;
@Inject
public ContentResource(RepositoryServiceFactory servicefactory) {
this.servicefactory = servicefactory;
}
@GET
@Path("{revision}/{path: .*}")
public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision, @PathParam("path") String path) {
try (RepositoryService repositoryService = servicefactory.create(new NamespaceAndName(namespace, name))) {
try {
byte[] content = getContent(revision, path, repositoryService);
Response.ResponseBuilder responseBuilder = Response.ok(content);
appendContentType(path, content, responseBuilder);
return responseBuilder.build();
} catch (PathNotFoundException e) {
return Response.status(404).build();
} catch (IOException e) {
e.printStackTrace();
return Response.status(500).entity(e.getMessage()).build();
} catch (RepositoryException e) {
e.printStackTrace();
return Response.status(500).entity(e.getMessage()).build();
}
} catch (RepositoryNotFoundException e) {
return Response.status(404).build();
}
}
@HEAD
@Path("{revision}/{path: .*}")
public Response metadata(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision, @PathParam("path") String path) {
try (RepositoryService repositoryService = servicefactory.create(new NamespaceAndName(namespace, name))) {
try {
byte[] content = getContent(revision, path, repositoryService);
Response.ResponseBuilder responseBuilder = Response.ok();
appendContentType(path, content, responseBuilder);
return responseBuilder.build();
} catch (PathNotFoundException e) {
return Response.status(404).build();
} catch (IOException e) {
e.printStackTrace();
return Response.status(500).entity(e.getMessage()).build();
} catch (RepositoryException e) {
e.printStackTrace();
return Response.status(500).entity(e.getMessage()).build();
}
} catch (RepositoryNotFoundException e) {
return Response.status(404).build();
}
}
private void appendContentType(String path, byte[] content, Response.ResponseBuilder responseBuilder) {
ContentType contentType = ContentTypes.detect(path, content);
System.out.println("Content-Type: " + contentType);
Optional<Language> language = contentType.getLanguage();
if (language.isPresent()) {
responseBuilder.header("Content-Type", contentType);
}
responseBuilder.header("Content-Length", content.length);
}
private byte[] getContent(@PathParam("revision") String revision, @PathParam("path") String path, RepositoryService repositoryService) throws IOException, RepositoryException {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
repositoryService.getCatCommand().setRevision(revision).retriveContent(outputStream, path);
return outputStream.toByteArray();
}
}

9
scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
View File

@@ -35,6 +35,7 @@ public class RepositoryResource {
private final Provider<BranchRootResource> branchRootResource;
private final Provider<ChangesetRootResource> changesetRootResource;
private final Provider<SourceRootResource> sourceRootResource;
private final Provider<ContentResource> contentResource;
private final Provider<PermissionRootResource> permissionRootResource;
@Inject
@@ -44,7 +45,7 @@ public class RepositoryResource {
Provider<TagRootResource> tagRootResource,
Provider<BranchRootResource> branchRootResource,
Provider<ChangesetRootResource> changesetRootResource,
Provider<SourceRootResource> sourceRootResource, Provider<PermissionRootResource> permissionRootResource) {
Provider<SourceRootResource> sourceRootResource, Provider<ContentResource> contentResource, Provider<PermissionRootResource> permissionRootResource) {
this.dtoToRepositoryMapper = dtoToRepositoryMapper;
this.manager = manager;
this.repositoryToDtoMapper = repositoryToDtoMapper;
@@ -53,6 +54,7 @@ public class RepositoryResource {
this.branchRootResource = branchRootResource;
this.changesetRootResource = changesetRootResource;
this.sourceRootResource = sourceRootResource;
this.contentResource = contentResource;
this.permissionRootResource = permissionRootResource;
}
@@ -151,6 +153,11 @@ public class RepositoryResource {
return sourceRootResource.get();
}
@Path("content/")
public ContentResource content() {
return contentResource.get();
}
@Path("permissions/")
public PermissionRootResource permissions() {
return permissionRootResource.get();

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
View File

@@ -45,7 +45,7 @@ public class BranchRootResourceTest {
public void prepareEnvironment() throws Exception {
BranchCollectionToDtoMapper branchCollectionToDtoMapper = new BranchCollectionToDtoMapper(branchToDtoMapper, resourceLinks);
BranchRootResource branchRootResource = new BranchRootResource(serviceFactory, branchToDtoMapper, branchCollectionToDtoMapper);
RepositoryRootResource repositoryRootResource = new RepositoryRootResource(MockProvider.of(new RepositoryResource(null, null, null, null, MockProvider.of(branchRootResource), null, null, null)), null);
RepositoryRootResource repositoryRootResource = new RepositoryRootResource(MockProvider.of(new RepositoryResource(null, null, null, null, MockProvider.of(branchRootResource), null, null, null, null)), null);
dispatcher.getRegistry().addSingletonResource(repositoryRootResource);
when(serviceFactory.create(new NamespaceAndName("space", "repo"))).thenReturn(service);

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
View File

@@ -74,7 +74,7 @@ public class RepositoryRootResourceTest {
@Before
public void prepareEnvironment() {
initMocks(this);
RepositoryResource repositoryResource = new RepositoryResource(repositoryToDtoMapper, dtoToRepositoryMapper, repositoryManager, null, null, null, null, null);
RepositoryResource repositoryResource = new RepositoryResource(repositoryToDtoMapper, dtoToRepositoryMapper, repositoryManager, null, null, null, null, null, null);
RepositoryCollectionToDtoMapper repositoryCollectionToDtoMapper = new RepositoryCollectionToDtoMapper(repositoryToDtoMapper, resourceLinks);
RepositoryCollectionResource repositoryCollectionResource = new RepositoryCollectionResource(repositoryManager, repositoryCollectionToDtoMapper, dtoToRepositoryMapper, resourceLinks);
RepositoryRootResource repositoryRootResource = new RepositoryRootResource(MockProvider.of(repositoryResource), MockProvider.of(repositoryCollectionResource));