flickrup 0.0.11 → 0.0.12

data/lib/flickrup.rb

@@ -41,6 +41,15 @@ module Flickrup
       else
         SlowListener.new(config).run
       end
+
+      # suspend thread so we don't exit immediately
+      @mutex = Mutex.new
+      @running = ConditionVariable.new
+
+      @mutex.synchronize do
+        @running.wait(@mutex)
+      end
+
     end
   end
 end

data/lib/flickrup/ext/replacement_tags.rb

@@ -6,6 +6,7 @@ class ReplacementTags
   def preupload(image, meta, config)
 
     replacements = @config[:tag_replacements]
+    new_config = config
 
     if replacements != nil
       replacements.each do |tag_name, tag_value_replacements|
@@ -14,10 +15,13 @@ class ReplacementTags
         tag_value_replacements.each do |key, value|
           if existing == key
             meta[tag_name] = value
+            new_config = new_config.merge({tag_name => value})
             break
           end
         end
       end
     end
+
+    new_config
   end
 end

data/lib/flickrup/processor.rb

@@ -39,12 +39,12 @@ class Processor
       sleep 5
     else
       tagged.each { |x|
-        logger.debug("Beginning upload for #{tagged.file}...")
+        logger.debug("Beginning upload for #{x.file}...")
         x.doUpload(get_preupload_handlers, uploader)
-        logger.debug("Upload complete for #{tagged.file}")
-        logger.debug("Beginning archive for #{tagged.file}...")
+        logger.debug("Upload complete for #{x.file}")
+        logger.debug("Beginning archive for #{x.file}...")
         x.archive(@config[:archive_dir])
-        logger.debug("Processing complete for #{tagged.file}")
+        logger.debug("Processing complete for #{x.file}")
       }
     end
 

data/lib/flickrup/slow_listener.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'atomic'
+require 'fileutils'
 require 'rufus/scheduler'
 require "flickrup/logging"
 
@@ -32,11 +33,35 @@ class SlowListener
   end
 
   def run
-    logger.debug("Watching #{@config['watch_dir']}...")
-    Listen.to(@config[:watch_dir]) do |modified, added, _|
-      unless modified.empty? && added.empty?
-        on_change
-      end
+    logger.debug("Watching #{@config[:watch_dir]}...")
+    @listener = Listen.to(@config[:watch_dir])
+    @listener.change(&method(:on_change))
+    @listener.start(false)
+
+    logger.debug("Triggering initial run")
+    schedule
+  end
+
+  def schedule
+    previous_state = @processing.swap(SCHEDULED)
+
+    case previous_state
+      when SCHEDULED
+        #ignore, already scheduled
+        logger.debug("Already scheduled")
+      when PROCESSING
+        #ignore, processing thread will reschedule
+        logger.debug("Scheduling queued")
+      when IDLE
+        schedule_internal
+    end
+  end
+
+  private
+  def on_change(modified, added, removed)
+    unless modified.empty? && added.empty?
+      logger.debug("Change detected")
+      schedule
     end
   end
 
@@ -59,32 +84,15 @@ class SlowListener
       @processor.run(old)
     end
 
-    @processing.compare_and_swap(PROCESSING,IDLE)
+    @processing.compare_and_swap(PROCESSING, IDLE)
 
     if @processing.get == SCHEDULED
       logger.debug("Rescheduling...")
-      schedule
+      schedule_internal
     end
   end
 
-  def on_change
-    logger.debug("Change detected")
-
-    previous_state = @processing.swap(SCHEDULED)
-
-    case previous_state
-      when SCHEDULED
-        #ignore, already scheduled
-        logger.debug("Already scheduled")
-      when PROCESSING
-        #ignore, processing thread will reschedule
-        logger.debug("Scheduling queued")
-      when IDLE
-        schedule
-    end
-  end
-
-  def schedule
+  def schedule_internal
     if @scheduler.jobs.empty?
       logger.debug("Scheduling processing for #@wait sec")
       @scheduler.in @wait do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flickrup
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Jonathan Gilbert