flickrup 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cf00d5e06e1040fcb91f22dd3adbf98e021eccd
-  data.tar.gz: 5a7ff215c6c855c7b1e9729a314615576b2566dd
+  metadata.gz: 9e247e63e1fac467bc9d27272ad316cfb165f282
+  data.tar.gz: e11a2bf0c5743f0dd1dde45adfd1abb262a58f97
 SHA512:
-  metadata.gz: c42623b7aa0a056f8355f9196da70dff88df2b92468a31e604152319fd8dd4d8a1ff61cfe7f4ed1a355d2d08ee1066b1c292819ef81c7c7d3667e2346b5e47c9
-  data.tar.gz: df6fc21ca10a54ea3ad683be0a87f21718b7fdacc4fe647d3ea644b08f6d3418f81ea9f573a2e72b99a5c8e627366d0a84db967992e3197e80892b48c0e7b83b
+  metadata.gz: e06f94572bb304fac2e04ffe5aa7c36de1a8e83f9258fb6fe93e2283d931a877ba7b15794b5a14008b2f60f7543ebe435956ca3d5b8c28e4895e1694a94327b3
+  data.tar.gz: 5d9546bf8e4cc8b9f3b0886bb7cd6fd2aa081aa58b1220e2594b816f34d219e469e263293778d138cf6bc0270fc04d2c4efd4cf717549c428a47863c9ae715fe

data/lib/flickrup/processor.rb

@@ -22,10 +22,10 @@ class Processor
 
   def run(all_files = Dir["#{@config[:watch_dir]}/*.*"])
 
-    logger.debug("Processing #{all_files.length} files")
+    logger.info("Processing #{all_files.length} files")
 
     if paused
-      logger.debug("Paused detected, so skipping processing...")
+      logger.info("Paused detected, so skipping processing...")
       return 0
     end
 
@@ -34,7 +34,7 @@ class Processor
       if File.exist? x
         TaggedFile.create(x)
       else
-        nil
+        logger.debug("File #{x} already removed, skipping.")
       end
     }.compact
 
@@ -44,7 +44,7 @@ class Processor
       !(x.tags.nil? || x.tags.empty?)
     }
 
-    logger.debug("Selected #{tagged.length} files for upload")
+    logger.info("Selected #{tagged.length} files for upload")
 
     uploader = get_uploader
 
@@ -54,20 +54,20 @@ class Processor
     else
       tagged.each do |x|
         begin
-          logger.debug("Beginning upload for #{x.filename}...")
+          logger.info("Beginning upload for #{x.filename}...")
           x.doUpload(get_preupload_handlers, uploader)
-          logger.debug("Upload complete for #{x.filename}")
-          logger.debug("Beginning archive for #{x.filename}...")
+          logger.info("Upload complete for #{x.filename}")
+          logger.info("Beginning archive for #{x.filename}...")
           x.archive(get_archiver, @config[:archive_dir])
-          logger.debug("Processing complete for #{x.filename}")
+          logger.info("Processing complete for #{x.filename}")
         rescue => e
           logger.error("Failed to process #{x.filename} due to exception: #{e}")
-          logger.debug(e.backtrace.join("\n"))
+          logger.info(e.backtrace.join("\n"))
         end
       end
     end
 
-    logger.debug("Processed #{tagged.length} valid files")
+    logger.info("Processed #{tagged.length} valid files")
 
     tagged.length
   end

data/lib/flickrup/slow_listener.rb

@@ -25,7 +25,7 @@ class SlowListener
 
   def initialize(config)
     @wait = config[:timeout]
-    logger.debug("Timeout set to #@wait secs")
+    logger.info("Timeout set to #@wait secs")
     @config = config
     @scheduler = Rufus::Scheduler.start_new
     @processor = Processor.new(config)
@@ -38,7 +38,7 @@ class SlowListener
     @listener.change(&method(:on_change))
     @listener.start
 
-    logger.debug("Triggering initial run")
+    logger.info("Triggering initial run")
     schedule
   end
 
@@ -48,10 +48,10 @@ class SlowListener
     case previous_state
       when SCHEDULED
         #ignore, already scheduled
-        logger.debug("Already scheduled")
+        logger.info("Already scheduled")
       when PROCESSING
         #ignore, processing thread will reschedule
-        logger.debug("Scheduling queued")
+        logger.info("Scheduling queued")
       when IDLE
         schedule_internal
     end
@@ -60,13 +60,13 @@ class SlowListener
   private
   def on_change(modified, added, removed)
     unless modified.empty? && added.empty?
-      logger.debug("Change detected")
+      logger.info("Change detected")
       schedule
     end
   end
 
   def do_upload
-    logger.debug("Checking files for upload")
+    logger.info("Checking files for upload")
 
     @processing.set PROCESSING
 
@@ -75,31 +75,31 @@ class SlowListener
     old, new = files.partition { |x| Time.now > File.mtime(x) + @wait }
 
     unless new.empty?
-      logger.debug("Found #{new.length} new files")
+      logger.info("Found #{new.length} new files")
       @processing.set SCHEDULED
     end
 
     unless old.empty?
-      logger.debug("Found #{old.length} stable files")
+      logger.info("Found #{old.length} stable files")
       @processor.run(old)
     end
 
     @processing.compare_and_swap(PROCESSING, IDLE)
 
     if @processing.get == SCHEDULED
-      logger.debug("Rescheduling...")
+      logger.info("Rescheduling...")
       schedule_internal
     end
   end
 
   def schedule_internal
     if @scheduler.jobs.empty?
-      logger.debug("Scheduling processing for #@wait sec")
+      logger.info("Scheduling processing for #@wait sec")
       @scheduler.in @wait do
         do_upload
       end
     else
-      logger.debug("Already scheduled")
+      logger.info("Already scheduled")
     end
   end
 

data/lib/flickrup/uploader.rb

@@ -19,11 +19,11 @@ class Uploader
     if ctx.properties[UploaderConstants::NO_UPLOAD]
       logger.info("Skipping upload of #{ctx.file.filename} as marked as NO_UPLOAD")
     else
-      logger.debug("Uploading #{ctx.file.filename} with tags #{ctx.file.tags}")
+      logger.info("Uploading #{ctx.file.filename} with tags #{ctx.file.tags}")
 
       begin
         rv = @flickr.upload_photo(ctx.file.filename, prepare_upload_properties(ctx))
-        logger.debug("Uploaded #{ctx.file.filename}")
+        logger.info("Uploaded #{ctx.file.filename}")
       rescue StandardError => err
         logger.error("Failed to upload #{ctx.file.filename}: #{err}")
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrup
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Jonathan Gilbert
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Flickr Uploader!