Skip to content

添加mimeType支持.设置extra的mimeType时使用次值,不设置按以前方式处理 #95

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
xushiwei merged 3 commits into from
Jan 13, 2014
Merged

添加mimeType支持.设置extra的mimeType时使用次值,不设置按以前方式处理 #95

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8a2c73
添加mimeType支持.设置extra的mimeType时使用次值,不设置按以前方式处理
sxci Jan 13, 2014
400404a
当不设置key时,使用etag为其key值
sxci Jan 13, 2014
4ce7d57
key 可以为空字符串
sxci Jan 13, 2014
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
46 changes: 32 additions & 14 deletions src/main/java/com/qiniu/api/io/IoApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
package com.qiniu.api.io;

import java.io.File;
import java.io.InputStream;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.util.zip.CRC32;
import java.util.zip.CheckedInputStream;

import org.apache.http.entity.mime.MultipartEntity;
import org.apache.http.entity.mime.content.AbstractContentBody;
import org.apache.http.entity.mime.content.FileBody;
import org.apache.http.entity.mime.content.InputStreamBody;
import org.apache.http.entity.mime.content.StringBody;

import com.qiniu.api.config.Config;
import com.qiniu.api.net.CallRet;
import com.qiniu.api.net.Client;

import java.nio.charset.Charset;

public class IoApi {

public static final String UNDEFINED_KEY = "?";
public static final String UNDEFINED_KEY = null;
public static final int NO_CRC32 = 0;
public static final int AUTO_CRC32 = 1;
public static final int WITH_CRC32 = 2;
Expand All @@ -30,15 +32,12 @@ private static PutRet put(String uptoken, String key, File file,
return new PutRet(new CallRet(400, new Exception(
"File does not exist or not readable.")));
}
if (key == null) {
key = UNDEFINED_KEY;
}
MultipartEntity requestEntity = new MultipartEntity();
try {
requestEntity.addPart("token", new StringBody(uptoken));
FileBody fileBody = new FileBody(file);
AbstractContentBody fileBody = buildFileBody(file, extra);
requestEntity.addPart("file", fileBody);
requestEntity.addPart("key", new StringBody(key,Charset.forName("utf-8")));
setKey(requestEntity, key);
if (extra.checkCrc != NO_CRC32) {
if (extra.crc32 == 0) {
return new PutRet(new CallRet(400, new Exception("no crc32 specified!")));
Expand All @@ -55,13 +54,27 @@ private static PutRet put(String uptoken, String key, File file,
return new PutRet(ret);
}

private static FileBody buildFileBody(File file,PutExtra extra){
if(extra.mimeType != null){
return new FileBody(file, extra.mimeType);
}else{
return new FileBody(file);
}
}

private static void setKey(MultipartEntity requestEntity, String key) throws UnsupportedEncodingException{
if(key != null){
requestEntity.addPart("key", new StringBody(key,Charset.forName("utf-8")));
}
}

private static PutRet putStream(String uptoken, String key, InputStream reader,PutExtra extra) {
MultipartEntity requestEntity = new MultipartEntity();
try {
requestEntity.addPart("token", new StringBody(uptoken));
InputStreamBody inputBody= new InputStreamBody(reader,key);
AbstractContentBody inputBody = buildInputStreamBody(reader, extra, key);
requestEntity.addPart("file", inputBody);
requestEntity.addPart("key", new StringBody(key,Charset.forName("utf-8")));
setKey(requestEntity, key);
if (extra.checkCrc != NO_CRC32) {
if (extra.crc32 == 0) {
return new PutRet(new CallRet(400, new Exception("no crc32 specified!")));
Expand All @@ -78,12 +91,17 @@ private static PutRet putStream(String uptoken, String key, InputStream reader,P
return new PutRet(ret);
}

private static InputStreamBody buildInputStreamBody(InputStream reader,PutExtra extra, String key){
if(extra.mimeType != null){
Copy link
Contributor

@xushiwei xushiwei Jan 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

代码不要揉成一团

return new InputStreamBody(reader, extra.mimeType, key);
}else{
return new InputStreamBody(reader, key);
}
}


public static PutRet Put(String uptoken,String key,InputStream reader,PutExtra extra)
{
if (key == null) {
key = UNDEFINED_KEY;
}
PutRet ret = putStream(uptoken,key,reader,extra);
return ret;
}
Expand Down