X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/07c31b9a40457a0ef0f9aa5dd9fb63e405215ec3..62790d76daf181a457d8f47741721967cd9cb7d9:/apps/workbench/app/controllers/collections_controller.rb

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 5a7a52207b..3c248757ec 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -1,10 +1,13 @@
 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,
                      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
 
@@ -43,32 +46,42 @@ class CollectionsController < ApplicationController
   end
 
   def choose
-    params[:limit] ||= 40
+    # 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.
 
-    filter = [['link_class','=','name'],
-              ['head_uuid','is_a','arvados#collection']]
+    params[:limit] ||= 40
 
-    if params[:project_uuid] and !params[:project_uuid].empty?
-      filter << ['tail_uuid', '=', params[:project_uuid]]
-    end
+    find_objects_for_index
+    @collections = @objects
 
-    @objects = Link.filter(filter)
+    @filters += [['link_class','=','name'],
+                 ['head_uuid','is_a','arvados#collection']]
 
+    @objects = Link
     find_objects_for_index
-    @next_page_href = (next_page_offset and
-                       url_for(offset: next_page_offset, partial: true))
+
     @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]
@@ -83,7 +96,7 @@ class CollectionsController < ApplicationController
         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))
@@ -134,16 +147,40 @@ class CollectionsController < ApplicationController
     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
@@ -165,12 +202,20 @@ class CollectionsController < ApplicationController
         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
@@ -258,14 +303,6 @@ class CollectionsController < ApplicationController
     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
@@ -286,9 +323,15 @@ class CollectionsController < ApplicationController
       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