Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 8 additions & 9 deletions src/main/java/io/ipfs/api/Multipart.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,10 @@ public static String createBoundary() {
}

public void addFormField(String name, String value) {
writer.append("--" + boundary).append(LINE_FEED);
writer.append("Content-Disposition: form-data; name=\"" + name + "\"")
writer.append("--").append(boundary).append(LINE_FEED);
writer.append("Content-Disposition: form-data; name=\"").append(name).append("\"")
.append(LINE_FEED);
writer.append("Content-Type: text/plain; charset=" + charset).append(
LINE_FEED);
writer.append("Content-Type: text/plain; charset=").append(charset).append(LINE_FEED);
writer.append(LINE_FEED);
writer.append(value).append(LINE_FEED);
writer.flush();
Expand All @@ -65,8 +64,8 @@ public void addSubtree(Path parentPath, NamedStreamable dir) throws IOException
}

public void addDirectoryPart(Path path) {
writer.append("--" + boundary).append(LINE_FEED);
writer.append("Content-Disposition: file; filename=\"" + encode(path.toString()) + "\"").append(LINE_FEED);
writer.append("--").append(boundary).append(LINE_FEED);
writer.append("Content-Disposition: file; filename=\"").append(encode(path.toString())).append("\"").append(LINE_FEED);
writer.append("Content-Type: application/x-directory").append(LINE_FEED);
writer.append("Content-Transfer-Encoding: binary").append(LINE_FEED);
writer.append(LINE_FEED);
Expand All @@ -84,11 +83,11 @@ private static String encode(String in) {

public void addFilePart(String fieldName, Path parent, NamedStreamable uploadFile) {
Optional<String> fileName = uploadFile.getName().map(n -> encode(parent.resolve(n).toString()));
writer.append("--" + boundary).append(LINE_FEED);
writer.append("--").append(boundary).append(LINE_FEED);
if (!fileName.isPresent())
writer.append("Content-Disposition: file; name=\"" + fieldName + "\";").append(LINE_FEED);
writer.append("Content-Disposition: file; name=\"").append(fieldName).append("\";").append(LINE_FEED);
else
writer.append("Content-Disposition: file; filename=\"" + fileName.get() + "\";").append(LINE_FEED);
writer.append("Content-Disposition: file; filename=\"").append(fileName.get()).append("\";").append(LINE_FEED);
writer.append("Content-Type: application/octet-stream").append(LINE_FEED);
writer.append("Content-Transfer-Encoding: binary").append(LINE_FEED);
writer.append(LINE_FEED);
Expand Down