aspera-cli 4.2.1 → 4.2.2

data/lib/aspera/cli/plugins/aoc.rb

@@ -39,7 +39,6 @@ module Aspera
           self.options.add_opt_simple(:new_user_option,'new user creation option')
           self.options.add_opt_simple(:from_folder,'share to share source folder')
           self.options.add_opt_simple(:scope,'OAuth scope for AoC API calls')
-          self.options.add_opt_simple(:notify,'notify users that file was received')
           self.options.add_opt_boolean(:bulk,'bulk operation')
           self.options.add_opt_boolean(:default_ports,'use standard FASP ports or get from node api')
           self.options.set_option(:bulk,:no)
@@ -527,18 +526,11 @@ module Aspera
                 filter['start_time'] = start_datetime unless start_datetime.nil?
                 filter['stop_time'] = stop_datetime
               end
-              notification=self.options.get_option(:notify,:optional)
               events=analytics_api.read("#{filter_resource}/#{filter_id}/#{event_type}",option_url_query(filter))[:data][event_type]
               startdate_persistency.save unless startdate_persistency.nil?
-              if !notification.nil?
-                require 'erb'
-                events.each do |transfer|
-                  email_to_send={}
-                  notification.each do |k,v|
-                    email_to_send[k.to_sym]=ERB.new(v).result(binding)
-                  end
-                  Log.log().error("send email:   #{email_to_send}")
-                  self.config.send_email(email_to_send)
+              if !self.options.get_option(:notif_to,:optional).nil?
+                events.each do |tr_event|
+                  self.config.send_email_template({ev: tr_event})
                 end
               end
               return {:type=>:object_list,:data=>events}
@@ -810,14 +802,14 @@ module Aspera
                 add_ts={'paths'=>[{'source'=>'.'}]}
                 node_file = {node_info: node_info, file_id: package_info['contents_file_id']}
                 statuses=transfer_start(AoC::PACKAGES_APP,'receive',node_file,AoC.package_tags(package_info,'download').merge(add_ts))
-                result_transfer.push({'package'=>package_id,'status'=>statuses.map{|i|i.to_s}.join(',')})
+                result_transfer.push({'package'=>package_id,Main::STATUS_FIELD=>statuses})
                 # update skip list only if all transfer sessions completed
                 if TransferAgent.session_status(statuses).eql?(:success)
                   skip_ids_data.push(package_id)
                   skip_ids_persistency.save unless skip_ids_persistency.nil?
                 end
               end
-              return {:type=>:object_list,:data=>result_transfer}
+              return Main.result_transfer_multiple(result_transfer)
             when :show
               package_id=self.options.get_next_argument('package ID')
               package_info=@api_aoc.read("packages/#{package_id}")[:data]

data/lib/aspera/cli/plugins/config.rb

@@ -1,6 +1,7 @@
 require 'aspera/cli/basic_auth_plugin'
 require 'aspera/cli/extended_value'
 require 'aspera/fasp/installation'
+require 'aspera/fasp/parameters'
 require 'aspera/api_detector'
 require 'aspera/open_application'
 require 'aspera/aoc'
@@ -13,6 +14,7 @@ require 'base64'
 require 'net/smtp'
 require 'open3'
 require 'date'
+require 'erb'
 
 module Aspera
   module Cli
@@ -48,13 +50,20 @@ module Aspera
         DEMO='demo'
         DEMO_SERVER_PRESET='demoserver'
         AOC_PATH_API_CLIENTS='admin/api-clients'
+        EMAIL_TEST_TEMPLATE=<<END_OF_TEMPLATE
+From: <%=from_name%> <<%=from_email%>>
+To: <<%=to%>>
+Subject: Amelia email test
+
+It worked !
+END_OF_TEMPLATE
         def option_preset; nil; end
 
         def option_preset=(value)
           self.options.add_option_preset(preset_by_name(value))
         end
 
