Qortal/qortal
1
0
Fork 0
mirror of https://github.com/Qortal/qortal.git synced 2025-07-20 19:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

added comments

Browse Source
This commit is contained in:
PhilReact 2025-05-24 22:29:33 +03:00
parent 9e4925c8dd
commit 140d86e209
1 changed files with 79 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/main/java/org/qortal/api/resource/ArbitraryResource.java
View File

@ -896,7 +896,7 @@ public class ArbitraryResource {
@GET @GET
@Path("/check-tmp-space") @Path("/check/tmp")
@Produces(MediaType.TEXT_PLAIN) @Produces(MediaType.TEXT_PLAIN)
@Operation( @Operation(
summary = "Check if the disk has enough disk space for an upcoming upload", summary = "Check if the disk has enough disk space for an upcoming upload",
@ -921,7 +921,7 @@ public class ArbitraryResource {
} }
long usableSpace = uploadDir.getUsableSpace(); long usableSpace = uploadDir.getUsableSpace();
long requiredSpace = totalSize * 2; // estimate for chunks + merge long requiredSpace = (long)(((double)totalSize) * 2.2); // estimate for chunks + merge
if (usableSpace < requiredSpace) { if (usableSpace < requiredSpace) {
return Response.status(507).entity("Insufficient disk space").build(); return Response.status(507).entity("Insufficient disk space").build();
@ -1981,61 +1981,79 @@ public String finalizeUpload(
// 3. Set Content-Disposition header // 3. Set Content-Disposition header
response.setHeader("Content-Disposition", "attachment; filename=\"" + rawFilename + "\""); response.setHeader("Content-Disposition", "attachment; filename=\"" + rawFilename + "\"");
} }
long fileSize = Files.size(path); // Determine the total size of the requested file
String mimeType = context.getMimeType(path.toString()); long fileSize = Files.size(path);
String range = request.getHeader("Range"); String mimeType = context.getMimeType(path.toString());
long rangeStart = 0; // Attempt to read the "Range" header from the request to support partial content delivery (e.g., for video streaming or resumable downloads)
long rangeEnd = fileSize - 1; String range = request.getHeader("Range");
boolean isPartial = false;
if (range != null && encoding == null) { long rangeStart = 0;
range = range.replace("bytes=", ""); long rangeEnd = fileSize - 1;
String[] parts = range.split("-"); boolean isPartial = false;
if (parts.length > 0 && !parts[0].isEmpty()) {
rangeStart = Long.parseLong(parts[0]); // If a Range header is present and no base64 encoding is requested, parse the range values
if (range != null && encoding == null) {
range = range.replace("bytes=", ""); // Remove the "bytes=" prefix
String[] parts = range.split("-"); // Split the range into start and end
// Parse range start
if (parts.length > 0 && !parts[0].isEmpty()) {
rangeStart = Long.parseLong(parts[0]);
}
// Parse range end, if present
if (parts.length > 1 && !parts[1].isEmpty()) {
rangeEnd = Long.parseLong(parts[1]);
}
isPartial = true; // Indicate that this is a partial content request
} }
if (parts.length > 1 && !parts[1].isEmpty()) {
rangeEnd = Long.parseLong(parts[1]);
}
isPartial = true;
}
long contentLength = rangeEnd - rangeStart + 1; // Calculate how many bytes should be sent in the response
long contentLength = rangeEnd - rangeStart + 1;
// Set headers // Inform the client that byte ranges are supported
response.setHeader("Accept-Ranges", "bytes"); response.setHeader("Accept-Ranges", "bytes");
if (isPartial) { if (isPartial) {
response.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT); // If partial content was requested, return 206 Partial Content with appropriate headers
response.setHeader("Content-Range", String.format("bytes %d-%d/%d", rangeStart, rangeEnd, fileSize)); response.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT);
} else { response.setHeader("Content-Range", String.format("bytes %d-%d/%d", rangeStart, rangeEnd, fileSize));
response.setStatus(HttpServletResponse.SC_OK);
}
OutputStream rawOut = response.getOutputStream();
OutputStream base64Out = null;
OutputStream gzipOut = null;
if (encoding != null && "base64".equalsIgnoreCase(encoding)) {
response.setContentType("text/plain");
String acceptEncoding = request.getHeader("Accept-Encoding");
boolean wantsGzip = acceptEncoding != null && acceptEncoding.contains("gzip");
if (wantsGzip) {
response.setHeader("Content-Encoding", "gzip");
gzipOut = new GZIPOutputStream(rawOut);
base64Out = java.util.Base64.getEncoder().wrap(gzipOut);
} else { } else {
base64Out = java.util.Base64.getEncoder().wrap(rawOut); // Otherwise, return the entire file with status 200 OK
response.setStatus(HttpServletResponse.SC_OK);
} }
rawOut = base64Out; // Initialize output streams for writing the file to the response
} else { OutputStream rawOut = response.getOutputStream();
response.setContentType(mimeType != null ? mimeType : "application/octet-stream"); OutputStream base64Out = null;
response.setContentLength((int) contentLength); OutputStream gzipOut = null;
}
if (encoding != null && "base64".equalsIgnoreCase(encoding)) {
// If base64 encoding is requested, override content type
response.setContentType("text/plain");
// Check if the client accepts gzip encoding
String acceptEncoding = request.getHeader("Accept-Encoding");
boolean wantsGzip = acceptEncoding != null && acceptEncoding.contains("gzip");
if (wantsGzip) {
// Wrap output in GZIP and Base64 streams if gzip is accepted
response.setHeader("Content-Encoding", "gzip");
gzipOut = new GZIPOutputStream(rawOut);
base64Out = java.util.Base64.getEncoder().wrap(gzipOut);
} else {
// Wrap output in Base64 only
base64Out = java.util.Base64.getEncoder().wrap(rawOut);
}
rawOut = base64Out; // Use the wrapped stream for writing
} else {
// For raw binary output, set the content type and length
response.setContentType(mimeType != null ? mimeType : "application/octet-stream");
response.setContentLength((int) contentLength);
}
// Stream file content // Stream file content
try (InputStream inputStream = Files.newInputStream(path)) { try (InputStream inputStream = Files.newInputStream(path)) {
if (rangeStart > 0) { if (rangeStart > 0) {
@ -2064,10 +2082,14 @@ if (!response.isCommitted()) {
response.getWriter().write(" "); response.getWriter().write(" ");
} }
} catch (IOException | InterruptedException | NumberFormatException | ApiException | DataException e) { } catch (IOException | InterruptedException | ApiException | DataException e) {
LOGGER.debug(String.format("Unable to load %s %s: %s", service, name, e.getMessage())); LOGGER.error(String.format("Unable to load %s %s: %s", service, name, e.getMessage()), e);
throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.FILE_NOT_FOUND, e.getMessage()); throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.FILE_NOT_FOUND, e.getMessage());
} }
catch ( NumberFormatException e) {
LOGGER.error(String.format("Unable to load %s %s: %s", service, name, e.getMessage()), e);
throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.INVALID_DATA, e.getMessage());
}
} }