mindol1004/excel-download
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#28 bulk upload - return video url

Browse Source
This commit is contained in:
haerong22
2022-12-29 16:18:33 +09:00
parent d5d9b05102
commit 5d65e7965d
8 changed files with 92 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bulkupload/build.gradle
View File

@@ -5,7 +5,7 @@ plugins {
}
group = 'com.example'
version = '0.0.1-SNAPSHOT'
version = '1.0'
sourceCompatibility = '11'
configurations {

2
bulkupload/src/main/java/com/example/bulkupload/config/TusConfig.java
View File

@@ -29,7 +29,7 @@ public class TusConfig {
.withStoragePath(tusStoragePath)
.withDownloadFeature()
.withUploadExpirationPeriod(tusExpirationPeriod)
.withUploadURI("/api/tus/file/upload");
.withUploadURI("/api/upload");
}
}

1
bulkupload/src/main/java/com/example/bulkupload/config/WebConfig.java
View File

@@ -2,6 +2,7 @@ package com.example.bulkupload.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration

66
bulkupload/src/main/java/com/example/bulkupload/controller/TusUploadController.java
View File

@@ -3,39 +3,75 @@ package com.example.bulkupload.controller;
import com.example.bulkupload.service.FileUploadService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.ResourceRegion;
import org.springframework.http.*;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
@Slf4j
@RestController
@RequiredArgsConstructor
@RequestMapping("/api")
public class TusUploadController {
private final FileUploadService fileUploadService;
@CrossOrigin(origins = "*")
@RequestMapping(value = {"/api/tus/file/upload", "/api/tus/file/upload/**"})
public ResponseEntity uploadWithTus(HttpServletRequest request, HttpServletResponse response) {
// Process a tus upload request
fileUploadService.process(request, response);
@Value("${video.path}")
private String savedPath;
// Generate HTTP Response Headers
return httpOkStatus();
@CrossOrigin(origins = "*")
@RequestMapping(value = {"/upload", "/upload/**"})
public ResponseEntity<String> uploadWithTus2(HttpServletRequest request, HttpServletResponse response) {
String filename = fileUploadService.process(request, response);
return httpOkStatus(filename);
}
private static ResponseEntity<Object> httpOkStatus() {
private static ResponseEntity<String> httpOkStatus(String filename) {
HttpHeaders headers = new HttpHeaders();
headers.set(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "*");
return ResponseEntity.status(HttpStatus.OK)
.headers(headers)
.build();
.body(filename);
}
@GetMapping("/video/{date}/{url}")
public ResponseEntity<ResourceRegion> videoResource(@RequestHeader HttpHeaders headers,
@PathVariable String date,
@PathVariable String url) throws IOException {
String path = savedPath + "/" + date + "/" + url;
Resource resource = new FileSystemResource(path);
long chunkSize = 1024 * 1024;
long contentLength = resource.contentLength();
ResourceRegion region;
try {
HttpRange httpRange = headers.getRange().stream().findFirst().get();
long start = httpRange.getRangeStart(contentLength);
long end = httpRange.getRangeEnd(contentLength);
long rangeLength = Long.min(chunkSize, end -start + 1);
region = new ResourceRegion(resource, start, rangeLength);
} catch (Exception e) {
long rangeLength = Long.min(chunkSize, contentLength);
region = new ResourceRegion(resource, 0, rangeLength);
}
return ResponseEntity.status(HttpStatus.PARTIAL_CONTENT)
.cacheControl(CacheControl.maxAge(10, TimeUnit.MINUTES))
.contentType(MediaTypeFactory.getMediaType(resource).orElse(MediaType.APPLICATION_OCTET_STREAM))
.header("Accept-Ranges", "bytes")
.eTag(path)
.body(region);
}
}

31
bulkupload/src/main/java/com/example/bulkupload/service/FileUploadService.java
View File

@@ -6,6 +6,7 @@ import me.desair.tus.server.TusFileUploadService;
import me.desair.tus.server.exception.TusException;
import me.desair.tus.server.upload.UploadInfo;
import org.apache.commons.io.FileUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
@@ -13,6 +14,8 @@ import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.time.LocalDate;
import java.util.UUID;
@Slf4j
@Service
@@ -21,21 +24,24 @@ public class FileUploadService {
private final TusFileUploadService tusFileUploadService;
public void process(HttpServletRequest request, HttpServletResponse response) {
@Value("${video.path}")
private String savedPath;
public String process(HttpServletRequest request, HttpServletResponse response) {
try {
// Process a tus upload request
tusFileUploadService.process(request, response);
// Get upload information
UploadInfo uploadInfo = tusFileUploadService.getUploadInfo(request.getRequestURI());
if (uploadInfo != null && !uploadInfo.isUploadInProgress()) {
// Progress status is successful: Create file
createFile(tusFileUploadService.getUploadedBytes(request.getRequestURI()), uploadInfo.getFileName());
String filename = createFile(tusFileUploadService.getUploadedBytes(request.getRequestURI()), uploadInfo.getFileName());
// Delete an upload associated with the given upload url
tusFileUploadService.deleteUpload(request.getRequestURI());
return filename;
}
return null;
} catch (IOException | TusException e) {
log.error("exception was occurred. message={}", e.getMessage(), e);
@@ -43,9 +49,18 @@ public class FileUploadService {
}
}
private void createFile(InputStream is, String filename) throws IOException {
File file = new File("dest/", filename);
private String createFile(InputStream is, String filename) throws IOException {
String uuid = UUID.randomUUID().toString().replaceAll("-", "").substring(0, 12);
String[] split = filename.split("\\.");
String savedFilename = uuid + "." + split[split.length - 1];
LocalDate today = LocalDate.now();
File file = new File(savedPath + "/" + today, savedFilename);
FileUtils.copyInputStreamToFile(is, file);
return today + "/" + savedFilename;
}
}

8
bulkupload/src/main/resources/application-dev.yml Normal file
View File

@@ -0,0 +1,8 @@
tus:
server:
data:
directory: "/data/tus"
expiration: 86400000
video:
path: /data/video

6
bulkupload/src/main/resources/application.yml
View File

@@ -1,9 +1,15 @@
server:
port: 18081
tus:
server:
data:
directory: "/Users/bobby/Downloads/tus"
expiration: 86400000
video:
path: "/Users/bobby/Downloads/tus/video"
spring:
servlet:
multipart:

3
bulkupload/src/main/resources/templates/index.html
View File

@@ -93,8 +93,7 @@
`
let upload = new tus.Upload(file, {
// endpoint : 'https://tusd.tusdemo.net/files/',
endpoint: "http://169.254.130.102:8080/api/tus/file/upload",
endpoint: "/api/upload",
chunkSize,
retryDelays: [0, 1000, 3000, 5000],
metadata: {