-        private_constant :DEFAULT_CONFIG_FILENAME,:CONF_PRESET_CONFIG,:CONF_PRESET_VERSION,:CONF_PRESET_DEFAULT,:CONF_PRESET_GLOBAL,:PROGRAM_NAME_V1,:PROGRAM_NAME_V2,:DEFAULT_REDIRECT,:ASPERA_PLUGINS_FOLDERNAME,:RUBY_FILE_EXT,:AOC_COMMAND_V1,:AOC_COMMAND_V2,:AOC_COMMAND_V3,:AOC_COMMAND_CURRENT,:DEMO,:TRANSFER_SDK_ARCHIVE_URL,:AOC_PATH_API_CLIENTS,:DEMO_SERVER_PRESET
+        private_constant :DEFAULT_CONFIG_FILENAME,:CONF_PRESET_CONFIG,:CONF_PRESET_VERSION,:CONF_PRESET_DEFAULT,:CONF_PRESET_GLOBAL,:PROGRAM_NAME_V1,:PROGRAM_NAME_V2,:DEFAULT_REDIRECT,:ASPERA_PLUGINS_FOLDERNAME,:RUBY_FILE_EXT,:AOC_COMMAND_V1,:AOC_COMMAND_V2,:AOC_COMMAND_V3,:AOC_COMMAND_CURRENT,:DEMO,:TRANSFER_SDK_ARCHIVE_URL,:AOC_PATH_API_CLIENTS,:DEMO_SERVER_PRESET,:EMAIL_TEST_TEMPLATE
 
         def initialize(env,tool_name,help_url,version,main_folder)
           super(env)
@@ -103,6 +112,8 @@ module Aspera
           self.options.add_opt_simple(:secrets,'secret repository (Hash)')
           self.options.add_opt_simple(:sdk_url,'URL to get SDK')
           self.options.add_opt_simple(:sdk_folder,'SDK folder location')
+          self.options.add_opt_simple(:notif_to,'email recipient for notification of transfers')
+          self.options.add_opt_simple(:notif_template,'email ERB template for notification of transfers')
           self.options.add_opt_boolean(:test_mode,'skip user validation in wizard mode')
           self.options.add_opt_simple(:version_check_days,Integer,'period to check neew version in days (zero to disable)')
           self.options.set_option(:use_generic_client,true)
@@ -465,7 +476,7 @@ module Aspera
         end
 
         def execute_action_ascp
-          command=self.options.get_next_command([:connect,:use,:show,:products,:info,:install])
+          command=self.options.get_next_command([:connect,:use,:show,:products,:info,:install,:spec])
           case command
           when :connect
             return execute_connect_action
@@ -516,6 +527,8 @@ module Aspera
           when :install
             v=Fasp::Installation.instance.install_sdk(self.options.get_option(:sdk_url,:mandatory))
             return Main.result_status("Installed version #{v}")
+          when :spec
+            return {type: :object_list, data: Fasp::Parameters.man_table, fields: ['name','type',Fasp::Parameters::SUPPORTED_AGENTS_SHORT.map{|i|i.to_s},'description'].flatten}
           end
           raise "unexpected case: #{command}"
         end
@@ -788,12 +801,7 @@ module Aspera
           when :file
             return Main.result_status(@option_config_file)
           when :email_test
-            dest_email=self.options.get_next_argument('destination email')
-            send_email({
-              to:         dest_email,
-              subject:    'Amelia email test',
-              body:       'It worked !',
-            })
+            send_email_template({},EMAIL_TEST_TEMPLATE)
             return Main.result_nothing
           when :smtp_settings
             return {:type=>:single_object,:data=>email_settings}
@@ -824,9 +832,10 @@ module Aspera
           end
         end
 
+        # @return email server setting with defaults if not defined
         def email_settings
           smtp=self.options.get_option(:smtp,:mandatory)
-          # change string keys into symbols
+          # change string keys into symbol keys
           smtp=smtp.keys.inject({}){|m,v|m[v.to_sym]=smtp[v];m}
           # defaults
           smtp[:tls]||=true
@@ -836,34 +845,42 @@ module Aspera
           smtp[:domain]||=smtp[:from_email].gsub(/^.*@/,'') if smtp.has_key?(:from_email)
           # check minimum required
           [:server,:port,:domain].each do |n|
-            raise "missing smtp parameter: #{n}" unless smtp.has_key?(n)
+            raise "Missing smtp parameter: #{n}" unless smtp.has_key?(n)
           end
           Log.log.debug("smtp=#{smtp}")
           return smtp
         end
 
