Merge branch 'master' into 4036-combine-collections-in-project-issue

[arvados.git] / 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 baa7661aac00bf2149a4a70478a7d9c70d4bad00..3c248757ece6813e91bc74e6772b51922af758d9 100644 (file)
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -1,4 +1,6 @@
 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,
@@ -150,12 +152,17 @@ class CollectionsController < ApplicationController
     end
 
     opts = params.merge(arvados_api_token: usable_token)
+
+    # Handle Range requests. Currently we support only 'bytes=0-....'
     if request.headers.include? 'HTTP_RANGE'
-      # Currently only 'bytes=0-....' is supported.
       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'
@@ -167,7 +174,13 @@ class CollectionsController < ApplicationController
       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
@@ -311,16 +324,13 @@ class CollectionsController < ApplicationController
       env['ARVADOS_API_HOST_INSECURE'] = "true" if Rails.configuration.arvados_insecure_https
 
       bytesleft = @opts[:maxbytes].andand.to_i || 2**16
-      Rails.logger.warn "@opts[:maxbytes] = #{@opts[:maxbytes]}, bytesleft = #{bytesleft}"
       IO.popen([env, 'arv-get', "#{@opts[:uuid]}/#{@opts[:file]}"],
                'rb') do |io|
-        bytecount = 0
-        while bytesleft > 0 && buf = io.read(bytesleft)
+        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
-            Rails.logger.warn "bytesleft now #{bytesleft}"
           end
           yield buf
         end