class CollectionsController < ApplicationController
- skip_around_filter(:thread_with_mandatory_api_token,
+ include ActionController::Live
+
+ skip_around_filter(:require_thread_api_token,
only: [:show_file, :show_file_links])
skip_before_filter(:find_object_by_uuid,
only: [:provenance, :show_file, :show_file_links])
# We depend on show_file to display the user agreement:
- skip_before_filter :check_user_agreements, only: [:show_file]
+ skip_before_filter :check_user_agreements, only: :show_file
+ skip_before_filter :check_user_profile, only: :show_file
RELATION_LIMIT = 5
end
def choose
- params[:limit] ||= 20
- @objects = Link.
- filter([['link_class','=','name'],
- ['head_uuid','is_a','arvados#collection']])
+ # Find collections using default find_objects logic, then search for name
+ # links, and preload any other links connected to the collections that are
+ # found.
+ # Name links will be obsolete when issue #3036 is merged,
+ # at which point this entire custom #choose function can probably be
+ # eliminated.
+
+ params[:limit] ||= 40
+
find_objects_for_index
- @next_page_href = (next_page_offset and
- url_for(offset: next_page_offset, partial: true))
+ @collections = @objects
+
+ @filters += [['link_class','=','name'],
+ ['head_uuid','is_a','arvados#collection']]
+
+ @objects = Link
+ find_objects_for_index
+
@name_links = @objects
+
@objects = Collection.
filter([['uuid','in',@name_links.collect(&:head_uuid)]])
+
+ preload_links_for_objects (@collections.to_a + @objects.to_a)
super
end
def index
+ # API server index doesn't return manifest_text by default, but our
+ # callers want it unless otherwise specified.
+ @select ||= Collection.columns.map(&:name)
+ base_search = Collection.select(@select)
if params[:search].andand.length.andand > 0
tags = Link.where(any: ['contains', params[:search]])
- @collections = (Collection.where(uuid: tags.collect(&:head_uuid)) |
- Collection.where(any: ['contains', params[:search]])).
+ @collections = (base_search.where(uuid: tags.collect(&:head_uuid)) |
+ base_search.where(any: ['contains', params[:search]])).
uniq { |c| c.uuid }
else
if params[:limit]
offset = 0
end
- @collections = Collection.limit(limit).offset(offset)
+ @collections = base_search.limit(limit).offset(offset)
end
@links = Link.limit(1000).
where(head_uuid: @collections.collect(&:uuid))
def show_file_links
Thread.current[:reader_tokens] = [params[:reader_token]]
- find_object_by_uuid
+ return if false.equal?(find_object_by_uuid)
render layout: false
end
end
if usable_token.nil?
return # Response already rendered.
- elsif params[:file].nil? or not file_in_collection?(coll, params[:file])
+ 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
Job.limit(RELATION_LIMIT).where(conds)
.results.sort_by { |j| j.finished_at || j.created_at }
end
- @output_of = jobs_with.call(output: @object.uuid)
- @log_of = jobs_with.call(log: @object.uuid)
+ @output_of = jobs_with.call(output: @object.portable_data_hash)
+ @log_of = jobs_with.call(log: @object.portable_data_hash)
@project_links = Link.limit(RELATION_LIMIT).order("modified_at DESC")
.where(head_uuid: @object.uuid, link_class: 'name').results
project_hash = Group.where(uuid: @project_links.map(&:tail_uuid)).to_hash
@projects = project_hash.values
+
+ if @object.uuid.match /[0-9a-f]{32}/
+ @same_pdh = Collection.filter([["portable_data_hash", "=", @object.portable_data_hash]])
+ owners = @same_pdh.map {|s| s.owner_uuid}.to_a
+ preload_objects_for_dataclass Group, owners
+ preload_objects_for_dataclass User, owners
+ end
+
@permissions = Link.limit(RELATION_LIMIT).order("modified_at DESC")
.where(head_uuid: @object.uuid, link_class: 'permission',
name: 'can_read').results
.results.any?
@search_sharing = search_scopes
end
- @prov_svg = ProvenanceHelper::create_provenance_graph(@object.provenance, "provenance_svg",
- {:request => request,
- :direction => :bottom_up,
- :combine_jobs => :script_only}) rescue nil
- @used_by_svg = ProvenanceHelper::create_provenance_graph(@object.used_by, "used_by_svg",
- {:request => request,
- :direction => :top_down,
- :combine_jobs => :script_only,
- :pdata_only => true}) rescue nil
+ if params["tab_pane"] == "Provenance_graph"
+ @prov_svg = ProvenanceHelper::create_provenance_graph(@object.provenance, "provenance_svg",
+ {:request => request,
+ :direction => :bottom_up,
+ :combine_jobs => :script_only}) rescue nil
+ end
+ if params["tab_pane"] == "Used_by"
+ @used_by_svg = ProvenanceHelper::create_provenance_graph(@object.used_by, "used_by_svg",
+ {:request => request,
+ :direction => :top_down,
+ :combine_jobs => :script_only,
+ :pdata_only => true}) rescue nil
+ end
super
end
# error we encounter, and return nil.
most_specific_error = [401]
token_list.each do |api_token|
- using_specific_api_token(api_token) do
- begin
+ begin
+ using_specific_api_token(api_token) do
yield
return api_token
- rescue ArvadosApiClient::NotLoggedInException => error
- status = 401
- rescue => error
- status = (error.message =~ /\[API: (\d+)\]$/) ? $1.to_i : nil
- raise unless [401, 403, 404].include?(status)
end
- if status >= most_specific_error.first
- most_specific_error = [status, error]
+ rescue ArvadosApiClient::ApiError => error
+ if error.api_status >= most_specific_error.first
+ most_specific_error = [error.api_status, error]
end
end
end
return nil
end
- def file_in_collection?(collection, filename)
- target = CollectionsHelper.file_path(File.split(filename))
- collection.files.each do |file_spec|
- return true if (CollectionsHelper.file_path(file_spec) == target)
- end
- false
- end
-
def file_enumerator(opts)
FileStreamer.new opts
end
env['ARVADOS_API_TOKEN'] = @opts[:arvados_api_token]
env['ARVADOS_API_HOST_INSECURE'] = "true" if Rails.configuration.arvados_insecure_https
+ bytesleft = @opts[:maxbytes].andand.to_i || 2**16
IO.popen([env, 'arv-get', "#{@opts[:uuid]}/#{@opts[:file]}"],
'rb') do |io|
- while buf = io.read(2**16)
+ while bytesleft > 0 && (buf = io.read(bytesleft)) != 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
end