flickrup 1.1.19 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d16f491f4af96fb33ad7fb5966a64f8af6a76c8
-  data.tar.gz: 0e66db279ca1f1ced83b54fe7503782eb229e29b
+  metadata.gz: 6064076ba6e37057c4702f7312bf8662eca5867c
+  data.tar.gz: ade69f6716c47355ceab8c591aa9701ef583dd19
 SHA512:
-  metadata.gz: 5a1780707987e726e96924dd4319fc81d172b4694d414a931e44fb3b1dbd07347903d8025bc793fe3f4d4194a7164174024f149f5b1ed43cc1193238f7ea1b2c
-  data.tar.gz: 80ae501a3f7bf8b8b7597ef8da2dd77ee77488c96637e6372ad93c3dfec5824d0f429d309c6f5539a0b7a951ca97aade9a149bed242921f5fba4d1a03f7d5a38
+  metadata.gz: 1efc5a139027b23c1ae00522bd47d4467d28a84a41053df7f510abeab28a542be2cb4a2c2903c6f4aebd2c13bd8f4c03db4d147bba0702814c01185655c1d25f
+  data.tar.gz: 6b05b6de69d4f84b3ac1e3d2b008c5608df7d67f6052e94cded816fbe7918660490e7a271e3303524cb85e8a93a8c1165637fc2fc8301a4a592eb8a44e9bb3a1

data/lib/flickrup/ext/blocked_tags.rb

@@ -0,0 +1,24 @@
+class BlockedTags
+  include Logging
+
+  def initialize(config)
+    @config = config
+  end
+
+  def preupload(ctx)
+
+    blockers = @config[:blocked_tags]
+
+    if blockers != nil
+      blockers.each do |tag_name, tag_value|
+        if ctx.file[tag_name] == tag_value
+          #block
+          logger.info("Blocking upload on #{ctx.properties[:filename]} as #{tag_name}=#{tag_value}")
+          return nil
+        end
+      end
+    end
+
+    ctx
+  end
+end

data/lib/flickrup/ext/replacement_tags.rb

@@ -6,15 +6,23 @@ class ReplacementTags
   def preupload(ctx)
 
     replacements = @config[:tag_replacements]
+    all_tags = ctx.file.tags
 
     if replacements != nil
       replacements.each do |tag_name, tag_value_replacements|
         existing = ctx.file[tag_name]
 
         tag_value_replacements.each do |key, value|
-          if existing == key
-            ctx.file[tag_name] = value
-            break
+          if key.start_with? '$'
+            if all_tags.include? key[1..-1]
+              ctx.file[tag_name] = value
+              break
+            end
+          else
+            if existing == key
+              ctx.file[tag_name] = value
+              break
+            end
           end
         end
       end

data/lib/flickrup/filetype/tagged_file.rb

@@ -25,13 +25,22 @@ class TaggedFile
   def doUpload(preupload_handlers, uploader)
 
     context = preupload_handlers.reduce(ProcessingContext.new(self)) do |ctx, handler|
-      handler.preupload(ctx)
+      if ctx != nil
+        handler.preupload(ctx)
+      else
+        nil
+      end
     end
 
-    pre_upload
-    uploader.upload(context)
-    post_upload
-  end
+    if context == nil
+      false
+    else
+      pre_upload
+      uploader.upload(context)
+      post_upload
+      true
+    end
+end
 
   def tags
     keywords = self['keywords']

data/lib/flickrup/processor.rb

@@ -6,6 +6,7 @@ require "flickrup/ext/replacement_tags"
 require "flickrup/ext/machine_tags"
 require "flickrup/ext/visibility"
 require "flickrup/ext/sidecar"
+require "flickrup/ext/blocked_tags"
 require "flickrup/archiver"
 require "flickrup/ext/associated_files"
 require 'flickrup/converter'
@@ -82,7 +83,9 @@ class Processor
       tagged.each do |x|
         begin
           logger.info("Beginning upload for #{x.filename}...")
-          x.doUpload(get_preupload_handlers, uploader)
+          unless x.doUpload(get_preupload_handlers, uploader)
+            break #abort
+          end
           logger.info("Upload complete for #{x.filename}")
           logger.info("Beginning archive for #{x.filename}...")
           x.archive(get_archiver, @config[:archive_dir])
@@ -135,7 +138,7 @@ class Processor
   end
 
   def get_preupload_handlers
-    [MachineTags.new(@config, {}), ReplacementTags.new(@config)]
+    [MachineTags.new(@config, {}), ReplacementTags.new(@config), BlockedTags.new(@config)]
   end
 
   def upload_handlers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrup
 version: !ruby/object:Gem::Version
-  version: 1.1.19
+  version: 1.2.2
 platform: ruby
 authors:
 - Jonathan Gilbert
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +132,7 @@ files:
 - lib/flickrup/archiver.rb
 - lib/flickrup/converter.rb
 - lib/flickrup/ext/associated_files.rb
+- lib/flickrup/ext/blocked_tags.rb
 - lib/flickrup/ext/machine_tags.rb
 - lib/flickrup/ext/prefixed_extension.rb
 - lib/flickrup/ext/replacement_tags.rb