flickrup 0.0.2 → 0.0.3

data/lib/flickrup/slow_listener.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'atomic'
 require 'rufus/scheduler'
 require "flickrup/logging"
 
@@ -17,12 +18,17 @@ require "flickrup/logging"
 class SlowListener
   include Logging
 
-  WAIT = 5#*60 #5 min
+  IDLE = -1
+  PROCESSING = 0
+  CHANGES_QUEUED = 1
 
   def initialize(config)
+    @wait = config[:timeout]
+    logger.debug("Timeout set to #@wait secs")
     @config = config
     @scheduler = Rufus::Scheduler.start_new
     @processor = Processor.new(config)
+    @processing = Atomic.new IDLE
   end
 
   def run
@@ -38,15 +44,28 @@ class SlowListener
     logger.debug("Checking files for upload")
     files = Dir["#{@config['watch_dir']}/*.{jpg,JPG,jpeg,JPEG}"]
 
-    old, new = files.partition { |x| Time.now > File.mtime(x) + WAIT }
+    old, new = files.partition { |x| Time.now > File.mtime(x) + @wait }
+
+    reschedule = false
 
     unless old.empty?
       logger.debug("Found #{old.length} stable files")
+      @processing.set PROCESSING
       @processor.run(old)
+      changes = @processing.swap IDLE
+      if changes > 0
+        logger.debug("Changes occurred while processing")
+        reschedule = true
+      end
     end
 
     unless new.empty?
       logger.debug("Found #{new.length} new files")
+      reschedule = true
+    end
+
+    if reschedule
+      logger.debug("Rescheduling...")
       #todo: schedule for latest
       schedule
     end
@@ -54,15 +73,41 @@ class SlowListener
 
   def on_change
     logger.debug("Change detected")
-    schedule
+
+    current_state = @processing.get
+    was_processing = @processing.compare_and_swap(PROCESSING, CHANGES_QUEUED)
+
+    if was_processing
+      case current_state
+        when IDLE
+          on_change #retry
+        when CHANGES_QUEUED
+          on_change #retry
+        when PROCESSING
+          logger.debug("Scheduling queued") # already queued changes
+      end
+    else #wasn't processing
+      case current_state
+        when IDLE
+          schedule
+        when CHANGES_QUEUED
+          logger.debug("Scheduling already queued") # already queued changes
+        when PROCESSING
+          on_change #retry
+      end
+    end
   end
 
   def schedule
     if @scheduler.jobs.empty?
-      logger.debug("Scheduling processing for #{WAIT} sec")
-      @scheduler.in WAIT do
-        do_upload
+      logger.debug("Scheduling processing for #@wait sec")
+      @scheduler.in @wait do
+        if @processing.get == IDLE
+          do_upload
+        end
       end
+    else
+      logger.debug("Already scheduled")
     end
   end
 

data/lib/flickrup.rb

@@ -25,11 +25,12 @@ module Flickrup
         opt :nowait, "Upload immediately on change, no delay"
         opt :loglevel, "Logging level", :type => :string, :default => "INFO"
         opt :config, "Configuration file", :type => :string, :default => './flickrup.yml'
+        opt :timeout, "Timeout/Wait for file modification", :default => 5*60
       end
 
       logger.level = Logger::Severity.const_get(opts.loglevel)
 
-      config = YAML::load(File.open(opts.config, "r"))
+      config = YAML::load(File.open(opts.config, "r")).merge opts
 
       if opts.once
         Processor.new(config).run

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flickrup
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jonathan Gilbert
@@ -98,9 +98,25 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: trollop
+  name: json
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 7
+        - 0
+        version: 1.7.0
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: trollop
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -112,7 +128,7 @@ dependencies:
         - 0
         version: 2.0.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 description: Flickr auto uploading script
 email: bb..jgilbert@xoxy.net
 executables: