Skip to content

network export copy content-length when available to restore downloads progressbar estimates #741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 5, 2025
Merged

network export copy content-length when available to restore downloads progressbar estimates #741

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
759c0ba
network export copy content-length when available to restore download…
jonenst Apr 30, 2025
dfe1538
Merge branch 'main' into contentlengthexport
jonenst May 5, 2025
575b516
Merge branch 'main' into contentlengthexport
jonenst May 5, 2025
caf2529
Merge branch 'main' into contentlengthexport
jonenst May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/org/gridsuite/study/server/service/NetworkConversionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,12 @@ public void exportNetwork(UUID networkUuid, String variantId, String format, Str
},
networkConversionServerResponse -> {
String fileNameFromResponse = networkConversionServerResponse.getHeaders().getContentDisposition().getFilename();
long contentLength = networkConversionServerResponse.getHeaders().getContentLength();
exportNetworkResponse.setHeader(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.builder("attachment").filename(fileNameFromResponse, StandardCharsets.UTF_8).build().toString());
exportNetworkResponse.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM.toString());
if (contentLength != -1) {
exportNetworkResponse.setContentLengthLong(contentLength);
}
exportNetworkResponse.setStatus(HttpStatus.OK.value());
StreamUtils.copy(networkConversionServerResponse.getBody(), outputStream);
return null;
Expand Down