X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4c7323ea090e7570f962d821fa24c3ab20308e1e..1966eff7c92733225cd9fe1a4121ae0b8f1153d3:/apps/workbench/app/controllers/actions_controller.rb diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb index 8a817f03cd..fd4ebc4cd4 100644 --- a/apps/workbench/app/controllers/actions_controller.rb +++ b/apps/workbench/app/controllers/actions_controller.rb @@ -1,12 +1,119 @@ class ActionsController < ApplicationController - skip_before_filter :find_object_by_uuid, only: :post + @@exposed_actions = {} + def self.expose_action method, &block + @@exposed_actions[method] = true + define_method method, block + end + + def model_class + ArvadosBase::resource_class_for_uuid(params[:uuid]) + end + + def show + @object = model_class.andand.find(params[:uuid]) + if @object.is_a? Link and + @object.link_class == 'name' and + ArvadosBase::resource_class_for_uuid(@object.head_uuid) == Collection + redirect_to collection_path(id: @object.uuid) + elsif @object + redirect_to @object + else + raise ActiveRecord::RecordNotFound + end + end + + def post + params.keys.collect(&:to_sym).each do |param| + if @@exposed_actions[param] + return self.send(param) + end + end + redirect_to :back + end + + expose_action :copy_selections_into_project do + move_or_copy :copy + end + + expose_action :move_selections_into_project do + move_or_copy :move + end + + def move_or_copy action + uuids_to_add = params["selection"] + uuids_to_add = [ uuids_to_add ] unless uuids_to_add.is_a? Array + uuids_to_add. + collect { |x| ArvadosBase::resource_class_for_uuid(x) }. + uniq. + each do |resource_class| + resource_class.filter([['uuid','in',uuids_to_add]]).each do |src| + if resource_class == Collection and not Collection.attribute_info.include?(:name) + dst = Link.new(owner_uuid: @object.uuid, + tail_uuid: @object.uuid, + head_uuid: src.uuid, + link_class: 'name', + name: src.uuid) + else + case action + when :copy + dst = src.dup + if dst.respond_to? :'name=' + if dst.name + dst.name = "Copy of #{dst.name}" + else + dst.name = "Copy of unnamed #{dst.class_for_display.downcase}" + end + end + if resource_class == Collection + dst.manifest_text = Collection.select([:manifest_text]).where(uuid: src.uuid).first.manifest_text + end + when :move + dst = src + else + raise ArgumentError.new "Unsupported action #{action}" + end + dst.owner_uuid = @object.uuid + dst.tail_uuid = @object.uuid if dst.class == Link + end + begin + dst.save! + rescue + dst.name += " (#{Time.now.localtime})" if dst.respond_to? :name= + dst.save! + end + end + end + redirect_to @object + end - def combine_selected_files_into_collection + def arv_normalize mt, *opts + r = "" + IO.popen(['arv-normalize'] + opts, 'w+b') do |io| + io.write mt + io.close_write + while buf = io.read(2**16) + r += buf + end + end + r + end + + expose_action :combine_selected_files_into_collection do lst = [] files = [] params["selection"].each do |s| - m = CollectionsHelper.match(s) + a = ArvadosBase::resource_class_for_uuid s + m = nil + if a == Link + begin + m = CollectionsHelper.match(Link.find(s).head_uuid) + rescue + end + else + m = CollectionsHelper.match(s) + end + if m and m[1] and m[2] lst.append(m[1] + m[2]) files.append(m) @@ -25,37 +132,25 @@ class ActionsController < ApplicationController files.each do |m| mt = chash[m[1]+m[2]].manifest_text if m[4] - IO.popen(['arv-normalize', '--extract', m[4][1..-1]], 'w+b') do |io| - io.write mt - io.close_write - while buf = io.read(2**20) - combined += buf - end - end + combined += arv_normalize mt, '--extract', m[4][1..-1] else combined += chash[m[1]+m[2]].manifest_text end end - normalized = '' - IO.popen(['arv-normalize'], 'w+b') do |io| - io.write combined - io.close_write - while buf = io.read(2**20) - normalized += buf - end - end + normalized = arv_normalize combined + normalized_stripped = arv_normalize combined, '--strip' require 'digest/md5' d = Digest::MD5.new() - d << normalized - newuuid = "#{d.hexdigest}+#{normalized.length}" + d << normalized_stripped + newuuid = "#{d.hexdigest}+#{normalized_stripped.length}" env = Hash[ENV]. merge({ 'ARVADOS_API_HOST' => - $arvados_api_client.arvados_v1_base. + arvados_api_client.arvados_v1_base. sub(/\/arvados\/v1/, ''). sub(/^https?:\/\//, ''), 'ARVADOS_API_TOKEN' => Thread.current[:arvados_api_token], @@ -64,10 +159,9 @@ class ActionsController < ApplicationController }) IO.popen([env, 'arv-put', '--raw'], 'w+b') do |io| - io.write normalized + io.write normalized_stripped io.close_write - while buf = io.read(2**20) - + while buf = io.read(2**16) end end @@ -87,11 +181,4 @@ class ActionsController < ApplicationController redirect_to controller: 'collections', action: :show, id: newc.uuid end - def post - if params["combine_selected_files_into_collection"] - combine_selected_files_into_collection - else - redirect_to :back - end - end end