-        def send_email(email={})
-          opts=email_settings
-          email[:from_name]||=opts[:from_name]
-          email[:from_email]||=opts[:from_email]
-          # check minimum required
-          [:from_name,:from_email,:to,:subject].each do |n|
-            raise "missing email parameter: #{n}" unless email.has_key?(n)
+        # create a clean binding (ruby variable environment)
+        def empty_binding
+          Kernel.binding
+        end
+
+        def send_email_template(vars,email_template_default=nil)
+          vars[:to]||=options.get_option(:notif_to,:mandatory)
+          notif_template=options.get_option(:notif_template,email_template_default.nil? ? :mandatory : :optional) || email_template_default
+          mail_conf=email_settings
+          vars[:from_name]||=mail_conf[:from_name]
+          vars[:from_email]||=mail_conf[:from_email]
+          [:from_name,:from_email].each do |n|
+            raise "Missing email parameter: #{n}" unless vars.has_key?(n)
+          end
+          start_options=[mail_conf[:domain]]
+          start_options.push(mail_conf[:username],mail_conf[:password],:login) if mail_conf.has_key?(:username) and mail_conf.has_key?(:password)
+          # create a binding with only variables defined in vars
+          template_binding=empty_binding
+          # add variables to binding
+          vars.each do |k,v|
+            raise "key (#{k.class}) must be Symbol" unless k.is_a?(Symbol)
+            template_binding.local_variable_set(k,v)
           end
-          msg = <<END_OF_MESSAGE
-From: #{email[:from_name]} <#{email[:from_email]}>
-To: <#{email[:to]}>
-Subject: #{email[:subject]}
-
-#{email[:body]}
-END_OF_MESSAGE
-          start_options=[opts[:domain]]
-          start_options.push(opts[:username],opts[:password],:login) if opts.has_key?(:username) and opts.has_key?(:password)
-
-          smtp = Net::SMTP.new(opts[:server], opts[:port])
-          smtp.enable_starttls if opts[:tls]
+          # execute template
+          msg_with_headers=ERB.new(notif_template).result(template_binding)
+          Log.dump(:msg_with_headers,msg_with_headers)
+          smtp = Net::SMTP.new(mail_conf[:server], mail_conf[:port])
+          smtp.enable_starttls if mail_conf[:tls]
           smtp.start(*start_options) do |smtp|
-            smtp.send_message(msg, email[:from_email], email[:to])
+            smtp.send_message(msg_with_headers, vars[:from_email], vars[:to])
           end
         end
 

data/lib/aspera/cli/plugins/faspex.rb

@@ -9,6 +9,7 @@ require 'aspera/fasp/uri'
 require 'aspera/nagios'
 require 'xmlsimple'
 require 'json'
+require 'cgi'
 
 module Aspera
   module Cli
@@ -17,7 +18,17 @@ module Aspera
         KEY_NODE='node'
         KEY_PATH='path'
         VAL_ALL='ALL'
-        private_constant :KEY_NODE,:KEY_PATH,:VAL_ALL
+        # added field in result that identifies the package
+        PACKAGE_MATCH_FIELD='package_id'
+        # list of supported atoms
+        ATOM_MAILBOXES=[:inbox, :archive, :sent]
+        # number is added by CLI
+        MAX_ITEMS='max'
+        MAX_PAGES='pmax'
+        ATOM_PARAMS=['page', 'count', 'startIndex', MAX_ITEMS, MAX_PAGES]
+        PUB_LINK_EXTERNAL_MATCH='external_deliveries/'
+        private_constant :KEY_NODE,:KEY_PATH,:VAL_ALL,:PACKAGE_MATCH_FIELD,:ATOM_MAILBOXES,:PUB_LINK_EXTERNAL_MATCH
+
         def initialize(env)
           @api_v3=nil
           @api_v4=nil
@@ -27,7 +38,7 @@ module Aspera
           self.options.add_opt_simple(:source_name,'create package from remote source (by name)')
           self.options.add_opt_simple(:storage,'Faspex local storage definition')
           self.options.add_opt_simple(:recipient,'use if recipient is a dropbox (with *)')
