cantemo-portal-agent 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d670e7ef575f0152b7bf5d77d2763de6a64e363
-  data.tar.gz: e76ed955968ebd2182b49e29badbbff6e7b606bd
+  metadata.gz: e171c53876f59041d8c032a5ec5603b5f25a962b
+  data.tar.gz: 19e7b87575175471a9484439aee1d23b8b211491
 SHA512:
-  metadata.gz: 4e52761626f536e564d71856e361f16b3d2d1418da3e464723256ffad5459cf512a67b684e9628da912c78031ca520e407748881c1804eb79123cac37846c917
-  data.tar.gz: f8a9a3ba1f3621feb3e8958c51a0068bcaf6e81264bca425605e1d2ade8fe75adcf3891a04a2ae353296138401457b330ce59278650a54491d99e93ecc6790af
+  metadata.gz: e72d5bfc3ed43872318954bacf30bbc140d2f884bd67419c64fc8568dc2fdd78c628f25a4b95fb942b33494b41d09afaa46ea4798e1b303271337178c966f296
+  data.tar.gz: 1e211ac9951ad604a900068e0b4d85b5d36fcc685660c9288d25855da209cf787145940d87c4673fedfc2b3ca93c72b220c4e4fe526819ed40b8d32d0be62b93

data/lib/cantemo/portal/agent/version.rb

@@ -1,7 +1,7 @@
 module Cantemo
   module Portal
     class Agent
-      VERSION = '1.2.0'.freeze
+      VERSION = '1.2.1'.freeze
     end
   end
 end

data/lib/cantemo/portal/api/client.rb

@@ -0,0 +1,75 @@
+require 'vidispine/api/utilities'
+require 'cantemo/portal/agent/version'
+
+module Cantemo
+  module Portal
+    module API
+
+      class Client
+
+        def initialize(args = { })
+          api_host               = args[:host]
+          api_port               = args[:port]
+          api_host_use_ssl       = args[:ssl]
+          api_username           = args[:username]
+          api_password           = args[:password]
+          api_auth_token         = args[:api_auth_token]
+          api_base_path          = args[:api_base_path]
+          api_default_query_data = args[:default_query_data]
+
+          api_url = args[:url] || args[:uri]
+          if api_url
+            api_uri      = URI(api_url)
+            api_host     ||= api_uri.host
+            api_port     ||= api_uri.port
+            api_userinfo = api_uri.userinfo
+            if api_userinfo
+              _api_username, _api_password = api_userinfo.split(':')
+              api_username                 ||= _api_username
+              api_password                 ||= _api_password
+            end
+            api_host_use_ssl       = api_uri.scheme == 'https' if api_host_use_ssl.nil?
+            api_uri_query          = api_uri.query
+            api_default_query_data ||= Hash[api_uri_query.split('&').map { |kp| kp.split('=') }]
+            api_base_path          ||= api_uri.path
+          end
+
+          api_port      ||= (api_host_use_ssl ? 443 : 80)
+          api_base_path ||= '/'
+
+          api_endpoint_prefix        = 'VSAPI'
+          api_noauth_endpoint_prefix = 'APInoauth'
+
+          client_args                              = {}
+          client_args[:http_host_address]          = api_host if api_host
+          client_args[:http_host_port]             = api_port if api_port
+          client_args[:http_host_use_ssl]          = api_host_use_ssl if api_host_use_ssl
+          client_args[:username]                   = api_username if api_username
+          client_args[:password]                   = api_password if api_password
+          client_args[:default_base_path]          = api_base_path if api_base_path
+          client_args[:default_query_data]         = api_default_query_data if api_default_query_data
+          client_args[:api_endpoint_prefix]        = api_endpoint_prefix
+          client_args[:api_noauth_endpoint_prefix] = api_noauth_endpoint_prefix
+
+          if api_auth_token
+            # Cantemo Portal supports an auth token for authentication, replace basic auth with auth-token
+            client_args[:authorization_header_key]   = 'Auth-Token'
+            client_args[:authorization_header_value] = api_auth_token
+          end
+          _client = ::Vidispine::API::Utilities.new(client_args)
+          _client.http_client.user_agent = "Cantemo Portal Agent v#{Cantemo::Portal::Agent::VERSION} - #{_client.http_client.user_agent}"
+          _client
+        end
+
+
+        # Client
+      end
+
+      # API
+    end
+
+    # Portal
+  end
+
+  # Cantemo
+end

data/lib/envoi/mam/agent.rb

@@ -36,7 +36,13 @@ module Envoi
         return if @notifiers.empty?
         args[:level] ||= :info
         args[:message] ||= message
-        @notifiers.each { |notifier| notifier.notify(args) }
+        @notifiers.each do |notifier|
+          begin
+            notifier.notify(args) rescue nil
+          rescue => e
+            logger.warn { "Notification Failed: #{e.message} "}
+          end
+        end
       end
 
       # @param [Hash] args {}
@@ -82,8 +88,7 @@ module Envoi
 
       def self.load_config_from_file(args)
         config_file_path = args[:config_file_path]
-        config_file_path = File.expand_path(config_file_path)
-        config_file_path = config_file_path.find { |v| File.exists?(v) } if config_file_path.is_a?(Array)
+        config_file_path = [*config_file_path].find { |v| File.exists?(File.expand_path(v)) }
         raise "Missing Config File. '#{config_file_path}'" unless config_file_path && !config_file_path.empty? && File.exists?(config_file_path)
 
         begin

data/lib/envoi/mam/cantemo/agent.rb

@@ -1,3 +1,4 @@
+require 'cantemo/portal/api/client'
 require 'envoi/mam/agent/transfer_client/aspera'
 require 'envoi/mam/agent/transfer_client/s3'
 
