Skip to content

Extracted upload tagParams and upload url functionality into their funct... #7

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
TalLevAmi merged 2 commits into from
Aug 4, 2013
Merged

Extracted upload tagParams and upload url functionality into their funct... #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7376644
Extracted upload tagParams and upload url functionality into their fu…
jbcpollak Aug 1, 2013
7b0f8c5
Updated so we don't escapeHTML unless necessary for the server side. …
jbcpollak Aug 2, 2013
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
59 changes: 36 additions & 23 deletions cloudinary-core/src/main/java/com/cloudinary/Uploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,35 +273,48 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
return result;
}

public String prepareUploadTagParams(Map options) {
if (options == null) options = new HashMap();
if (options.get("resource_type") == null) {
options = new HashMap(options);
options.put("resource_type", "auto");
}

String callback = Cloudinary.asString(options.get("callback"), this.cloudinary.getStringConfig("callback"));
if (callback == null) {
throw new IllegalArgumentException("Must supply callback");
}
options.put("callback", callback);

Map<String, Object> params = this.buildUploadParams(options);
signRequestParams(params, options);

// Remove blank parameters
for (Iterator<Object> iterator = params.values().iterator(); iterator.hasNext(); ) {
String value = (String) iterator.next();
if (StringUtils.isBlank(value)) {
iterator.remove();
}
}

return JSONObject.toJSONString(params);
}

public String getUploadUrl(Map options) {
if (options == null) options = new HashMap();
return this.cloudinary.cloudinaryApiUrl("upload", options);
}

public String imageUploadTag(String field, Map options, Map<String, Object> htmlOptions) {
if (htmlOptions == null) htmlOptions = Cloudinary.emptyMap();
if (options == null) options = new HashMap();
if (options.get("resource_type") == null) {
options = new HashMap(options);
options.put("resource_type", "auto");
}
String cloudinaryUploadUrl = this.cloudinary.cloudinaryApiUrl("upload", options);

String callback = Cloudinary.asString(options.get("callback"), this.cloudinary.getStringConfig("callback"));
if (callback == null) {
throw new IllegalArgumentException("Must supply callback");
}
options.put("callback", callback);

Map<String, Object> params = this.buildUploadParams(options);
signRequestParams(params, options);

// Remove blank parameters
for (Iterator<Object> iterator = params.values().iterator(); iterator.hasNext(); ) {
String value = (String) iterator.next();
if (StringUtils.isBlank(value)) {
iterator.remove();
}
}
String tagParams = StringEscapeUtils.escapeHtml(prepareUploadTagParams(options));

String cloudinaryUploadUrl = getUploadUrl(options);

StringBuilder builder = new StringBuilder();
builder.append("<input type='file' name='file' data-url='").append(cloudinaryUploadUrl).
append("' data-form-data='").append(StringEscapeUtils.escapeHtml(JSONObject.toJSONString(params))).
append("' data-form-data='").append(tagParams).
append("' data-cloudinary-field='").append(field).
append("' class='cloudinary-fileupload");
if (htmlOptions.containsKey("class")) {
Expand Down