vidispine 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbc80a3dfc2e3cfe79c2ac9918df6770e9e6707b
-  data.tar.gz: 0a711618f5cc6ffa79214c97995f020713ea473b
+  metadata.gz: 5fd19ae6c7308f20a78830b2fd0eb01894fc3fd1
+  data.tar.gz: 91e0f6c339c12f3c42df64f47c50cb9f3a5ce3bf
 SHA512:
-  metadata.gz: 2295336eeb9f06fac7f52c49a7dc47d1e18d33d3e275707eb993b9df8ddfb31446e3e9edb0e404b0f3c55620d66d63ed1781eae5fc8cc35ee64edad7f6b379d2
-  data.tar.gz: b5ee3f5fab269599c8e61b636b9ef326b9956fdaa2aadc034775c0a3120b884d3f5098f68a1680a5d4bc5b7ce54c2aaf01b68ca76f9fb25b16d15ee95ca3a53c
+  metadata.gz: 92dfee18a8d4097c7656768f7893313fbc6b68af8b03cdbc29343192663b492fc5a18c058daf3ddbcfca8908a6025d0d2ab4cdbec216b54a58945e2126520679
+  data.tar.gz: 170acf9adc3ba88657229b3c3b6ab568c466fa7f7feedce0301eb1291d80392d6a2afcb7f4d062870022eff1eb63aa35b9c3267099d007d334df3c7cbae96eb0

data/lib/vidispine/api/client.rb

@@ -941,6 +941,24 @@ module Vidispine
         process_request_using_class(Requests::StorageFileGet, args, options)
       end
 
+      # @see http://apidoc.vidispine.com/latest/ref/storage/file.html#set-file-state
+      def storage_file_state_set(args = { }, options = { })
+        _request = Requests::BaseRequest.new(
+          args,
+          {
+            :http_path => 'storage/file/#{path_arguments[:file_id]}/state/#{path_arguments[:state]}',
+            :http_method => :put,
+            :default_parameter_send_in_value => :path,
+            :parameters => [
+              { :name => :file_id, :required => true },
+              { :name => :state, :required => true },
+            ]
+          }.merge(options)
+        )
+        process_request(_request, options)
+
+      end
+
       # @see http://apidoc.vidispine.com/4.2/ref/storage/file.html#list-files-in-storage
       def storage_files_get(args = { }, options = { })
         process_request_using_class(Requests::StorageFilesGet, args, options)

data/lib/vidispine/api/utilities.rb

@@ -626,16 +626,21 @@ module Vidispine
 
         if file_id && file && !file['item']
           # If the passed file doesn't have an item then requery to verify that the item is absent
-          storage_file_get_response = storage_file_get(:storage_id => storage_id, :file_id => file_id, :include_item => true)
+          storage_file_get_response = storage_file_get(:storage_id => storage_id,
+                                                       :file_id => file_id, :include_item => true)
 
-          raise "Error Getting Storage File. '#{storage_file_get_response.inspect}'" unless storage_file_get_response and storage_file_get_response['id']
+          unless storage_file_get_response and storage_file_get_response['id']
+            raise "Error Getting Storage File. '#{storage_file_get_response.inspect}'"
+          end
           _response[:storage_file_get_response] = storage_file_get_response
 
           file_found = true
 
           file = storage_file_get_response
         else
-            storage_file_get_or_create_response = storage_file_get_or_create(storage_id, file_path_relative_to_storage_path, :extended_response => true)
+            storage_file_get_or_create_response = storage_file_get_or_create(storage_id,
+                                                                             file_path_relative_to_storage_path,
+                                                                             :extended_response => true)
             _response[:storage_file_get_or_create_response] = storage_file_get_or_create_response
             file = storage_file_get_or_create_response[:file]
             file_found = storage_file_get_or_create_response[:file_already_existed]
@@ -673,7 +678,10 @@ module Vidispine
           item_metadata_set(:item_id => item_id, :metadata_document => metadata_document)
         end
 
-        should_add_to_collection = options.fetch(:add_item_to_collection, [ :collections, :collection, :collection_name, :collection_id, :file_path_collection_name_position ].any? { |v|  args.keys.include?(v) })
+        should_add_to_collection = options.fetch(:add_item_to_collection,
+                                                 [ :collections, :collection, :collection_name, :collection_id,
+                                                   :file_path_collection_name_position
+                                                 ].any? { |v|  args.keys.include?(v) })
         if should_add_to_collection
           logger.debug { 'Determining Collection to Add the Item to.' }
           collections = determine_collection(args, options)
@@ -691,7 +699,9 @@ module Vidispine
             collection_object_add(:collection_id => collection_id, :object_id => item_id)
           end
 
-          _response[:collection_object_add] = single_collection ? collection_object_add_responses.first : collection_object_add_responses
+          _response[:collection_object_add] = single_collection ?
+                                                  collection_object_add_responses.first :
+                                                  collection_object_add_responses
         end
 
         shape = item['shape']
@@ -1548,6 +1558,9 @@ module Vidispine
             storage_file_get_response = file = storage_file_get(:storage_id => storage_id, :file_id => _message['fileId'], :include_item => include_item)
           end
           raise "Error Creating File on Storage. Response: #{response.inspect}" unless (file || { })['id']
+
+          # Workaround: Ran into an issue with a v4.15 installation where setting file state on creation wasn't working
+          storage_file_state_set(:file_id => file['id'], :state => creation_state) if file['state'] != creation_state
         end
 
         logger.debug { "Method: #{__method__} Response: #{file.inspect}" }

data/lib/vidispine/version.rb

@@ -1,3 +1,3 @@
 module Vidispine
-  VERSION = '1.6.3'
+  VERSION = '1.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vidispine
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - John Whitson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler