From f1edde2e5494ab5a40f4d03c54b0b699050186ee Mon Sep 17 00:00:00 2001 From: zhouguangming Date: Sat, 8 Dec 2012 22:15:01 +0800 Subject: [PATCH] refactor UP.upload_with_token --- lib/qiniu/rs/up.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/qiniu/rs/up.rb b/lib/qiniu/rs/up.rb index ea07541..98f8650 100755 --- a/lib/qiniu/rs/up.rb +++ b/lib/qiniu/rs/up.rb @@ -100,7 +100,6 @@ module Qiniu customer = nil, callback_params = nil, rotate = nil) - raise NoSuchFileError, local_file unless File.exist?(local_file) begin ifile = File.open(local_file, 'rb') fh = FileData.new(ifile) @@ -110,11 +109,7 @@ module Qiniu mime = MIME::Types.type_for local_file mime_type = mime.empty? ? 'application/octet-stream' : mime[0].content_type end - if fsize > Config.settings[:block_size] - code, data = _resumable_upload(uptoken, fh, fsize, bucket, key, mime_type, custom_meta, customer, callback_params, rotate) - else - code, data = IO.upload_with_token(uptoken, local_file, bucket, key, mime_type, custom_meta, callback_params, true, rotate) - end + code, data = _resumable_upload(uptoken, fh, fsize, bucket, key, mime_type, custom_meta, customer, callback_params, rotate) [code, data] ensure ifile.close unless ifile.nil?