Merge pull request #16 from longbai/mimeType

longbai · longbai · commit b3b4443dda84 · 2014-12-09T12:44:19.000+08:00
fixed mkfile mimetype invalid
diff --git a/QiniuSDK/Storage/QNResumeUpload.m b/QiniuSDK/Storage/QNResumeUpload.m
@@ -290,7 +290,7 @@ - (void)makeFile:(NSString *)uphost
 		mime = @"";
 	}
 	else {
-		mime = [[NSString alloc] initWithFormat:@"/mimetype/%@", [QNUrlSafeBase64 encodeString:self.option.mimeType]];
+		mime = [[NSString alloc] initWithFormat:@"/mimeType/%@", [QNUrlSafeBase64 encodeString:self.option.mimeType]];
 	}
 
 	__block NSString *url = [[NSString alloc] initWithFormat:@"http://%@/mkfile/%u%@", uphost, (unsigned int)self.size, mime];
diff --git a/QiniuSDK/Storage/QNUploadManager.m b/QiniuSDK/Storage/QNUploadManager.m
@@ -105,10 +105,10 @@ - (void)putData:(NSData *)data
 		[parameters addEntriesFromDictionary:option.params];
 	}
 
-	NSString *mimeType = option.mimeType;
+	NSString *mimeType = @"application/octet-stream";
 
-	if (!mimeType) {
-		mimeType = @"application/octet-stream";
+	if (option && option.mimeType) {
+		mimeType = option.mimeType;
 	}
 
 	if (option && option.checkCrc) {

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ - (void)makeFile:(NSString *)uphost`
`290`	`290`	`mime = @"";`
`291`	`291`	`}`
`292`	`292`	`else {`
`293`		`- mime = [[NSString alloc] initWithFormat:@"/mimetype/%@", [QNUrlSafeBase64 encodeString:self.option.mimeType]];`
	`293`	`+ mime = [[NSString alloc] initWithFormat:@"/mimeType/%@", [QNUrlSafeBase64 encodeString:self.option.mimeType]];`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`__block NSString *url = [[NSString alloc] initWithFormat:@"http://%@/mkfile/%u%@", uphost, (unsigned int)self.size, mime];`
Original file line number	Diff line number	Diff line change
`@@ -105,10 +105,10 @@ - (void)putData:(NSData *)data`
`105`	`105`	`[parameters addEntriesFromDictionary:option.params];`
`106`	`106`	`}`
`107`	`107`
`108`		`- NSString *mimeType = option.mimeType;`
	`108`	`+ NSString *mimeType = @"application/octet-stream";`
`109`	`109`
`110`		`- if (!mimeType) {`
`111`		`- mimeType = @"application/octet-stream";`
	`110`	`+ if (option && option.mimeType) {`
	`111`	`+ mimeType = option.mimeType;`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`if (option && option.checkCrc) {`