flickrup 1.1.0 → 1.1.1

data/bin/flickrup

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

data/lib/flickrup/ext/machine_tags.rb

@@ -5,7 +5,7 @@ class MachineTags
 
   def preupload(ctx)
 
-    tags = ctx.image.tags
+    tags = ctx.file.tags
 
     remapped = tags.map do |x|
       x.sub(/^([^:]+):([^:]+)::/,"\\1:\\2=")
@@ -14,8 +14,8 @@ class MachineTags
 
 
     unless tags == remapped #write back to file
-      ctx.image['Keywords'] = remapped
-      ctx.image['Subject'] = remapped #also write Subject XMP tag
+      ctx.file['Keywords'] = remapped
+      ctx.file['Subject'] = remapped #also write Subject XMP tag
     end
 
     ctx

data/lib/flickrup/ext/prefixed_extension.rb

@@ -8,7 +8,7 @@ class PrefixedExtension
     prefix = @config[prefix_key]
 
     if prefix
-      all_tags = ctx.image.tags
+      all_tags = ctx.file.tags
 
       (selected_tags, tags) = all_tags.partition do |x|
         x.start_with?("#{prefix}")

data/lib/flickrup/ext/replacement_tags.rb

@@ -9,11 +9,11 @@ class ReplacementTags
 
     if replacements != nil
       replacements.each do |tag_name, tag_value_replacements|
-        existing = ctx.image[tag_name]
+        existing = ctx.file[tag_name]
 
         tag_value_replacements.each do |key, value|
           if existing == key
-            ctx.image[tag_name] = value
+            ctx.file[tag_name] = value
             break
           end
         end

data/lib/flickrup/ext/tag_sets.rb

@@ -16,7 +16,7 @@ class TagSets < PrefixedExtension
     uploaded = @delegate.upload(ctx)
 
     sets.each do |set|
-      logger.debug("Adding #{ctx.image.filename} to set: #{set}")
+      logger.debug("Adding #{ctx.file.filename} to set: #{set}")
       @flickr.add_to_set(uploaded, set)
     end
   end

data/lib/flickrup/ext/visibility.rb

@@ -12,7 +12,7 @@ class Visibility < PrefixedExtension
     visibility = values(:visibilityprefix, ctx)
 
     config_override = if visibility.length == 0
-      logger.debug("No visibility specified for #{ctx.image.filename}.")
+      logger.debug("No visibility specified for #{ctx.file.filename}.")
       {}
     elsif visibility.length == 1
       config_for_visibility(visibility[0])

data/lib/flickrup/filetype/inifile.rb

