flickrup 0.1.5 → 0.1.6

data/lib/flickrup/ext/tag_sets.rb

@@ -1,6 +1,9 @@
 require "flickrup/ext/prefixed_extension"
+require "flickrup/logging"
 
 class TagSets < PrefixedExtension
+  include Logging
+
   def initialize(config, delegate, context)
     super(config)
     @delegate = delegate
@@ -13,6 +16,7 @@ class TagSets < PrefixedExtension
     uploaded = @delegate.upload(ctx)
 
     sets.each do |set|
+      logger.debug("Adding #{ctx.image.filename} to set: #{set}")
       @flickr.add_to_set(uploaded, set)
     end
   end

data/lib/flickrup/processor.rb

@@ -38,14 +38,18 @@ class Processor
       logger.info("Would now upload & move #{tagged.length} files, pausing for 5 secs instead")
       sleep 5
     else
-      tagged.each { |x|
-        logger.debug("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}...")
-        x.archive(@config[:archive_dir])
-        logger.debug("Processing complete for #{x.filename}")
-      }
+      tagged.each do |x|
+        begin
+          logger.debug("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}...")
+          x.archive(@config[:archive_dir])
+          logger.debug("Processing complete for #{x.filename}")
+        rescue => e
+          logger.error("Failed to process #{x.filename} due to exception: #{e}")
+        end
+      end
     end
 
     logger.debug("Processed #{tagged.length} valid files")
@@ -70,7 +74,9 @@ class Processor
     [MachineTags.new(@config, {}), ReplacementTags.new(@config)]
   end
 
-  def upload_handlers() [TagSets, Visibility] end
+  def upload_handlers()
+    [TagSets, Visibility]
+  end
 
 end
 

data/lib/flickrup/tagged_image.rb

@@ -50,7 +50,7 @@ class TaggedImage
     target_dir = File.join(
         to_dir,
         date_taken.strftime("%y"),
-        date_taken.strftime("%m")
+        date_taken.strftime("%b")
     )
 
     FileUtils.mkdir_p(target_dir)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flickrup
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jonathan Gilbert