-          self.options.add_opt_list(:box,[:inbox,:sent,:archive],'package box')
+          self.options.add_opt_list(:box,ATOM_MAILBOXES,'package box')
           self.options.set_option(:box,:inbox)
           self.options.parse_options!
         end
@@ -102,29 +113,57 @@ module Aspera
           return @api_v4
         end
 
-        ACTIONS=[ :health,:package, :source, :me, :dropbox, :v4, :address_book, :login_methods ]
-
-        # we match recv command on atom feed on this field
-        PACKAGE_MATCH_FIELD='package_id'
-
+        # query supports : {"startIndex":10,"count":1,"page":109}
         def mailbox_all_entries
           recipient_name=self.options.get_option(:recipient,:optional) || self.options.get_option(:username,:mandatory)
+          # mailbox is in ATOM_MAILBOXES
           mailbox=self.options.get_option(:box,:mandatory)
-          all_inbox_xml=api_v3.call({:operation=>'GET',:subpath=>"#{mailbox}.atom",:headers=>{'Accept'=>'application/xml'}})[:http].body
-          all_inbox_data=XmlSimple.xml_in(all_inbox_xml, {'ForceArray' => true})
-          Log.dump(:all_inbox_data,all_inbox_data)
-          result=all_inbox_data.has_key?('entry') ? all_inbox_data['entry'] : []
-          result.each do |e|
-            case mailbox
-            when :inbox,:archive
-              recipient=e['to'].select{|i|i['name'].first.eql?(recipient_name)}.first
-              e[PACKAGE_MATCH_FIELD]=recipient.nil? ? 'n/a' : recipient['recipient_delivery_id'].first
-            when :sent
-              e[PACKAGE_MATCH_FIELD]=e['delivery_id'].first
+          # parameters
+          mailbox_query=self.options.get_option(:query,:optional)
+          max_items=nil
+          max_pages=nil
+          result=[]
+          if !mailbox_query.nil?
+            raise "query: must be Hash or nil" unless mailbox_query.is_a?(Hash)
+            raise "query: supported params: #{ATOM_PARAMS}" unless (mailbox_query.keys-ATOM_PARAMS).empty?
+            raise "query: startIndex and page are exclusive" if mailbox_query.has_key?('startIndex') and mailbox_query.has_key?('page')
+            max_items=mailbox_query[MAX_ITEMS]
+            mailbox_query.delete(MAX_ITEMS)
+            max_pages=mailbox_query[MAX_PAGES]
+            mailbox_query.delete(MAX_PAGES)
+          end
+          loop do
+            atom_xml=api_v3.call({operation: 'GET',subpath: "#{mailbox}.atom",headers: {'Accept'=>'application/xml'},url_params: mailbox_query})[:http].body
+            box_data=XmlSimple.xml_in(atom_xml, {'ForceArray' => true})
+            Log.dump(:box_data,box_data)
+            items=box_data.has_key?('entry') ? box_data['entry'] : []
+            Log.log.debug("new items: #{items.count}")
+            # it is the end if page is empty
+            break if items.empty?
+            items.each do |package|
+              package[PACKAGE_MATCH_FIELD]=case mailbox
+              when :inbox,:archive
+                recipient=package['to'].select{|i|i['name'].first.eql?(recipient_name)}.first
+                recipient.nil? ? nil : recipient['recipient_delivery_id'].first
+              else # :sent
+                package['delivery_id'].first
+              end
+              # keep only those for the specified recipient
+              result.push(package) unless package[PACKAGE_MATCH_FIELD].nil?
             end
+            Log.log.debug("total items: #{result.count}")
+            # reach the limit ?
+            break if !max_items.nil? and result.count > max_items
+            link=box_data['link'].select{|i|i['rel'].eql?('next')}.first
+            Log.log.debug("link: #{link}")
+            # no next link
+            break if link.nil?
+            # replace parameters with the ones from next link
+            params=CGI.parse(URI.parse(link['href']).query)
+            mailbox_query=params.keys.inject({}){|m,i|;m[i]=params[i].first;m}
+            Log.log.debug("query: #{mailbox_query}")
+            break if !max_pages.nil? and mailbox_query['page'].to_i > max_pages
           end
