flickrup 0.0.14 → 0.1.1

data/lib/flickrup/ext/machine_tags.rb

@@ -3,9 +3,9 @@ class MachineTags
     @config = config
   end
 
-  def preupload(image, meta, config)
+  def preupload(ctx)
 
-    tags = config[:tags]
+    tags = ctx.image.tags
 
     remapped = tags.map do |x|
       x.sub(/^([^:]+):([^:]+)::/,"\\1:\\2=")
@@ -14,11 +14,11 @@ class MachineTags
 
 
     unless tags == remapped #write back to file
-      meta['Keywords'] = remapped
-      meta['Subject'] = remapped #also write Subject XMP tag
+      ctx.image['Keywords'] = remapped
+      ctx.image['Subject'] = remapped #also write Subject XMP tag
     end
 
-    config.merge({:tags => TagSet.new(remapped)})
+    ctx
 
   end
 end

data/lib/flickrup/ext/prefixed_extension.rb

@@ -3,8 +3,8 @@ class PrefixedExtension
     @config = config
   end
 
-  def values(prefix_key, config)
-    all_tags = config[:tags]
+  def values(prefix_key, ctx)
+    all_tags = ctx.image.tags
 
     prefix = @config[prefix_key]
 

data/lib/flickrup/ext/replacement_tags.rb

@@ -3,23 +3,23 @@ class ReplacementTags
     @config = config
   end
 
-  def preupload(image, meta, config)
+  def preupload(ctx)
 
     replacements = @config[:tag_replacements]
 
     if replacements != nil
       replacements.each do |tag_name, tag_value_replacements|
-        existing = meta[tag_name]
+        existing = ctx.image[tag_name]
 
         tag_value_replacements.each do |key, value|
           if existing == key
-            meta[tag_name] = value
+            ctx.image[tag_name] = value
             break
           end
         end
       end
     end
 
-    config
+    ctx
   end
 end

data/lib/flickrup/ext/tag_sets.rb

@@ -7,10 +7,10 @@ class TagSets < PrefixedExtension
     @flickr = context[:flickr_client]
   end
 
-  def upload(image, meta, config)
-    sets = values(:tagsetprefix, config)
+  def upload(ctx)
+    sets = values(:tagsetprefix, ctx)
 
-    uploaded = @delegate.upload(image, meta, config)
+    uploaded = @delegate.upload(ctx)
 
     sets.each do |set|
       @flickr.add_to_set(uploaded, set)

data/lib/flickrup/ext/visibility.rb

@@ -8,8 +8,8 @@ class Visibility < PrefixedExtension
     @delegate = delegate
   end
 
-  def upload(image, meta, config)
-    visibility = values(:visibilityprefix, config)
+  def upload(ctx)
+    visibility = values(:visibilityprefix, ctx)
 
     config_override = if visibility.length == 0
       logger.debug("No visibility specified for #{image}.")
@@ -21,7 +21,7 @@ class Visibility < PrefixedExtension
       config_for_visibility(visibility[0])
     end
 
-    @delegate.upload(image, meta, config.merge(config_override))
+    @delegate.upload(ctx.with_properties(config_override))
   end
 
   def config_for_visibility(visibility)

data/lib/flickrup/processing_context.rb

@@ -0,0 +1,13 @@
+class ProcessingContext
+  attr_reader :image
+  attr_reader :upload_properties
+
+  def initialize(image, props = {})
+    @image = image
+    @upload_properties = props
+  end
+
+  def with_properties(props)
+    ProcessingContext.new(self.image, self.upload_properties.merge(props))
+  end
+end

data/lib/flickrup/processor.rb

@@ -39,12 +39,12 @@ class Processor
       sleep 5
     else
       tagged.each { |x|
-        logger.debug("Beginning upload for #{x.file}...")
+        logger.debug("Beginning upload for #{x.filename}...")
         x.doUpload(get_preupload_handlers, uploader)
-        logger.debug("Upload complete for #{x.file}")
-        logger.debug("Beginning archive for #{x.file}...")
+        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.file}")
+        logger.debug("Processing complete for #{x.filename}")
       }
     end
 

data/lib/flickrup/tagged_image.rb

@@ -2,15 +2,16 @@ require 'mini_exiftool'
 require 'fileutils'
 require "flickrup/logging"
 require "flickrup/tag_set"
+require "flickrup/processing_context"
 
 class TaggedImage
   include Logging
 
-  attr_reader :file
+  attr_reader :filename
 
-  def initialize(file)
-    @file = file
-    @parsed = MiniExiftool.new @file
+  def initialize(filename)
+    @filename = filename
+    @parsed = MiniExiftool.new filename
   end
 
   def tags
@@ -25,8 +26,8 @@ class TaggedImage
 
   def doUpload(preupload_handlers, uploader)
 
-    config = preupload_handlers.reduce({:tags => tags}) do |config, handler|
-      handler.preupload(file, self, config)
+    context = preupload_handlers.reduce(ProcessingContext.new(self)) do |ctx, handler|
+      handler.preupload(ctx)
     end
 
     #maybe save afterwards
@@ -34,7 +35,7 @@ class TaggedImage
       @parsed.save!
     end
 
-    uploader.upload(file, self, config)
+    uploader.upload(context)
 
     #maybe save afterwards
     if @parsed.changed?
@@ -52,8 +53,8 @@ class TaggedImage
     )
 
     FileUtils.mkdir_p(target_dir)
-    FileUtils.mv(@file, File.join(target_dir, File.basename(@file)))
-    logger.info("Archived #{File.basename(@file)} to #{target_dir}")
+    FileUtils.mv(@filename, File.join(target_dir, File.basename(@filename)))
+    logger.info("Archived #{File.basename(@filename)} to #{target_dir}")
   end
 
   # Returns the value of a tag.

data/lib/flickrup/uploader.rb

@@ -14,22 +14,26 @@ class Uploader
     @flickr = flickr_client
   end
 
-  def upload(image, meta, config)
+  def upload(ctx)
 
-    if config[UploaderConstants::NO_UPLOAD]
-      logger.info("Skipping upload of #{image} as marked as NO_UPLOAD")
+    if ctx.upload_properties[UploaderConstants::NO_UPLOAD]
+      logger.info("Skipping upload of #{ctx.image.filename} as marked as NO_UPLOAD")
     else
-      logger.debug("Uploading #{image} with tags #{config[:tags]}")
+      logger.debug("Uploading #{ctx.image.filename} with tags #{ctx.image.tags}")
 
       begin
-        rv = @flickr.upload_photo(image, config)
-        logger.debug("Uploaded #{image}")
+        rv = @flickr.upload_photo(ctx.image.filename, prepare_upload_properties(ctx))
+        logger.debug("Uploaded #{ctx.image.filename}")
       rescue StandardError => err
-        logger.error("Failed to upload #{image}: #{err}")
+        logger.error("Failed to upload #{ctx.image.filename}: #{err}")
       end
     end
 
     rv
   end
 
+  def prepare_upload_properties(ctx)
+    {:tags => ctx.image.tags.to_s}.merge(ctx.upload_properties)
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flickrup
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 25
   prerelease: 
   segments: 
   - 0
-  - 0
-  - 14
-  version: 0.0.14
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jonathan Gilbert
@@ -145,6 +145,7 @@ files:
 - lib/flickrup/ext/visibility.rb
 - lib/flickrup/flickr_client.rb
 - lib/flickrup/logging.rb
+- lib/flickrup/processing_context.rb
 - lib/flickrup/processor.rb
 - lib/flickrup/quick_listener.rb
 - lib/flickrup/slow_listener.rb