home/ruby-sdk
2
0
Fork 0
mirror of https://github.com/wahyd4/ruby-sdk.git synced 2026-08-09 12:56:21 +10:00
Code Issues Packages Projects Releases Wiki Activity

refactor UP.upload_with_token

Browse Source
This commit is contained in:
zhouguangming
2012-12-08 22:15:01 +08:00
parent 8aca8bf33e
commit f1edde2e54
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/qiniu/rs/up.rb
+1 -6
View File
@@ -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?