-          # remove dropbox packages
-          result.select!{|p|p['metadata'].first['field'].select{|j|j['name'].eql?('_dropbox_name')}.empty? rescue false}
           return result
         end
 
@@ -160,6 +199,8 @@ module Aspera
           return pkgdatares.first
         end
 
+        ACTIONS=[ :health,:package, :source, :me, :dropbox, :v4, :address_book, :login_methods ]
+
         def execute_action
           command=self.options.get_next_command(ACTIONS)
           case command
@@ -215,44 +256,26 @@ module Aspera
               skip_ids_data=[]
               skip_ids_persistency=nil
               case link_url
-              when nil
-                # usual case: no link
-              when /^faspe:/
-                pkg_id_uri=[{:id=>'package',:uri=>link_url}]
-              else
-                link_data=self.class.get_link_data(link_url)
-                if !link_data[:subpath].match(%r{external_deliveries/})
-                  raise CliBadArgument,"pub link is #{link_data[:subpath]}, expecting external_deliveries/"
-                end
-                # Note: unauthenticated API
-                api_public_link=Rest.new({:base_url=>link_data[:base_url]})
-                pkgdatares=api_public_link.call({:operation=>'GET',:subpath=>link_data[:subpath],:url_params=>{:passcode=>link_data[:query]['passcode']},:headers=>{'Accept'=>'application/xml'}})
-                if !pkgdatares[:http].body.start_with?('<?xml ')
-                  OpenApplication.instance.uri(link_url)
-                  raise CliError, 'no such package'
-                end
-                package_entry=XmlSimple.xml_in(pkgdatares[:http].body, {'ForceArray' => false})
-                transfer_uri=self.class.get_fasp_uri_from_entry(package_entry)
-                transfer_spec=Fasp::Uri.new(transfer_uri).transfer_spec
-                transfer_spec['direction']='receive'
-                return Main.result_transfer(self.transfer.start(transfer_spec,{:src=>:node_gen3}))
-              end # public link
-              if pkg_id_uri.nil?
-                # get command line parameters
-                delivid=self.options.get_option(:id,:mandatory)
+              when nil # usual case: no link
                 if self.options.get_option(:once_only,:mandatory)
                   skip_ids_persistency=PersistencyActionOnce.new(
                   manager: @agents[:persistency],
                   data: skip_ids_data,
                   ids:  ['faspex_recv',self.options.get_option(:url,:mandatory),self.options.get_option(:username,:mandatory),self.options.get_option(:box,:mandatory).to_s])
                 end
+                # get command line parameters
+                delivid=self.options.get_option(:id,:mandatory)
                 if delivid.eql?(VAL_ALL)
                   pkg_id_uri=mailbox_all_entries.map{|i|{:id=>i[PACKAGE_MATCH_FIELD],:uri=>self.class.get_fasp_uri_from_entry(i)}}
                   # TODO : remove ids from skip not present in inbox
                   # skip_ids_data.select!{|id|pkg_id_uri.select{|p|p[:id].eql?(id)}}
                   pkg_id_uri.select!{|i|!skip_ids_data.include?(i[:id])}
                 else
-                  # TODO: delivery id is the right one if package was receive by group
+                  recipient=options.get_option(:recipient,:optional)
+                  if !recipient.nil? and recipient.start_with?('*')
+                    raise "Dropbox and Workgroup packages should use link option with faspe:"
+                  end
+                  # TODO: delivery id is the right one if package was receive by workgroup
                   endpoint=case self.options.get_option(:box,:mandatory)
                   when :inbox,:archive;'received'
                   when :sent; 'sent'
@@ -261,7 +284,25 @@ module Aspera
                   package_entry=XmlSimple.xml_in(entry_xml, {'ForceArray' => true})
                   pkg_id_uri=[{:id=>delivid,:uri=>self.class.get_fasp_uri_from_entry(package_entry)}]
                 end
