file_monitoring 1.0.3 → 1.1.0

data/lib/file_monitoring.rb

@@ -18,7 +18,7 @@ module FileMonitoring
   Params.path('default_monitoring_log_path', '~/.bbfs/log/file_monitoring.log',
               'Default path for file monitoring log file. ' \
               'This log containd track of changes found during monitoring')
-  Params.complex('monitoring_paths', nil, 'Array of Hashes with 3 fields: ' \
+  Params.complex('monitoring_paths', [], 'Array of Hashes with 3 fields: ' \
                  'path, scan_period and stable_state.')
 
   # @see FileMonitoring#monitor_files

data/lib/file_monitoring/file_monitoring.rb

@@ -9,6 +9,18 @@ module FileMonitoring
   # Manages file monitoring of number of file system locations
   class FileMonitoring
 
+    def initialize (dynamic_content_data)
+      @content_data_cache = Set.new
+      dynamic_content_data.each_instance(){
+          |checksum, size, content_modification_time,
+           instance_modification_time, server, file_path|
+        # save files to cache
+        Log.info("File in cache: #{file_path}")
+        @content_data_cache.add(file_path)
+      }
+    end
+
+
     # Set event queue used for communication between different proceses.
     # @param queue [Queue]
     def set_event_queue(queue)
@@ -28,14 +40,13 @@ module FileMonitoring
     # that provides path and file monitoring configuration data
     def monitor_files
       conf_array = Params['monitoring_paths']
-
       # Directories states stored in the priority queue,
       # where the key (priority) is a time when it should be checked next time.
       # Priority queue means that all entries arranged by key (time to check) in increasing order.
       pq = Containers::PriorityQueue.new
       conf_array.each { |elem|
         priority = (Time.now + elem['scan_period']).to_i
-        dir_stat = DirStat.new(File.expand_path(elem['path']), elem['stable_state'])
+        dir_stat = DirStat.new(File.expand_path(elem['path']), elem['stable_state'], @content_data_cache, FileStatEnum::NON_EXISTING)
         dir_stat.set_event_queue(@event_queue) if @event_queue
         Log.debug1 "File monitoring started for: #{elem}"
         pq.push([priority, elem, dir_stat], -priority)
@@ -66,7 +77,6 @@ module FileMonitoring
         # pull entry that should be checked next,
         # according to it's scan_period
         time, conf, dir_stat = pq.pop
-
         # time remains to wait before directory should be checked
         time_span = time - Time.now.to_i
         if (time_span > 0)

data/lib/file_monitoring/monitor_path.rb

@@ -1,3 +1,4 @@
+require 'content_server/globals'
 require 'log'
 require 'params'
 
@@ -10,6 +11,8 @@ module FileMonitoring
   # * <tt>CHANGED</tt> - State was changed between two checks
   # * <tt>UNCHANGED</tt> - Opposite to CHANGED
   # * <tt>STABLE</tt> - Entity is in the UNCHANGED state for a defined (by user) number of iterations
+
+
   class FileStatEnum
     NON_EXISTING = "NON_EXISTING"
     NEW = "NEW"
@@ -31,25 +34,24 @@ module FileMonitoring
     #
     # * <tt>path</tt> - File location
     # * <tt>stable_state</tt> - Number of iterations to move unchanged file to stable state
-    def initialize(path, stable_state = DEFAULT_STABLE_STATE)
+    def initialize(path, stable_state = DEFAULT_STABLE_STATE, content_data_cache, state)
       ObjectSpace.define_finalizer(self,
                                    self.class.method(:finalize).to_proc)
       if Params['enable_monitoring']
-        Params['process_vars'].inc('obj add FileStat')
+        ::ContentServer::Globals.process_vars.inc('obj add FileStat')
       end
       @path ||= path
       @size = nil
       @creation_time = nil
       @modification_time = nil
       @cycles = 0  # number of iterations from the last file modification
-      @state = FileStatEnum::NON_EXISTING
-
+      @state = state
       @stable_state = stable_state  # number of iteration to move unchanged file to stable state
     end
 
     def self.finalize(id)
       if Params['enable_monitoring']
-        Params['process_vars'].inc('obj rem FileStat')
+        ::ContentServer::Globals.process_vars.inc('obj rem FileStat')
       end
     end
 
@@ -121,7 +123,8 @@ module FileMonitoring
         end
         if (!@event_queue.nil?)
           Log.debug1 "Writing to event queue [#{self.state}, #{self.path}]"
-          @event_queue.push([self.state, self.instance_of?(DirStat), self.path])
+          @event_queue.push([self.state, self.instance_of?(DirStat), self.path,
+                             self.modification_time, self.size])
         end
       end
     end
@@ -144,23 +147,24 @@ module FileMonitoring
     #
     # * <tt>path</tt> - File location
     # * <tt>stable_state</tt> - Number of iterations to move unchanged directory to stable state
-    def initialize(path, stable_state = DEFAULT_STABLE_STATE)
+    def initialize(path, stable_state = DEFAULT_STABLE_STATE, content_data_cache, state)
       ObjectSpace.define_finalizer(self,
                                    self.class.method(:finalize).to_proc)
       if Params['enable_monitoring']
-        Params['process_vars'].inc('obj add DirStat')
+        ::ContentServer::Globals.process_vars.inc('obj add DirStat')
       end
       super
       @dirs = nil
       @files = nil
       @non_utf8_paths = {}
+      @content_data_cache = content_data_cache
       ObjectSpace.define_finalizer(self,
                                    self.class.method(:finalize).to_proc)
     end
 
     def self.finalize(id)
       if Params['enable_monitoring']
-        Params['process_vars'].inc('obj rem DirStat')
+        ::ContentServer::Globals.process_vars.inc('obj rem DirStat')
       end
     end
 
@@ -289,7 +293,7 @@ module FileMonitoring
                                   # change state only for existing directories
                                   # newly added directories have to remain with NEW state
             was_changed = true
-            ds = DirStat.new(file, self.stable_state)
+            ds = DirStat.new(file, self.stable_state, @content_data_cache, FileStatEnum::NON_EXISTING)
             ds.set_event_queue(@event_queue) unless @event_queue.nil?
             ds.monitor
             add_dir(ds)
@@ -299,7 +303,13 @@ module FileMonitoring
                                   # change state only for existing directories
                                   # newly added directories have to remain with NEW state
             was_changed = true
-            fs = FileStat.new(file, self.stable_state)
+            # check if file exist in content data cache - set state to STABLE
+            file_state = FileStatEnum::NON_EXISTING
+            if !@content_data_cache.nil? && @content_data_cache.include?(file)
+              file_state = FileStatEnum::STABLE
+            end
+            fs = FileStat.new(file, self.stable_state, @content_data_cache, file_state)
+
             fs.set_event_queue(@event_queue) unless @event_queue.nil?
             fs.monitor
             add_file(fs)

data/lib/file_monitoring/version.rb

@@ -1,3 +1,3 @@
 module FileMonitoring
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file_monitoring
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: