cantemo-portal-agent 1.1.1 → 1.2.0

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

@@ -77,7 +77,7 @@ module Envoi
 
           def initialize(args = { })
             initialize_logger(args)
-            logger.debug { "Initializing Watch Folder. Args: #{args}" }
+            logger.debug { "Initializing Watch Folder Handler '#{self.class.name}'. Args: #{args}" }
 
             @definition = args[:definition]
             raise ArgumentError, "Definition is a required argument." unless definition
@@ -91,23 +91,7 @@ module Envoi
 
             process_definition(@definition)
             initialize_listener
-          end
-
-          def process_definition(work_folder_def)
-            # @paths = [ File.expand_path('~/watch_folders/aspera') ]
-            @paths = definition['paths'] || []
-            path = definition['path']
-            @paths << path if path && !@paths.include?(path)
-
-            # @quarantine_directory_path = definition['quarantine_directory_path'] || definition['quarantine_path']
-            @poll_interval = definition['poll_interval'] || 15
-            @min_stable_poll_count = definition['minimum_stable_poll_count'] || 3
-            @min_stable_time = definition['minimum_stable_time']
-            if @min_stable_time.nil? && @min_stable_poll_count && @min_stable_time
-              @min_stable_time = @poll_interval * @min_stable_poll_count
-            end
-            @processing_limit = definition['processing_limit'] || 10
-
+            logger.debug ( "Watch Folder Handler '#{self.class.name}' Initialized. ")
           end
 
           def initialize_logger(args = { })
@@ -120,11 +104,28 @@ module Envoi
             @logger
           end
 
+          def process_definition(watch_folder_def)
+            # @paths = [ File.expand_path('~/watch_folders/aspera') ]
+            @paths = watch_folder_def['paths'] || []
+            path = watch_folder_def['path']
+            @paths << path if path && !@paths.include?(path)
+
+            # @quarantine_directory_path = definition['quarantine_directory_path'] || definition['quarantine_path']
+            @poll_interval = watch_folder_def['poll_interval'] || 15
+            @min_stable_poll_count = watch_folder_def['minimum_stable_poll_count'] || 3
+            @min_stable_time = watch_folder_def['minimum_stable_time']
+            if @min_stable_time.nil? && @min_stable_poll_count && @min_stable_time
+              @min_stable_time = @poll_interval * @min_stable_poll_count
+            end
+            @processing_limit = watch_folder_def['processing_limit'] || 10
+          end
+
           def process_deleted_path(path)
             return path.each { |path| process_deleted_path(path, event_type) } if path.is_a?(Array)
             logger.debug { "PATH #{:deleted} '#{path}'" }
             file = known_path_map[path]
             known_path_map.delete(path)
+            ignored_files_map.delete(path)
             return unless file
             file.event_type = :deleted
             file.event_timestamp = Time.now
@@ -144,11 +145,6 @@ module Envoi
           end
 
           def initialize_listener(args = { })
-            # @directories = directories.map do |directory|
-            #   Pathname.new(directory.to_s).realpath
-            # end
-
-
             @listener = ::Listen.to(*paths, {}) do |m, a, r|
               if !r.empty?
                 log "#{r.length} file(s) removed."
@@ -166,10 +162,15 @@ module Envoi
               end
 
             end
+          end
+
+          # Listen doesn't perform an initial inventory by default so this method will pick up
+          # any files that are already present
+          def perform_initial_inventory
             _config = @listener.instance_variable_get(:@backend).instance_variable_get(:@adapter).config
+            # change_config = ::Listen::Change::Config.new(_config.queue, _config.silencer)
 
             _snapshots ||= {}
-            # change_config = ::Listen::Change::Config.new(_config.queue, _config.silencer)
             _config.directories.each do |dir|
               record = ::Listen::Record.new(dir)
               record.build
@@ -185,55 +186,27 @@ module Envoi
             # pp _snapshots
           end
 
-          def log(message)
-            puts "#{Time.now} #{message}"
-          end
-
           def add_to_ignore(file)
             @ignored_files_map[file.path] = file
           end
 
-          # def handle_stable_file(file, quarantine_directory_path = @quarantine_directory_path)
-          #   full_file_path = file[:path]
-          #   logger.info { "Processing File Path: #{full_file_path}..." }
-          #   if true
-          #     FileUtils.rm full_file_path
-          #   else
-          #     if quarantine_directory_path
-          #       FileUtils.mv full_file_path, quarantine_directory_path
-          #     end
-          #   end
-          # end
-
+          # Really this is just for debugging as polling isn't used to determine file stability
           def poll(options = { })
             should_increment_counter = options.fetch(:should_increment_counter, true)
 
             @previous_poll_time = @last_poll_time
             @last_poll_time = Time.now
+
             lock.synchronize do
               @known_path_map.each do |fp, f|
                 next if f.ignore?
                 next unless f.exist?
 
                 logger.debug { "Incrementing Stable Stats: #{f.summary}" }
-
-                f.last_poll_time ||= Time.now
+                f.last_poll_time = Time.now
                 f[:stable_poll_count] += 1 if should_increment_counter
-
-                #
-                # if @min_stable_time
-                #   if (Time.now - f.event_timestamp) >= @min_stable_time
-                #     is_stable = true
-                #   end
-                # else
-                #   if f[:stable_poll_count] >= @min_stable_poll_count
-                #     is_stable = true
-                #     # handle_stable_file(f)
-                #   end
-                # end
               end
             end
-            stable_files
           end
 
           def stable_files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cantemo-portal-agent
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - John Whitson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asperalm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,7 @@ files:
 - exe/cantemo-portal-agent
 - lib/cantemo/portal/agent.rb
 - lib/cantemo/portal/agent/WatchFolderUtility/foreman.rb
+- lib/cantemo/portal/agent/cli/commands/watch_folder.rb
 - 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
@@ -188,6 +189,7 @@ files:
 - lib/envoi/mam/vdms/agent.rb
 - lib/envoi/mam/vidispine/agent.rb
 - lib/envoi/mam/wiredrive/agent.rb
+- lib/envoi/watch_folder_utility/watch_folder.rb
 - lib/envoi/watch_folder_utility/watch_folder/handler/listen.rb
 homepage: http://www.github.com/XPlatform-Consulting/envoi-mam-agent
 licenses: