flickrup 1.1.5 → 1.1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b679524ad70fe188228c5e7fef9cefceae0c3ae9
+  data.tar.gz: d519b914281f79c1b02910c760b6f6a4ac803111
+SHA512:
+  metadata.gz: ee89a6391785130f046a79ed747194e91a618f34ac95ec282f64a672ee0b8f62d4b595bb480a4c38a094b33c5300649e9e362aea0e84951287fd6fc94cb48a78
+  data.tar.gz: a475d32e8ad4a217e1136fca958e32edddb8f3d60e6bc8a5f51aa9b073b6e502eb10375bc8cede4345002bd21437903b9c7b1c66ddf7ef3ca8e878bec6bf74a3

data/bin/flickrup

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-#require 'rubygems'
+require 'rubygems'
 require 'flickrup'
 
-Flickrup.run_cmd(ARGV)
+Flickrup.run_cmd(ARGV)

data/lib/flickrup/archiver.rb

@@ -1,6 +1,7 @@
 require "fileutils"
 
 class Archiver
+  include Logging
 
   def archive(ctx)
     archive_file_by_date(ctx.properties[:filename], ctx.properties[:archive_dir], ctx.properties[:date_taken], ctx.properties[:subdir])

data/lib/flickrup/ext/associated_files.rb

@@ -0,0 +1,25 @@
+class AssociatedFiles
+
+  def initialize(config, delegate, context)
+    @delegate = delegate
+    @replacements = config[:associated_files].map do |x|
+      extract_pair(x)
+    end
+  end
+
+  def archive(ctx)
+    @delegate.archive(ctx)
+    @replacements.map do |x|
+      other = ctx.properties[:filename].gsub(*x)
+      if File.exist? other
+        @delegate.archive(ctx.with_properties({:filename => other}))
+      end
+    end
+  end
+
+  private
+  def extract_pair(pair_string)
+    items = pair_string[1..-1].split(pair_string[0])
+    [Regexp.new("(?#{items[2]}:#{items[0]})"), items[1]]
+  end
+end

data/lib/flickrup/ext/sidecar.rb

@@ -0,0 +1,28 @@
+require 'tempfile'
+
+class Sidecar
+  def initialize(config, delegate, context)
+    @delegate = delegate
+  end
+
+  def archive(ctx)
+    @delegate.archive(ctx)
+
+    if ctx.file.type == TaggedVideo::TYPE
+      file = write_sidecar(ctx)
+      @delegate.archive(ctx.with_properties({:filename => file}))
+    end
+
+  end
+
+  def write_sidecar(ctx)
+    #write temp file
+    to_file = "#{Dir::tmpdir}/#{File.basename(ctx.properties[:filename])}.meta"
+    File.open(to_file, "w") do |f|
+      f.write({:keywords => ctx.file['keywords']}.to_yaml)
+    end
+
+    return to_file
+  end
+
+end

data/lib/flickrup/ext/tag_sets.rb

@@ -18,7 +18,7 @@ class TagSets < PrefixedExtension
     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)
+        @flickr.add_to_set(uploaded, set, ctx.file.date_created)
       end
     end
   end
@@ -28,6 +28,8 @@ class TagSets < PrefixedExtension
 
     if sets.length == 1
       ctx.properties[:subdir] = sets[0]
+      set_date = @flickr.date_of_set(sets[0])
+      ctx.properties[:date_taken] = set_date
     end
     @delegate.archive(ctx)
   end

data/lib/flickrup/filetype/tagged_file.rb

@@ -59,6 +59,11 @@ class TaggedFile
   def post_upload
 
   end
+
+  def date_created
+    @parsed.date_time_original
+  end
+
 end
 
 require 'flickrup/filetype/tagged_image'

data/lib/flickrup/filetype/tagged_image.rb

@@ -6,6 +6,8 @@ require "flickrup/processing_context"
 class TaggedImage < TaggedFile
   include Logging
 
+  TYPE = 'image'
+
   attr_reader :filename
 
   def initialize(filename)
@@ -39,5 +41,9 @@ class TaggedImage < TaggedFile
     @parsed[tag] = val
   end
 
+  def type
+    TYPE
+  end
+
   register_reader(%w(jpg JPG jpeg JPEG))
 end

data/lib/flickrup/filetype/tagged_video.rb

@@ -6,23 +6,14 @@ class TaggedVideo < TaggedFile
 
   attr_reader :filename
 
+  TYPE = 'video'
+
   def initialize(filename)
     super
     @filename = filename
     @properties = PicasaIni.open(filename)
   end
 
-  def archive(to_dir)
-    super
-    write_sidecar(File.join(target_dir, "#{File.basename(file)}.meta"))
-  end
-
-  def write_sidecar(to_file)
-    File.open(to_file, "w") do |f|
-      f.write({:keywords => keywords}.to_yaml)
-    end
-  end
-
   # Returns the value of a tag.
   def [] tag
     @properties[tag]
@@ -33,6 +24,10 @@ class TaggedVideo < TaggedFile
     @properties[tag] = val
   end
 
+  def type
+    TYPE
+  end
+
   register_reader(%w(mp4 MP4 mts MTS))
 
 end

data/lib/flickrup/flickr_client.rb

@@ -5,6 +5,7 @@ class FlickrClient
 
   def initialize(api_key, shared_secret)
     @set_name_to_id = {}
+    @set_id_to_date = {}
     FlickRaw.api_key= api_key
     FlickRaw.shared_secret=shared_secret
 
@@ -32,24 +33,30 @@ class FlickrClient
     client.upload_photo(image, config)
   end
 
-  def add_to_set(photo_id, set_name)
-    set_id = get_set_id(set_name, photo_id)
-    client.photosets.addPhoto(:photoset_id => set_id, :photo_id => photo_id)
+  def date_of_set(set_name)
+    id = id_from_cache(set_name)
+
+    unless @set_id_to_date.include? id
+      info = client.photosets.getInfo(:photoset_id => id)
+      primary = client.photos.getInfo(:photo_id => info.primary)
+      @set_id_to_date[id] = DateTime.strptime(primary.dates.taken, '%Y-%m-%d %H:%M:%S')
+    end
+
+    return @set_id_to_date[id]
   end
 
-  def get_set_id(set_name, for_photo_id)
-    unless @set_name_to_id.include? set_name
-      sets_response = client.photosets.getList #if we don't have it, refresh
-      @set_name_to_id = Hash[*sets_response.to_a.map{ |set|
-        [set['title'], set['id']]
-      }.flatten]
-      unless @set_name_to_id.include? set_name #if we still don't, create it
-        created = client.photosets.create(:title => set_name, :primary_photo_id => for_photo_id)
-        @set_name_to_id = @set_name_to_id.merge({set_name => created.id})
+  def add_to_set(photo_id, set_name, photo_date_taken = nil)
+    id = id_from_cache(set_name)
+
+    if id
+      client.photosets.addPhoto(:photoset_id => @set_name_to_id[set_name], :photo_id => photo_id)
+    else #if we still don't, create it
+      created = client.photosets.create(:title => set_name, :primary_photo_id => photo_id)
+      @set_name_to_id = @set_name_to_id.merge({set_name => created.id})
+      if photo_date_taken
+        @set_id_to_date[created.id] = photo_date_taken
       end
     end
-
-    @set_name_to_id[set_name]
   end
 
   def get_token
@@ -73,6 +80,19 @@ class FlickrClient
   end
 
   private
+
+  def id_from_cache(set_name)
+    unless @set_name_to_id.include? set_name
+      sets_response = client.photosets.getList #if we don't have it, refresh
+      @set_name_to_id = Hash[*sets_response.to_a.map { |set|
+        [set['title'], set['id']]
+      }.flatten]
+
+    end
+
+    @set_name_to_id[set_name]
+  end
+
   def set_client(client)
     @client = client
   end

data/lib/flickrup/processor.rb

@@ -5,7 +5,9 @@ require "flickrup/ext/tag_sets"
 require "flickrup/ext/replacement_tags"
 require "flickrup/ext/machine_tags"
 require "flickrup/ext/visibility"
+require "flickrup/ext/sidecar"
 require "flickrup/archiver"
+require "flickrup/ext/associated_files"
 
 class Processor
   include Logging
@@ -72,21 +74,37 @@ class Processor
 
   private
   def get_uploader
-    flickr_client = FlickrClient.new(@config[:api_key], @config[:shared_secret])
 
-    context = {:flickr_client => flickr_client}
+    unless @uploader
 
-    uploader = Uploader.new(flickr_client)
+      context = get_chain_context()
 
-    upload_handlers.reduce(uploader) do |result, clazz|
-      clazz.new(@config, result, context)
+      uploader = Uploader.new(context[:flickr_client])
+
+      @uploader = upload_handlers.reduce(uploader) do |result, clazz|
+        clazz.new(@config, result, context)
+      end
     end
+
+    return @uploader
   end
 
   def get_archiver
-    archive_handlers.reduce(Archiver.new) do |result, clazz|
-      clazz.new(@config, result, {})
+    unless @archiver
+      @archiver = archive_handlers.reduce(Archiver.new) do |result, clazz|
+        clazz.new(@config, result, get_chain_context)
+      end
     end
+    return @archiver
+  end
+
+  def get_chain_context
+    unless @chain_context
+      flickr_client = FlickrClient.new(@config[:api_key], @config[:shared_secret])
+      @chain_context = {:flickr_client => flickr_client}
+    end
+
+    return @chain_context
   end
 
   def get_preupload_handlers
@@ -98,7 +116,7 @@ class Processor
   end
 
   def archive_handlers
-    [TagSets]
+    [TagSets, Sidecar, AssociatedFiles]
   end
 
 end

data/lib/flickrup/slow_listener.rb

@@ -36,7 +36,7 @@ class SlowListener
     logger.debug("Watching #{@config[:watch_dir]}...")
     @listener = Listen.to(@config[:watch_dir])
     @listener.change(&method(:on_change))
-    @listener.start(false)
+    @listener.start
 
     logger.debug("Triggering initial run")
     schedule

metadata

@@ -1,163 +1,140 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: flickrup
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 5
-  version: 1.1.5
+version: !ruby/object:Gem::Version
+  version: 1.1.7
 platform: ruby
-authors: 
+authors:
 - Jonathan Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: atomic
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: listen
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rufus-scheduler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: rufus-scheduler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mini_exiftool
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: mini_exiftool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: flickraw
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 9
-        - 6
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: flickraw
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.9.6
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 7
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: inifile
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: inifile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: Flickr auto uploading script
 email: bb..jgilbert@xoxy.net
-executables: 
+executables:
 - flickrup
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/flickrup/archiver.rb
+- lib/flickrup/ext/associated_files.rb
 - lib/flickrup/ext/machine_tags.rb
 - lib/flickrup/ext/prefixed_extension.rb
 - lib/flickrup/ext/replacement_tags.rb
+- lib/flickrup/ext/sidecar.rb
 - lib/flickrup/ext/tag_sets.rb
 - lib/flickrup/ext/visibility.rb
 - lib/flickrup/filetype/inifile.rb
@@ -178,36 +155,25 @@ files:
 - README.md
 homepage: http://bitbucket.org/jgilbert/flickrup
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Flickr Uploader!
 test_files: []
-