class CollectionsController < ApplicationController
+ include ActionController::Live
+
skip_around_filter(:require_thread_api_token,
only: [:show_file, :show_file_links])
skip_before_filter(:find_object_by_uuid,
elsif params[:file].nil? or not coll.manifest.has_file?(params[:file])
return render_not_found
end
+
opts = params.merge(arvados_api_token: usable_token)
+
+ # Handle Range requests. Currently we support only 'bytes=0-....'
+ if request.headers.include? 'HTTP_RANGE'
+ if m = /^bytes=0-(\d+)/.match(request.headers['HTTP_RANGE'])
+ opts[:maxbytes] = m[1]
+ size = params[:size] || '*'
+ self.response.status = 206
+ self.response.headers['Content-Range'] = "bytes 0-#{m[1]}/#{size}"
+ end
+ end
+
ext = File.extname(params[:file])
self.response.headers['Content-Type'] =
Rack::Mime::MIME_TYPES[ext] || 'application/octet-stream'
- self.response.headers['Content-Length'] = params[:size] if params[:size]
+ if params[:size]
+ size = params[:size].to_i
+ if opts[:maxbytes]
+ size = [size, opts[:maxbytes].to_i].min
+ end
+ self.response.headers['Content-Length'] = size.to_s
+ end
self.response.headers['Content-Disposition'] = params[:disposition] if params[:disposition]
- self.response_body = file_enumerator opts
+ begin
+ file_enumerator(opts).each do |bytes|
+ response.stream.write bytes
+ end
+ ensure
+ response.stream.close
+ end
end
def sharing_scopes
env['ARVADOS_API_TOKEN'] = @opts[:arvados_api_token]
env['ARVADOS_API_HOST_INSECURE'] = "true" if Rails.configuration.arvados_insecure_https
- bytesleft = @opts[:size].andand.to_i || 2**16
- IO.popen([env, 'arv-get', "#{@opts[:uuid]}/#{@opts[:file]}"],
- 'rb') do |io|
- while bytesleft > 0 && buf = io.read(bytesleft)
- # shrink the bytesleft count, if we were given a
- # maximum byte count to read
- if @opts.include? :size
- bytesleft = bytesleft - buf.length
- end
- yield buf
- end
- if buf and @opts.include? :size and bytesleft == 0 then
- unless buf[-1] == "\n"
- yield "\n"
- end
- # This line should match the regex in
- # app/assets/javascripts/log_viewer.js:addToLogViewer()
- yield Time.now.strftime("%F_%T zzzzz-zzzzz-zzzzzzzzzzzzzzz 0 File truncated (exceeded #{@opts[:size]} bytes). To retrieve the full file: arv-get #{@opts[:uuid]}/#{@opts[:file]}\n")
+ bytesleft = @opts[:maxbytes].andand.to_i || 2**16
+ io = IO.popen([env, 'arv-get', "#{@opts[:uuid]}/#{@opts[:file]}"], 'rb')
+ while bytesleft > 0 && (buf = io.read([bytesleft, 2**16].min)) != nil
+ # shrink the bytesleft count, if we were given a maximum byte
+ # count to read
+ if @opts.include? :maxbytes
+ bytesleft = bytesleft - buf.length
end
+ yield buf
end
+ io.close
+ # "If ios is opened by IO.popen, close sets $?."
+ # http://www.ruby-doc.org/core-2.1.3/IO.html#method-i-close
Rails.logger.warn("#{@opts[:uuid]}/#{@opts[:file]}: #{$?}") if $? != 0
end
end