-              end
+              when /^faspe:/
+                pkg_id_uri=[{:id=>'package',:uri=>link_url}]
+              else
+                link_data=self.class.get_link_data(link_url)
+                if !link_data[:subpath].start_with?(PUB_LINK_EXTERNAL_MATCH)
+                  raise CliBadArgument,"Pub link is #{link_data[:subpath]}. Expecting #{PUB_LINK_EXTERNAL_MATCH}"
+                end
+                # Note: unauthenticated API (autorization is in url params)
+                api_public_link=Rest.new({:base_url=>link_data[:base_url]})
+                pkgdatares=api_public_link.call({:operation=>'GET',:subpath=>link_data[:subpath],:url_params=>{:passcode=>link_data[:query]['passcode']},:headers=>{'Accept'=>'application/xml'}})
+                if !pkgdatares[:http].body.start_with?('<?xml ')
+                  OpenApplication.instance.uri(link_url)
+                  raise CliError, 'no such package'
+                end
+                package_entry=XmlSimple.xml_in(pkgdatares[:http].body, {'ForceArray' => false})
+                Log.dump(:package_entry,package_entry)
+                transfer_uri=self.class.get_fasp_uri_from_entry(package_entry)
+                pkg_id_uri=[{:id=>package_entry['id'],:uri=>transfer_uri}]
+              end # public link
               Log.dump(:pkg_id_uri,pkg_id_uri)
               return Main.result_status('no package') if pkg_id_uri.empty?
               result_transfer=[]
@@ -270,20 +311,17 @@ module Aspera
                 # NOTE: only external users have token in faspe: link !
                 if !transfer_spec.has_key?('token')
                   sanitized=id_uri[:uri].gsub('&','&amp;')
-                  # TODO: file jira
-                  #XXsanitized.gsub!(/%3D%3D$/,'==')
-                  #XXsanitized.gsub!(/%3D$/,'=')
                   xmlpayload='<?xml version="1.0" encoding="UTF-8"?><url-list xmlns="http://schemas.asperasoft.com/xml/url-list"><url href="'+sanitized+'"/></url-list>'
                   transfer_spec['token']=api_v3.call({:operation=>'POST',:subpath=>'issue-token?direction=down',:headers=>{'Accept'=>'text/plain','Content-Type'=>'application/vnd.aspera.url-list+xml'},:text_body_params=>xmlpayload})[:http].body
                 end
                 transfer_spec['direction']='receive'
                 statuses=self.transfer.start(transfer_spec,{:src=>:node_gen3})
-                result_transfer.push({'package'=>id_uri[:id],'status'=>statuses.map{|i|i.to_s}.join(',')})
+                result_transfer.push({'package'=>id_uri[:id],Main::STATUS_FIELD=>statuses})
                 # skip only if all sessions completed
                 skip_ids_data.push(id_uri[:id]) if TransferAgent.session_status(statuses).eql?(:success)
               end
               skip_ids_persistency.save unless skip_ids_persistency.nil?
-              return {:type=>:object_list,:data=>result_transfer}
+              return Main.result_transfer_multiple(result_transfer)
             end
           when :source
             command_source=self.options.get_next_command([ :list, :id, :name ])

data/lib/aspera/cli/plugins/faspex5.rb

@@ -19,9 +19,9 @@ module Aspera
         end
 
         def set_api
-          faxpex5_api_base_url=options.get_option(:url,:mandatory)
-          faxpex5_api_v5_url="#{faxpex5_api_base_url}/api/v5"
-          faxpex5_api_auth_url="#{faxpex5_api_base_url}/auth"
+          @faxpex5_api_base_url=options.get_option(:url,:mandatory)
+          faxpex5_api_v5_url="#{@faxpex5_api_base_url}/api/v5"
+          faxpex5_api_auth_url="#{@faxpex5_api_base_url}/auth"
           case options.get_option(:auth,:mandatory)
           when :boot
             # the password here is the token copied directly from browser in developer mode
@@ -50,12 +50,13 @@ module Aspera
               :type                => :oauth2,
               :base_url            => faxpex5_api_auth_url,
               :grant               => :jwt,