@@ -42,57 +43,8 @@ module Envoi
         def initialize_api_client(args = {})
           api_config  = agent_config
           @api_client = args[:api_client] || begin
-
-            api_host               = api_config['host']
-            api_port               = api_config['port']
-            api_host_use_ssl       = api_config['ssl']
-            api_username           = api_config['username']
-            api_password           = api_config['password']
-            api_auth_token         = api_config['api_auth_token']
-            api_base_path          = api_config['api_base_path']
-            api_default_query_data = api_config['default_query_data']
-
-            api_url = api_config['url'] || api_config['uri']
-            if api_url
-              api_uri      = URI(api_url)
-              api_host     ||= api_uri.host
-              api_port     ||= api_uri.port
-              api_userinfo = api_uri.userinfo
-              if api_userinfo
-                _api_username, _api_password = api_userinfo.split(':')
-                api_username                 ||= _api_username
-                api_password                 ||= _api_password
-              end
-              api_host_use_ssl       = api_uri.scheme == 'https' if api_host_use_ssl.nil?
-              api_uri_query          = api_uri.query
-              api_default_query_data ||= Hash[api_uri_query.split('&').map { |kp| kp.split('=') }]
-              api_base_path          ||= api_uri.path
-            end
-
-            api_port      ||= (api_host_use_ssl ? 443 : 80)
-            api_base_path ||= '/'
-
-            api_endpoint_prefix        = 'VSAPI'
-            api_noauth_endpoint_prefix = 'APInoauth'
-
-            client_args                              = {}
-            client_args[:http_host_address]          = api_host if api_host
-            client_args[:http_host_port]             = api_port if api_port
-            client_args[:http_host_use_ssl]          = api_host_use_ssl if api_host_use_ssl
-            client_args[:username]                   = api_username if api_username
-            client_args[:password]                   = api_password if api_password
-            client_args[:default_base_path]          = api_base_path if api_base_path
-            client_args[:default_query_data]         = api_default_query_data if api_default_query_data
-            client_args[:api_endpoint_prefix]        = api_endpoint_prefix
-            client_args[:api_noauth_endpoint_prefix] = api_noauth_endpoint_prefix
-
-            if api_auth_token
-              # Cantemo Portal supports an auth token for authentication, replace basic auth with auth-token
-              client_args[:authorization_header_key]   = 'Auth-Token'
-              client_args[:authorization_header_value] = api_auth_token
-            end
-
-            _client = ::Vidispine::API::Utilities.new(client_args)
+            client_args = Hash[api_config.map { |k,v| [ k.respond_to?(:to_sym) ? k.to_sym.downcase : k, v ]}]
+            _client = Cantemo::Portal::API::Client.new(client_args)
 
             begin
               _client.version

data/lib/envoi/mam/cantemo/agent/watch_folder_manager.rb

@@ -207,14 +207,14 @@ module Envoi::Mam::Cantemo
           if includes && !includes.empty?
             should_include = find_in_patterns(includes, file)
             unless should_include
-              add_to_ignore(wf, file)
+              add_to_ignore(file)
               next
             end
           end
 
           should_exclude = find_in_patterns(excludes, file)
           if should_exclude
-            add_to_ignore(wf, file)
+            add_to_ignore(file)
             next
           end
 
@@ -226,7 +226,7 @@ module Envoi::Mam::Cantemo
             end
             t = Thread.new(wf, file) do |wf, file|
               begin
-                process_file(wf, file)
+                process_file(file)
               rescue => e
                 logger.error { "Exception '#{e.message}' in thread for `#{wf.name || wf.paths}` `#{file.path}`. " }
                 raise e
@@ -237,7 +237,7 @@ module Envoi::Mam::Cantemo
             t.join
             active_processors[file] = t if file.processing
           else
-            process_file(wf, file)
+            process_file(file)
           end
 
         end

data/lib/envoi/watch_folder_utility/watch_folder.rb

@@ -222,6 +222,8 @@ module Envoi
         logger.debug { "Initializing parameter 'import args'." }
         import_args = watch_folder_def['import_args'] || { }
         import_options = watch_folder_def['import_options'] || { }
+        import_args = Hash[import_args.map { |k,v| [ k.respond_to?(:to_sym) ? k.to_sym.downcase : k, v ] }]
+        import_options = Hash[import_options.map { |k,v| [ k.respond_to?(:to_sym) ? k.to_sym.downcase : k, v ] }]
 
         add_item_to_collection = import_options.fetch(:add_item_to_collection, import_args[:add_item_to_collection])
         if add_item_to_collection.nil? || add_item_to_collection

data/lib/envoi/watch_folder_utility/watch_folder/handler/listen.rb

@@ -92,6 +92,7 @@ module Envoi
             process_definition(@definition)
             initialize_listener
             logger.debug ( "Watch Folder Handler '#{self.class.name}' Initialized. ")
+            perform_initial_inventory
           end
 
           def initialize_logger(args = { })
@@ -187,7 +188,7 @@ module Envoi
           end
 
           def add_to_ignore(file)
-            @ignored_files_map[file.path] = file
+            ignored_files_map[file.path] = file
           end
 
           # Really this is just for debugging as polling isn't used to determine file stability

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cantemo-portal-agent
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - John Whitson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asperalm
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +151,7 @@ files:
 - lib/cantemo/portal/agent/cli/commands/watch_folders-working.rb
 - lib/cantemo/portal/agent/cli/commands/watch_folders.rb
 - lib/cantemo/portal/agent/version.rb
+- lib/cantemo/portal/api/client.rb
 - lib/envoi/aspera/watch_service/client.rb
 - lib/envoi/aspera/watch_service/snapshot.rb
 - lib/envoi/aspera/watch_service/subscription.rb