vidispine 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42f586329307e5534298c0619169e8d2b2a5f78d
-  data.tar.gz: ecc3b8ba4c3472090ff6c45f48a263e624e95b9b
+  metadata.gz: 45f448716addb6abd5adb47888586536457139ee
+  data.tar.gz: d10f2fc1f7145eb4b290a44890d980a004c53c33
 SHA512:
-  metadata.gz: f6dd1740b880a7730fe6786aa8cc30891b79a0cf641671f8a10f76472dae73c16fda520ba77df3aaf1eb68f9504b588ff76383288bb7800ffc3c4ce3921273ba
-  data.tar.gz: 4fe948a108b5ce5d23150bb2b2d3d5facaa8403066b4f5712b0b90f924d4231f1e7edc40b24ea8cc082b2f9e4f608a65b6a9e0c410a9a43e3134b821b203e271
+  metadata.gz: dbfb4f022fe2bf933077bd6384006203977aad2eba11cfc089b2890f57e0b4eda07dbf24bed7458c08baed2a53de966cfcb95b8ce3cbd0206dcf4012025a4ebb
+  data.tar.gz: 65209f2392d17501dc0e66bf6e1e772e15d41baa398773ec2bccaf9d0c0f6717987d49707002f55975939d02fbeb4df011b573f8c21658b1360cf7dace645c46

data/lib/vidispine/api/utilities.rb

@@ -691,12 +691,14 @@ module Vidispine
         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 = { :item_id => item_id, :file_id => file_id }
           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'
+          else
+            import_args[:tag] ||= original_shape_tag_name
           end
 
           # 6. Add the file as the original shape
@@ -728,7 +730,7 @@ module Vidispine
             }
             last_response = job_monitor_response[:last_response]
             _response[:item_shape_import_job_result] = last_response
-            raise "Error Importing File. Response: #{last_response.inspect}" unless last_response['status'] == 'FINISHED'
+            raise "Error Importing File. Response: #{last_response.inspect}" unless %(FINISHED_WARNING FINISHED).include?(last_response['status'])
           end
 
           if should_transcode

data/lib/vidispine/version.rb

@@ -1,3 +1,3 @@
 module Vidispine
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vidispine
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - John Whitson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler