vidispine 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b57220a13423aaf8fab088c32d0f837222ed74f2
-  data.tar.gz: f853f25d95937d7ef4b58d8b4236156e9f67437d
+  metadata.gz: 7e06f7c248d0a30185075abb17cc5c77a713051d
+  data.tar.gz: 435188fd53cf0ea96f5cfbb325ff3199d1b421e7
 SHA512:
-  metadata.gz: e1b99aa261d29fcbcd41f270762d174b4f98222554504f45e8a5e047153e7ea46926a03d5d77a5b4cfc116f86a4ffb80b7f992890dda387c6be9fbb1ab35050f
-  data.tar.gz: 43e181f59a8e2ace6afd9a4ddcdf0a06b1efa496a7bc2d8ca60b28ca2d0371b39b6c0256decbbfac3664437dc8639862c346b06ac6fa6b52a37e6aa288e40f6c
+  metadata.gz: 6f889f18c5e2a7a59bb2a6de00babe0e04801db3f49d4ca3fc8cee0eb7dafe56131844d3792fb54b2eb747df107654c15f6eb630d04d6beb754a1c3f096e4714
+  data.tar.gz: 54f602dc6e2d51ae693d9104b77a413183242c43f8035db473271938d2d6deb21dd515ba0af94597de7d37213453f5543b516c4dfa5690df54d9918e2ded8764

data/lib/vidispine/api/client/requests/import_placeholder_item.rb

@@ -9,22 +9,27 @@ module Vidispine::API::Client::Requests
     PARAMETERS = [
       { :name => :item_id, :required => true, :send_in => :path },
       { :name => :item_type, :required => true, :send_in => :path },
-      :uri,
-      :fileId,
-      :tag,
-      :original,
-      :createPosters,
+
+      :allowReimport,
       :createThumbnails,
-      :overrideFastStart,
-      :requireFastStart,
       :fastStartLength,
+      :fileId,
       :growing,
+      :index,
+      :jobmetadata,
+      'no-transcode',
       :notification,
       :notificationDta,
+      :original,
+      :overrideFastStart,
       :priority,
-      :jobmetadata,
+      :resourceId,
+      :requireFastStart,
       :settings,
-      :index
+      :shapeId,
+      :tag,
+      :thumbnailService,
+      :uri
     ]
 
     def after_process_parameters

data/lib/vidispine/api/utilities.rb

@@ -537,11 +537,13 @@ module Vidispine
       # @option args [String] :file_id
       # @option args [Boolean] :create_thumbnails (true)
       # @option args [Integer|false] :create_posters (3)
+      # @option args [Hash] :import_args ({})
       #
       # @param [Hash] options
       # @option options [Boolean] :add_item_to_collection
       # @option options [Boolean] :wait_for_transcode_job (false)
       # @option options [Boolean] :skip_transcode_if_shape_with_tag_exists (true)
+      # @option options [Boolean] :use_placeholder_import (true)
       #
       # @return [Hash]
       def item_add_using_file_path(args = { }, options = { })
@@ -668,10 +670,21 @@ module Vidispine
         create_posters = args.fetch(:create_posters, 3)
 
         unless shape
+          import_args_in = args[:import_args]
+
+          import_args = { :item_id => item_id, :file_id => file_id, :tag => original_shape_tag_name }
+          import_args.merge!(symbolize_keys(import_args_in, false)) if import_args_in.is_a?(Hash)
+
+          use_placeholder_import = options.fetch(:use_placeholder_import, true)
+          if use_placeholder_import
+            import_args[:item_type] ||= 'container'
+          end
+
           # 6. Add the file as the original shape
           logger.debug { 'Adding the file as the Original Shape.' }
-          item_shape_import_response = import_placeholder_item(:item_id => item_id, :file_id => file_id, :tag => original_shape_tag_name)
-          # item_shape_import_response = item_shape_import(:item_id => item_id, :file_id => file_id, :tag => original_shape_tag_name)
+          item_shape_import_response =  use_placeholder_import ?
+                   import_placeholder_item(import_args) :
+                   item_shape_import(import_args)
           _response[:item_shape_import] = item_shape_import_response
 
           job_id = item_shape_import_response['jobId']

data/lib/vidispine/version.rb

@@ -1,3 +1,3 @@
 module Vidispine
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vidispine
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - John Whitson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler