vidispine 1.6.0 → 1.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/vidispine/api/utilities.rb +4 -2
- data/lib/vidispine/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 45f448716addb6abd5adb47888586536457139ee
|
|
4
|
+
data.tar.gz: d10f2fc1f7145eb4b290a44890d980a004c53c33
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: dbfb4f022fe2bf933077bd6384006203977aad2eba11cfc089b2890f57e0b4eda07dbf24bed7458c08baed2a53de966cfcb95b8ce3cbd0206dcf4012025a4ebb
|
|
7
|
+
data.tar.gz: 65209f2392d17501dc0e66bf6e1e772e15d41baa398773ec2bccaf9d0c0f6717987d49707002f55975939d02fbeb4df011b573f8c21658b1360cf7dace645c46
|
|
@@ -691,12 +691,14 @@ module Vidispine
|
|
|
691
691
|
unless shape
|
|
692
692
|
import_args_in = args[:import_args]
|
|
693
693
|
|
|
694
|
-
import_args = { :item_id => item_id, :file_id => file_id
|
|
694
|
+
import_args = { :item_id => item_id, :file_id => file_id }
|
|
695
695
|
import_args.merge!(symbolize_keys(import_args_in, false)) if import_args_in.is_a?(Hash)
|
|
696
696
|
|
|
697
697
|
use_placeholder_import = options.fetch(:use_placeholder_import, true)
|
|
698
698
|
if use_placeholder_import
|
|
699
699
|
import_args[:item_type] ||= 'container'
|
|
700
|
+
else
|
|
701
|
+
import_args[:tag] ||= original_shape_tag_name
|
|
700
702
|
end
|
|
701
703
|
|
|
702
704
|
# 6. Add the file as the original shape
|
|
@@ -728,7 +730,7 @@ module Vidispine
|
|
|
728
730
|
}
|
|
729
731
|
last_response = job_monitor_response[:last_response]
|
|
730
732
|
_response[:item_shape_import_job_result] = last_response
|
|
731
|
-
raise "Error Importing File. Response: #{last_response.inspect}" unless last_response['status']
|
|
733
|
+
raise "Error Importing File. Response: #{last_response.inspect}" unless %(FINISHED_WARNING FINISHED).include?(last_response['status'])
|
|
732
734
|
end
|
|
733
735
|
|
|
734
736
|
if should_transcode
|
data/lib/vidispine/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vidispine
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.6.
|
|
4
|
+
version: 1.6.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- John Whitson
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-11-
|
|
11
|
+
date: 2018-11-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|