flickrup 1.1.4 → 1.1.5

data/lib/flickrup/archiver.rb

@@ -0,0 +1,27 @@
+require "fileutils"
+
+class Archiver
+
+  def archive(ctx)
+    archive_file_by_date(ctx.properties[:filename], ctx.properties[:archive_dir], ctx.properties[:date_taken], ctx.properties[:subdir])
+  end
+
+  private
+
+  def archive_file_by_date(file, to_dir, date, subdir = nil)
+    target_dir = File.join(
+        to_dir,
+        date.strftime("%Y"),
+        date.strftime("%b")
+    )
+
+    if subdir
+      target_dir = "#{target_dir}/#{subdir}"
+    end
+
+    FileUtils.mkdir_p(target_dir)
+    FileUtils.mv(file, File.join(target_dir, File.basename(file)))
+    logger.info("Archived #{File.basename(file)} to #{target_dir}")
+  end
+
+end

data/lib/flickrup/ext/tag_sets.rb

@@ -15,9 +15,20 @@ class TagSets < PrefixedExtension
 
     uploaded = @delegate.upload(ctx)
 
-    sets.each do |set|
-      logger.debug("Adding #{ctx.file.filename} to set: #{set}")
-      @flickr.add_to_set(uploaded, set)
+    unless ctx.properties[UploaderConstants::NO_UPLOAD] == true
+      sets.each do |set|
+        logger.debug("Adding #{ctx.file.filename} to set: #{set}")
+        @flickr.add_to_set(uploaded, set)
+      end
     end
   end
+
+  def archive(ctx)
+    sets = values(:tagsetprefix, ctx).uniq
+
+    if sets.length == 1
+      ctx.properties[:subdir] = sets[0]
+    end
+    @delegate.archive(ctx)
+  end
 end

data/lib/flickrup/filetype/tagged_file.rb

@@ -44,9 +44,12 @@ class TaggedFile
                end)
   end
 
-  def archive(to_dir)
-    date_taken = @parsed.date_time_original || @parsed.modifydate
-    archive_by_date(to_dir, date_taken)
+  def archive(archive_handlers, to_dir)
+    archive_handlers.archive(ProcessingContext.new(self, {
+        :archive_dir => to_dir,
+        :date_taken => @parsed.date_time_original || @parsed.modifydate,
+        :filename => @filename
+    }))
   end
 
   def pre_upload
@@ -56,25 +59,6 @@ class TaggedFile
   def post_upload
 
   end
-
-  private
-
-  def archive_by_date(to_dir, date)
-    archive_file_by_date(@filename, to_dir, date)
-  end
-
-  def archive_file_by_date(file, to_dir, date)
-    target_dir = File.join(
-        to_dir,
-        date.strftime("%Y"),
-        date.strftime("%b")
-    )
-
-    FileUtils.mkdir_p(target_dir)
-    FileUtils.mv(file, File.join(target_dir, File.basename(file)))
-    logger.info("Archived #{File.basename(file)} to #{target_dir}")
-  end
-
 end
 
 require 'flickrup/filetype/tagged_image'

data/lib/flickrup/processing_context.rb

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

data/lib/flickrup/processor.rb

@@ -5,6 +5,7 @@ require "flickrup/ext/tag_sets"
 require "flickrup/ext/replacement_tags"
 require "flickrup/ext/machine_tags"
 require "flickrup/ext/visibility"
+require "flickrup/archiver"
 
 class Processor
   include Logging
@@ -55,7 +56,7 @@ class Processor
           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])
+          x.archive(get_archiver, @config[:archive_dir])
           logger.debug("Processing complete for #{x.filename}")
         rescue => e
           logger.error("Failed to process #{x.filename} due to exception: #{e}")
@@ -82,13 +83,23 @@ class Processor
     end
   end
 
+  def get_archiver
+    archive_handlers.reduce(Archiver.new) do |result, clazz|
+      clazz.new(@config, result, {})
+    end
+  end
+
   def get_preupload_handlers
     [MachineTags.new(@config, {}), ReplacementTags.new(@config)]
   end
 
-  def upload_handlers()
+  def upload_handlers
     [TagSets, Visibility]
   end
 
+  def archive_handlers
+    [TagSets]
+  end
+
 end
 

data/lib/flickrup/uploader.rb

@@ -16,7 +16,7 @@ class Uploader
 
   def upload(ctx)
 
-    if ctx.upload_properties[UploaderConstants::NO_UPLOAD]
+    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}")
@@ -33,7 +33,7 @@ class Uploader
   end
 
   def prepare_upload_properties(ctx)
-    {:tags => ctx.file.tags.to_s}.merge(ctx.upload_properties)
+    {:tags => ctx.file.tags.to_s}.merge(ctx.properties)
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flickrup
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Jonathan Gilbert
@@ -154,6 +154,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/flickrup/archiver.rb
 - lib/flickrup/ext/machine_tags.rb
 - lib/flickrup/ext/prefixed_extension.rb
 - lib/flickrup/ext/replacement_tags.rb