@@ -0,0 +1,568 @@
+#encoding: UTF-8
+require 'strscan'
+
+# This class represents the INI file and can be used to parse, modify,
+# and write INI files.
+#
+class IniFile
+  include Enumerable
+
+  class Error < StandardError; end
+  VERSION = '2.0.2'
+
+  # Public: Open an INI file and load the contents.
+  #
+  # filename - The name of the fiel as a String
+  # opts     - The Hash of options (default: {})
+  #            :comment   - String containing the comment character(s)
+  #            :parameter - String used to separate parameter and value
+  #            :encoding  - Encoding String for reading / writing (Ruby 1.9)
+  #            :escape    - Boolean used to control character escaping
+  #            :default   - The String name of the default global section
+  #
+  # Examples
+  #
+  #   IniFile.load('file.ini')
+  #   #=> IniFile instance
+  #
+  #   IniFile.load('does/not/exist.ini')
+  #   #=> nil
+  #
+  # Returns an IniFile intsnace or nil if the file could not be opened.
+  #
+  def self.load( filename, opts = {} )
+    return unless File.file? filename
+    new(opts.merge(:filename => filename))
+  end
+
+  # Get and set the filename
+  attr_accessor :filename
+
+  # Get and set the encoding (Ruby 1.9)
+  attr_accessor :encoding
+
+  # Enable or disable character escaping
+  attr_accessor :escape
+
+  # Public: Create a new INI file from the given content String which
+  # contains the INI file lines. If the content are omitted, then the
+  # :filename option is used to read in the content of the INI file. If
+  # neither the content for a filename is provided then an empty INI file is
+  # created.
+  #
+  # content - The String containing the INI file contents
+  # opts    - The Hash of options (default: {})
+  #           :comment   - String containing the comment character(s)
+  #           :parameter - String used to separate parameter and value
+  #           :encoding  - Encoding String for reading / writing (Ruby 1.9)
+  #           :escape    - Boolean used to control character escaping
+  #           :default   - The String name of the default global section
+  #           :filename  - The filename as a String
+  #
+  # Examples
+  #
+  #   IniFile.new
+  #   #=> an empty IniFile instance
+  #
+  #   IniFile.new( "[global]\nfoo=bar" )
+  #   #=> an IniFile instance
+  #
+  #   IniFile.new( :filename => 'file.ini', :encoding => 'UTF-8' )
+  #   #=> an IniFile instance
+  #
+  #   IniFile.new( "[global]\nfoo=bar", :comment => '#' )
+  #   #=> an IniFile instance
+  #
+  def initialize( content = nil, opts = {} )
+    opts, content = content, nil if Hash === content
+
+    @content = content
+
+    @comment  = opts.fetch(:comment, ';#')
+    @param    = opts.fetch(:parameter, '=')
+    @encoding = opts.fetch(:encoding, nil)
+    @escape   = opts.fetch(:escape, true)
+    @default  = opts.fetch(:default, 'global')
+    @filename = opts.fetch(:filename, nil)
+
+    @ini = Hash.new {|h,k| h[k] = Hash.new}
+
+    if    @content  then parse!
+    elsif @filename then read
+    end
+  end
+
+  # Public: Write the contents of this IniFile to the file system. If left
+  # unspecified, the currently configured filename and encoding will be used.
+  # Otherwise the filename and encoding can be specified in the options hash.
+  #
+  # opts - The default options Hash
+  #        :filename - The filename as a String
+  #        :encoding - The encoding as a String (Ruby 1.9)
+  #
+  # Returns this IniFile instance.
+  #
+  def write( opts = {} )
+    filename = opts.fetch(:filename, @filename)
+    encoding = opts.fetch(:encoding, @encoding)
+    mode = (RUBY_VERSION >= '1.9' && encoding) ?
+        "w:#{encoding.to_s}" :
+        'w'
+
+    File.open(filename, mode) do |f|
+      @ini.each do |section,hash|
+        f.puts "[#{section}]"
+        hash.each {|param,val| f.puts "#{param} #{@param} #{escape_value val}"}
+        f.puts
+      end
+    end
+
+    self
+  end
+  alias :save :write
+
+  # Public: Read the contents of the INI file from the file system and replace
+  # and set the state of this IniFile instance. If left unspecified the
+  # currently configured filename and encoding will be used when reading from
+  # the file system. Otherwise the filename and encoding can be specified in
+  # the options hash.
+  #
+  # opts - The default options Hash
+  #        :filename - The filename as a String
+  #        :encoding - The encoding as a String (Ruby 1.9)
+  #
+  # Returns this IniFile instance if the read was successful; nil is returned
+  # if the file could not be read.
+  #
+  def read( opts = {} )
+    filename = opts.fetch(:filename, @filename)
+    encoding = opts.fetch(:encoding, @encoding)
+    return unless File.file? filename
+
+    mode = (RUBY_VERSION >= '1.9' && encoding) ?
+        "r:#{encoding.to_s}" :
+        'r'
+    fd = File.open(filename, mode)
+    @content = fd.read
+
+    parse!
+    self
+  ensure
+    fd.close if fd && !fd.closed?
+  end
+  alias :restore :read
+
+  # Returns this IniFile converted to a String.
+  #
+  def to_s
+    s = []
+    @ini.each do |section,hash|
+      s << "[#{section}]"
+      hash.each {|param,val| s << "#{param} #{@param} #{escape_value val}"}
+      s << ""
+    end
+    s.join("\n")
+  end
+
+  # Returns this IniFile converted to a Hash.
+  #
+  def to_h
+    @ini.dup
+  end
+
+  # Public: Creates a copy of this inifile with the entries from the
+  # other_inifile merged into the copy.
+  #
+  # other - The other IniFile.
+  #
+  # Returns a new IniFile.
+  #
+  def merge( other )
+    self.dup.merge!(other)
+  end
+
+  # Public: Merges other_inifile into this inifile, overwriting existing
+  # entries. Useful for having a system inifile with user over-ridable settings
+  # elsewhere.
+  #
+  # other - The other IniFile.
+  #
+  # Returns this IniFile.
+  #
+  def merge!( other )
+    my_keys = @ini.keys
+    other_keys =
+        case other
+          when IniFile; other.instance_variable_get(:@ini).keys
+          when Hash; other.keys
+          else raise "cannot merge contents from '#{other.class.name}'" end
+
+    (my_keys & other_keys).each do |key|
+      @ini[key].merge!(other[key])
+    end
+
+    (other_keys - my_keys).each do |key|
+      @ini[key] = other[key]
+    end
+
+    self
+  end
+
+  # Public: Yield each INI file section, parameter, and value in turn to the
+  # given block.
+  #
+  # block - The block that will be iterated by the each method. The block will
+  #         be passed the current section and the parameter / value pair.
+  #
+  # Examples
+  #
+  #   inifile.each do |section, parameter, value|
+  #     puts "#{parameter} = #{value} [in section - #{section}]"
+  #   end
+  #
+  # Returns this IniFile.
+  #
+  def each
+    return unless block_given?
+    @ini.each do |section,hash|
+      hash.each do |param,val|
+        yield section, param, val
+      end
+    end
+    self
+  end
+
+  # Public: Yield each section in turn to the given block.
+  #
+  # block - The block that will be iterated by the each method. The block will
+  #         be passed the current section as a Hash.
+  #
+  # Examples
+  #
+  #   inifile.each_section do |section|
+  #     puts section.inspect
+  #   end
+  #
+  # Returns this IniFile.
+  #
+  def each_section
+    return unless block_given?
+    @ini.each_key {|section| yield section}
+    self
+  end
+
+  # Public: Remove a section identified by name from the IniFile.
+  #
+  # section - The section name as a String.
+  #
+  # Returns the deleted section Hash.
+  #
+  def delete_section( section )
+    @ini.delete section.to_s
+  end
+
+  # Public: Get the section Hash by name. If the section does not exist, then
+  # it will be created.
+  #
+  # section - The section name as a String.
+  #
+  # Examples
+  #
+  #   inifile['global']
+  #   #=> global section Hash
+  #
+  # Returns the Hash of parameter/value pairs for this section.
+  #
+  def []( section )
+    return nil if section.nil?
+    @ini[section.to_s]
+  end
+
+  # Public: Set the section to a hash of parameter/value pairs.
+  #
+  # section - The section name as a String.
+  # value   - The Hash of parameter/value pairs.
+  #
+  # Examples
+  #
+  #   inifile['tenderloin'] = { 'gritty' => 'yes' }
+  #   #=> { 'gritty' => 'yes' }
+  #
+  # Returns the value Hash.
+  #
+  def []=( section, value )
+    @ini[section.to_s] = value
+  end
+
+  # Public: Create a Hash containing only those INI file sections whose names
+  # match the given regular expression.
+  #
+  # regex - The Regexp used to match section names.
+  #
+  # Examples
+  #
+  #   inifile.match(/^tree_/)
+  #   #=> Hash of matching sections
+  #
+  # Return a Hash containing only those sections that match the given regular
+  # expression.
+  #
+  def match( regex )
+    @ini.dup.delete_if { |section, _| section !~ regex }
+  end
+
+  # Public: Check to see if the IniFile contains the section.
+  #
+  # section - The section name as a String.
+  #
+  # Returns true if the section exists in the IniFile.
+  #
+  def has_section?( section )
+    @ini.has_key? section.to_s
+  end
+
+  # Returns an Array of section names contained in this IniFile.
+  #
+  def sections
+    @ini.keys
+  end
+
+  # Public: Freeze the state of this IniFile object. Any attempts to change
+  # the object will raise an error.
+  #
+  # Returns this IniFile.
+  #
+  def freeze
+    super
+    @ini.each_value {|h| h.freeze}
+    @ini.freeze
+    self
+  end
+
+  # Public: Mark this IniFile as tainted -- this will traverse each section
+  # marking each as tainted.
+  #
+  # Returns this IniFile.
+  #
+  def taint
+    super
+    @ini.each_value {|h| h.taint}
+    @ini.taint
+    self
+  end
+
+  # Public: Produces a duplicate of this IniFile. The duplicate is independent
+  # of the original -- i.e. the duplicate can be modified without changing the
+  # original. The tainted state of the original is copied to the duplicate.
+  #
+  # Returns a new IniFile.
+  #
+  def dup
+    other = super
+    other.instance_variable_set(:@ini, Hash.new {|h,k| h[k] = Hash.new})
+    @ini.each_pair {|s,h| other[s].merge! h}
+    other.taint if self.tainted?
+    other
+  end
+
+  # Public: Produces a duplicate of this IniFile. The duplicate is independent
+  # of the original -- i.e. the duplicate can be modified without changing the
+  # original. The tainted state and the frozen state of the original is copied
+  # to the duplicate.
+  #
+  # Returns a new IniFile.
+  #
+  def clone
+    other = dup
+    other.freeze if self.frozen?
+    other
+  end
+
+  # Public: Compare this IniFile to some other IniFile. For two INI files to
+  # be equivalent, they must have the same sections with the same parameter /
+  # value pairs in each section.
+  #
+  # other - The other IniFile.
+  #
+  # Returns true if the INI files are equivalent and false if they differ.
+  #
+  def eql?( other )
+    return true if equal? other
+    return false unless other.instance_of? self.class
+    @ini == other.instance_variable_get(:@ini)
+  end
+  alias :== :eql?
+
+
+  private
+
+  # Parse the ini file contents. This will clear any values currently stored
+  # in the ini hash.
+  #
+  def parse!
+    return unless @content
+
+    string = ''
+    property = ''
+
+    @ini.clear
+    @_line = nil
+    @_section = nil
+
+    scanner = StringScanner.new(@content)
+    until scanner.eos?
+
+      # keep track of the current line for error messages
+      @_line = scanner.check(%r/\A.*$/) if scanner.bol?
+
+      # look for escaped special characters \# \" etc
+      if @escape && scanner.scan(%r/\\([\[\]#{@param}#{@comment}"])/)
+        string << scanner[1]
+
+        # look for quoted strings
+      elsif scanner.scan(%r/"/)
+        quote = scanner.scan_until(/(?:\A|[^\\])"/)
+        parse_error('Unmatched quote') if quote.nil?
+
+        quote.chomp!('"')
+        string << quote
+
+        # look for comments, empty strings, end of lines
+      elsif scanner.skip(%r/\A\s*(?:[#{@comment}].*)?$/)
+        string << scanner.getch unless scanner.eos?
+
+        process_property(property, string)
+
+        # look for the separator between property name and value
+      elsif scanner.scan(%r/#{@param}/)
+        if property.empty?
+          property = string.strip
+          string.slice!(0, string.length)
+        elsif !@escape
+          scanner.pos = scanner.pos - @param.length
+          string << read_to_next_token(scanner, true)
+        else
+          parse_error
+        end
+
+        # look for the start of a new section
+      elsif scanner.scan(%r/\A\s*\[([^\]]+)\]/)
+        @_section = @ini[scanner[1]]
+
+        # otherwise scan and store characters till we hit the start of some
+        # special section like a quote, newline, comment, etc.
+      else
+        string << read_to_next_token(scanner, false)
+      end
+
+      def read_to_next_token(scanner, read_value)
+
+        scan_regex = if read_value
+                       %r/([\n"] | \z | \\[\[\]#{@param}#{@comment}"])/mx
+                     elsif @escape then
+                       %r/([\n"#{@param}#{@comment}] | \z | \\[\[\]#{@param}#{@comment}"])/mx
+                     else
+                       %r/([\n"#{@param}#{@comment}] | \z)/mx
+                     end
+
+        tmp = scanner.scan_until(scan_regex)
+        parse_error if tmp.nil?
+
+        len = scanner[1].length
+        tmp.slice!(tmp.length - len, len)
+
+        scanner.pos = scanner.pos - len
+
+        tmp
+      end
+    end
+
+    process_property(property, string)
+  end
+
+  # Store the property / value pair in the currently active section. This
+  # method checks for continuation of the value to the next line.
+  #
+  # property - The property name as a String.
+  # value    - The property value as a String.
+  #
+  # Returns nil.
+  #
+  def process_property( property, value )
+    value.chomp!
+    return if property.empty? and value.empty?
+    return if value.sub!(%r/\\\s*\z/, '')
+
+    property.strip!
+    value.strip!
+
+    parse_error if property.empty?
+
+    current_section[property.dup] = unescape_value(value.dup)
+
+    property.slice!(0, property.length)
+    value.slice!(0, value.length)
+
+    nil
+  end
+
+  # Returns the current section Hash.
+  #
+  def current_section
+    @_section ||= @ini[@default]
+  end
+
+  # Raise a parse error using the given message and appending the current line
+  # being parsed.
+  #
+  # msg - The message String to use.
+  #
+  # Raises IniFile::Error
+  #
+  def parse_error( msg = 'Could not parse line' )
+    raise Error, "#{msg}: #{@_line.inspect}"
+  end
+
+  # Unescape special characters found in the value string. This will convert
+  # escaped null, tab, carriage return, newline, and backslash into their
+  # literal equivalents.
+  #
+  # value - The String value to unescape.
+  #
+  # Returns the unescaped value.
+  #
+  def unescape_value( value )
+    return value unless @escape
+
+    value = value.to_s
+    value.gsub!(%r/\\[0nrt\\]/) { |char|
+      case char
+        when '\0';   "\0"
+        when '\n';   "\n"
+        when '\r';   "\r"
+        when '\t';   "\t"
+        when '\\\\'; "\\"
+      end
+    }
+    value
+  end
+
+  # Escape special characters.
+  #
+  # value - The String value to escape.
+  #
+  # Returns the escaped value.
+  #
+  def escape_value( value )
+    return value unless @escape
+
+    value = value.to_s.dup
+    value.gsub!(%r/\\([0nrt])/, '\\\\\1')
+    value.gsub!(%r/\n/, '\n')
+    value.gsub!(%r/\r/, '\r')
+    value.gsub!(%r/\t/, '\t')
+    value.gsub!(%r/\0/, '\0')
+    value
+  end
+
+end  # IniFile

data/lib/flickrup/filetype/picasa_ini.rb

@@ -0,0 +1,29 @@
+require 'flickrup/filetype/inifile'
+
+class PicasaIni
+
+  @@cached_mtime = DateTime.new(1900,1,1)
+
+  def self.open(file)
+    dir = File.dirname(file)
+    inifile = "#{dir}/.picasa.ini"
+    mtime = File.mtime(inifile)
+
+    if @@cached_mtime == mtime then
+      @@cached
+    else
+      @@cached_mtime = mtime
+      @@cached = new(inifile)
+    end
+
+    @@cached[File.basename(file)]
+  end
+
+  def initialize(file)
+    @inifile = IniFile.load(file, :escape => false)
+  end
+
+  def [](section)
+    @inifile[section]
+  end
+end

data/lib/flickrup/filetype/tagged_file.rb

@@ -0,0 +1,81 @@
+require 'mini_exiftool'
+
+class TaggedFile
+
+  @@subclasses = {}
+
+  def self.register_reader(exts)
+    exts.map do |ext|
+      @@subclasses[ext] = self
+    end
+  end
+
+  def self.create(file)
+    c = @@subclasses[File.extname(file)[1..-1]]
+
+    if c
+      c.new(file)
+    end
+  end
+
+  def initialize(filename)
+    @parsed = MiniExiftool.new filename
+  end
+
+  def doUpload(preupload_handlers, uploader)
+
+    context = preupload_handlers.reduce(ProcessingContext.new(self)) do |ctx, handler|
+      handler.preupload(ctx)
+    end
+
+    pre_upload
+    uploader.upload(context)
+    post_upload
+  end
+
+  def tags
+    keywords = self['keywords']
+    TagSet.new(if keywords == nil
+                 []
+               elsif keywords.class == String
+                 [keywords]
+               else
+                 keywords
+               end)
+  end
+
+  def archive(to_dir)
+    date_taken = @parsed.date_time_original || @parsed.modifydate
+    archive_by_date(to_dir, date_taken)
+  end
+
+  def pre_upload
+
+  end
+
+  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'
+require 'flickrup/filetype/tagged_video'

data/lib/flickrup/filetype/tagged_image.rb

@@ -0,0 +1,43 @@
+require 'fileutils'
+require "flickrup/logging"
+require "flickrup/tag_set"
+require "flickrup/processing_context"
+
+class TaggedImage < TaggedFile
+  include Logging
+
+  attr_reader :filename
+
+  def initialize(filename)
+    super
+    @filename = filename
+  end
+
+  def pre_upload
+    super
+    #maybe save afterwards
+    if @parsed.changed?
+      @parsed.save!
+    end
+  end
+
+  def post_upload
+    super
+    #maybe save afterwards
+    if @parsed.changed?
+      @parsed.save!
+    end
+  end
+
+  # Returns the value of a tag.
+  def [] tag
+    @parsed[tag]
+  end
+
+  # Set the value of a tag.
+  def []=(tag, val)
+    @parsed[tag] = val
+  end
+
+  register_reader(%w(jpg JPG jpeg JPEG))
+end

data/lib/flickrup/filetype/tagged_video.rb

@@ -0,0 +1,38 @@
+require 'yaml'
+require 'flickrup/filetype/picasa_ini'
+
+class TaggedVideo < TaggedFile
+  include Logging
+
+  attr_reader :filename
+
+  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]
+  end
+
+  # Set the value of a tag.
+  def []=(tag, val)
+    @properties[tag] = val
+  end
+
+  register_reader(%w(mp4 mts))
+
+end

data/lib/flickrup/flickr_client.rb

@@ -1,4 +1,5 @@
 require "flickraw"
+require 'etc'
 
 class FlickrClient
 
@@ -7,7 +8,8 @@ class FlickrClient
     FlickRaw.api_key= api_key
     FlickRaw.shared_secret=shared_secret
 
-    @token_file = File.join(ENV['HOME'], ".flickrup")
+    home = ENV['HOME'] || Etc.getpwuid.dir
+    @token_file = File.join(home, ".flickrup")
     set_client(FlickRaw::Flickr.new)
 
     if File.exist?(@token_file)

data/lib/flickrup/processing_context.rb

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

data/lib/flickrup/processor.rb

@@ -1,4 +1,4 @@
-require "flickrup/tagged_image"
+require "flickrup/filetype/tagged_file"
 require "flickrup/uploader"
 require "flickrup/logging"
 require "flickrup/ext/tag_sets"
@@ -17,9 +17,9 @@ class Processor
     Dir["#{@config[:watch_dir]}/paused"].length > 0
   end
 
-  def run(files = Dir["#{@config[:watch_dir]}/*.{jpg,JPG,jpeg,JPEG}"])
+  def run(all_files = Dir["#{@config[:watch_dir]}/*.*"])
 
-    logger.debug("Processing #{files.length} files")
+    logger.debug("Processing #{all_files.length} files")
 
     if paused
       logger.debug("Paused detected, so skipping processing...")
@@ -27,15 +27,15 @@ class Processor
     end
 
     # some files may have been removed by now: https://bitbucket.org/jgilbert/flickrup/issue/1
-    images = files.map { |x|
+    files = all_files.map { |x|
       if File.exist? x
-        TaggedImage.new(x)
+        TaggedFile.create(x)
       else
         nil
       end
     }.compact
 
-    tagged = images.select { |x|
+    tagged = files.select { |x|
       !(x.tags.nil? || x.tags.empty?)
     }.sort_by { |x|
       [x.filename]

data/lib/flickrup/slow_listener.rb

@@ -70,7 +70,7 @@ class SlowListener
 
     @processing.set PROCESSING
 
-    files = Dir["#{@config[:watch_dir]}/*.{jpg,JPG,jpeg,JPEG}"]
+    files = Dir["#{@config[:watch_dir]}/*.*"]
 
     old, new = files.partition { |x| Time.now > File.mtime(x) + @wait }
 

data/lib/flickrup/uploader.rb

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

data/lib/flickrup.rb

@@ -4,7 +4,7 @@ require "trollop"
 require "logger"
 require "flickrup/quick_listener"
 require "flickrup/slow_listener"
-require "flickrup/tagged_image"
+require "flickrup/filetype/tagged_file"
 require "flickrup/uploader"
 require "flickrup/processor"
 require "flickrup/logging"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flickrup
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Jonathan Gilbert
@@ -129,6 +129,22 @@ dependencies:
         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: 2.0.0
+  type: :runtime
+  version_requirements: *id008
 description: Flickr auto uploading script
 email: bb..jgilbert@xoxy.net
 executables: 
@@ -143,6 +159,11 @@ files:
 - lib/flickrup/ext/replacement_tags.rb
 - lib/flickrup/ext/tag_sets.rb
 - lib/flickrup/ext/visibility.rb
+- lib/flickrup/filetype/inifile.rb
+- lib/flickrup/filetype/picasa_ini.rb
+- lib/flickrup/filetype/tagged_file.rb
+- lib/flickrup/filetype/tagged_image.rb
+- lib/flickrup/filetype/tagged_video.rb
 - lib/flickrup/flickr_client.rb
 - lib/flickrup/logging.rb
 - lib/flickrup/processing_context.rb
@@ -150,7 +171,6 @@ files:
 - lib/flickrup/quick_listener.rb
 - lib/flickrup/slow_listener.rb
 - lib/flickrup/tag_set.rb
-- lib/flickrup/tagged_image.rb
 - lib/flickrup/uploader.rb
 - lib/flickrup.rb
 - bin/flickrup

data/lib/flickrup/tagged_image.rb

@@ -1,71 +0,0 @@
-require 'mini_exiftool'
-require 'fileutils'
-require "flickrup/logging"
-require "flickrup/tag_set"
-require "flickrup/processing_context"
-
-class TaggedImage
-  include Logging
-
-  attr_reader :filename
-
-  def initialize(filename)
-    @filename = filename
-    @parsed = MiniExiftool.new filename
-  end
-
-  def tags
-    keywords = @parsed.keywords
-    TagSet.new(if keywords == nil
-      []
-    elsif keywords.class == String
-      [keywords]
-    else
-      keywords
-    end)
-  end
-
-  def doUpload(preupload_handlers, uploader)
-
-    context = preupload_handlers.reduce(ProcessingContext.new(self)) do |ctx, handler|
-      handler.preupload(ctx)
-    end
-
-    #maybe save afterwards
-    if @parsed.changed?
-      @parsed.save!
-    end
-
-    uploader.upload(context)
-
-    #maybe save afterwards
-    if @parsed.changed?
-      @parsed.save!
-    end
-  end
-
-  def archive(to_dir)
-    date_taken = @parsed.date_time_original || @parsed.modifydate
-
-    target_dir = File.join(
-        to_dir,
-        date_taken.strftime("%Y"),
-        date_taken.strftime("%b")
-    )
-
-    FileUtils.mkdir_p(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.
-  def [] tag
-    @parsed[tag]
-  end
-
-  # Set the value of a tag.
-  def []=(tag, val)
-    @parsed[tag] = val
-  end
-
-end