s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use ContentDisposition instead of ContentType to control download (#2722)

Browse Source 
* Use ContentDisposition instead of ContentType to control download

Fixes #1197. Previously we were using a funky ContentType to attempt
to force a file download rather than display in browser, but this
conflicted with attempts to save UTF-8 which was outside the Basic
Multilingual Plane (BMP).

By switching to ContentDisposition: attachment, which has been
the preferred method for a number of years, we can avoid this conflict.

As part of this, switch to using the "preview" param consistently
to control preview vs download rather than the content type.

* Switch content type to text/plain

Now that we don't need to use ContentType to control download
behavior, we can use something more reasonable.
This commit is contained in:
Tom Morris 2020-06-16 09:46:07 -04:00 committed by GitHub
parent 66c409aec6
commit 5f368bc56d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/com/google/refine/commands/project/ExportRowsCommand.java
View File

@ -100,6 +100,13 @@ public class ExportRowsCommand extends Command {
contentType = exporter.getContentType(); contentType = exporter.getContentType();
} }
response.setHeader("Content-Type", contentType); response.setHeader("Content-Type", contentType);
String preview = params.getProperty("preview");
if (!"true".equals(preview)) {
String path = request.getPathInfo();
String filename = path.substring(path.lastIndexOf('/') + 1);
response.setHeader("Content-Disposition", "attachment; filename=" + filename);
}
if (exporter instanceof WriterExporter) { if (exporter instanceof WriterExporter) {
String encoding = params.getProperty("encoding"); String encoding = params.getProperty("encoding");

2
main/src/com/google/refine/exporters/TemplatingExporter.java
View File

@ -57,7 +57,7 @@ public class TemplatingExporter implements WriterExporter {
@Override @Override
public String getContentType() { public String getContentType() {
return "application/x-unknown"; return "text/plain";
} }
protected static class TemplateConfig { protected static class TemplateConfig {

12
main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.js
View File

@ -314,13 +314,11 @@ CustomTabularExporterDialog.prototype._postExport = function(preview) {
.attr("value", encoding) .attr("value", encoding)
.appendTo(form); .appendTo(form);
} }
if (!preview) { $('<input />')
$('<input />') .attr("name", "preview")
.attr("name", "contentType") .attr("value", preview)
.attr("value", "application/x-unknown") // force download .appendTo(form);
.appendTo(form);
}
document.body.appendChild(form); document.body.appendChild(form);
window.open(" ", "refine-export"); window.open(" ", "refine-export");

13
main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.js
View File

@ -357,14 +357,11 @@ function SqlExporterDialog(options) {
.attr("value", encoding) .attr("value", encoding)
.appendTo(form); .appendTo(form);
} }
if (!preview) { $('<input />')
$('<input />') .attr("name", "preview")
.attr("name", "contentType") .attr("value", preview)
.attr("value", "application/x-unknown") // force download .appendTo(form);
.appendTo(form);
}
// alert("form::" + form);
document.body.appendChild(form); document.body.appendChild(form);
window.open(" ", "refine-export"); window.open(" ", "refine-export");

4
main/webapp/modules/core/scripts/project/exporters.js
View File

@ -111,10 +111,6 @@ ExporterManager.stripNonFileChars = function(name) {
ExporterManager.handlers.exportRows = function(format, ext) { ExporterManager.handlers.exportRows = function(format, ext) {
var form = ExporterManager.prepareExportRowsForm(format, true, ext); var form = ExporterManager.prepareExportRowsForm(format, true, ext);
$('<input />')
.attr("name", "contentType")
.attr("value", "application/x-unknown") // force download
.appendTo(form);
document.body.appendChild(form); document.body.appendChild(form);