+              :f5_username         => options.get_option(:username,:mandatory),
+              :f5_password         => options.get_option(:password,:mandatory),
               :client_id           => app_client_id,
               :client_secret       => options.get_option(:client_secret,:mandatory),
               :jwt_subject         => "client:#{app_client_id}", # TODO Mmmm
               :jwt_audience        => app_client_id, # TODO Mmmm
               :jwt_private_key_obj => OpenSSL::PKey::RSA.new(options.get_option(:private_key,:mandatory)),
-              :jwt_is_f5           => true, # TODO: remove when clarified
               :jwt_headers         => {typ: 'JWT'}
               }})
           end
@@ -69,7 +70,7 @@ module Aspera
           command=options.get_next_command(ACTIONS)
           case command
           when :auth_client
-            api_auth=Rest.new(@api_v5.params.merge({base_url: @api_v5.params[:base_url].gsub(/api\/v5$/,'auth')}))
+            api_auth=Rest.new(@api_v5.params.merge({base_url: "#{@faxpex5_api_base_url}/auth"}))
             return self.entity_action(api_auth,'oauth_clients',nil,:id,nil,true)
           when :node
             return self.entity_action(@api_v5,'nodes',nil,:id,nil,true)
@@ -119,12 +120,12 @@ module Aspera
                 transfer_spec=@api_v5.create("packages/#{id}/transfer_spec/download",{transfer_type: 'Connect', type: pkg_type})[:data]
                 transfer_spec.delete('authentication')
                 statuses=self.transfer.start(transfer_spec,{:src=>:node_gen3})
-                result_transfer.push({'package'=>id,'status'=>statuses.map{|i|i.to_s}.join(',')})
+                result_transfer.push({'package'=>id,Main::STATUS_FIELD=>statuses})
                 # skip only if all sessions completed
                 skip_ids_data.push(id) if TransferAgent.session_status(statuses).eql?(:success)
               end
               skip_ids_persistency.save unless skip_ids_persistency.nil?
-              return {:type=>:object_list,:data=>result_transfer}
+              return Main.result_transfer_multiple(result_transfer)
             end
           end
         end

data/lib/aspera/cli/plugins/preview.rb

@@ -344,34 +344,38 @@ module Aspera
               next
             end
             Log.log.debug("item:#{entry}")
-            case entry['type']
-            when 'file'
-              if filter_block.call(entry)
-                generate_preview(entry)
-              else
-                Log.log.debug('skip by filter')
-              end
-            when 'link'
-              Log.log.debug('Ignoring link.')
-            when 'folder'
-              if @option_skip_folders.include?(entry['path'])
-                Log.log.debug("#{entry['path']} folder (skip list)".bg_red)
-              else
-                Log.log.debug("#{entry['path']} folder".green)
-                # get folder content
-                folder_entries=get_folder_entries(entry['id'])
-                # process all items in current folder
-                folder_entries.each do |folder_entry|
-                  # add path for older versions of ES
-                  if !folder_entry.has_key?('path')
-                    folder_entry['path']=entry_path_with_slash+folder_entry['name']
+            begin
+              case entry['type']
+              when 'file'
+                if filter_block.call(entry)
+                  generate_preview(entry)
+                else
+                  Log.log.debug('skip by filter')
+                end
+              when 'link'
+                Log.log.debug('Ignoring link.')
+              when 'folder'
+                if @option_skip_folders.include?(entry['path'])
+                  Log.log.debug("#{entry['path']} folder (skip list)".bg_red)
+                else
+                  Log.log.debug("#{entry['path']} folder".green)
+                  # get folder content
+                  folder_entries=get_folder_entries(entry['id'])
+                  # process all items in current folder
+                  folder_entries.each do |folder_entry|
+                    # add path for older versions of ES
+                    if !folder_entry.has_key?('path')
+                      folder_entry['path']=entry_path_with_slash+folder_entry['name']
+                    end
+                    folder_entry['parent_file_id']=entry['id']
+                    entries_to_process.push(folder_entry)
                   end
-                  folder_entry['parent_file_id']=entry['id']
-                  entries_to_process.push(folder_entry)
                 end
+              else
+                Log.log.warn("unknown entry type: #{entry['type']}")
               end
-            else
-              Log.log.warn("unknown entry type: #{entry['type']}")
+            rescue => e
+              Log.log.warn("An error occured: #{e}, ignoring")
             end
           end
         end