flickrup 0.0.2

data/bin/flickrup

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

data/lib/flickrup/logging.rb

@@ -0,0 +1,5 @@
+module Logging
+  def logger
+    @logger ||= Logger.new(STDOUT)
+  end
+end

data/lib/flickrup/processor.rb

@@ -0,0 +1,31 @@
+require "flickrup/tagged_image"
+require "flickrup/uploader"
+require "flickrup/logging"
+
+class Processor
+  include Logging
+
+  def initialize(config)
+    @config = config
+  end
+
+  def run(files = Dir["#{@config['watch_dir']}/*.{jpg,JPG,jpeg,JPEG}"])
+
+    logger.debug("Processing #{files.length} files")
+
+    images = files.map { |x| TaggedImage.new(x) }
+
+    tagged = images.select { |x| !(x.tags.nil? || x.tags.empty?) }
+
+    uploader = Uploader.new(@config["api_key"], @config["shared_secret"])
+
+    tagged.each { |x|
+      x.doUpload(uploader)
+      x.archive(@config["archive_dir"])
+    }
+
+    logger.debug("Processed #{tagged.length} valid files")
+
+    tagged.length
+  end
+end

data/lib/flickrup/quick_listener.rb

@@ -0,0 +1,52 @@
+require 'atomic'
+require "thread"
+require "listen"
+
+class QuickListener
+
+  def initialize(config)
+    @config = config
+    @changes = Atomic.new 0
+    @mutex = Mutex.new
+    @sync = ConditionVariable.new
+    @flickup = Flickrup.new(config)
+  end
+
+  def run
+    Thread.new { run_loop }
+    Listen.to(@config['watch_dir']) do |modified, added, removed|
+      unless modified.empty? && added.empty?
+        on_change
+      end
+    end
+  end
+
+  private
+  def run_loop
+
+    @mutex.synchronize do
+      while 1 do
+        reloop = @changes.swap 0
+
+        while reloop > 0 do
+          execute
+          reloop = @changes.swap 0
+        end
+
+        @sync.wait(@mutex)
+      end
+    end
+
+  end
+
+  def on_change
+    @mutex.synchronize do
+      @changes.set 1
+      @sync.signal
+    end
+  end
+
+  def execute
+    @flickup.run
+  end
+end

data/lib/flickrup/slow_listener.rb

@@ -0,0 +1,69 @@
+require 'rubygems'
+require 'rufus/scheduler'
+require "flickrup/logging"
+
+#modification ->
+#  schedule upload for 5 mins time
+#
+#upload run ->
+#  for files modified > 5 mins ago
+#    -> do upload
+#  if there are files modified < 5 mins ago
+#    -> schedule upload for minimum time
+#
+#When scheduling upload, remove all but the nearest
+#When paused, upload run should be a no-op
+
+class SlowListener
+  include Logging
+
+  WAIT = 5#*60 #5 min
+
+  def initialize(config)
+    @config = config
+    @scheduler = Rufus::Scheduler.start_new
+    @processor = Processor.new(config)
+  end
+
+  def run
+    logger.debug("Watching #{@config['watch_dir']}...")
+    Listen.to(@config['watch_dir']) do |modified, added, removed|
+      unless modified.empty? && added.empty?
+        on_change
+      end
+    end
+  end
+
+  def do_upload
+    logger.debug("Checking files for upload")
+    files = Dir["#{@config['watch_dir']}/*.{jpg,JPG,jpeg,JPEG}"]
+
+    old, new = files.partition { |x| Time.now > File.mtime(x) + WAIT }
+
+    unless old.empty?
+      logger.debug("Found #{old.length} stable files")
+      @processor.run(old)
+    end
+
+    unless new.empty?
+      logger.debug("Found #{new.length} new files")
+      #todo: schedule for latest
+      schedule
+    end
+  end
+
+  def on_change
+    logger.debug("Change detected")
+    schedule
+  end
+
+  def schedule
+    if @scheduler.jobs.empty?
+      logger.debug("Scheduling processing for #{WAIT} sec")
+      @scheduler.in WAIT do
+        do_upload
+      end
+    end
+  end
+
+end

data/lib/flickrup/tagged_image.rb

@@ -0,0 +1,36 @@
+require 'mini_exiftool'
+require 'ftools'
+require 'fileutils'
+require "flickrup/logging"
+
+class TaggedImage
+  include Logging
+
+  attr_reader :file
+
+  def initialize(file)
+    @file = file
+    @parsed = MiniExiftool.new @file
+  end
+
+  def tags
+    @parsed.keywords.to_a
+  end
+
+  def doUpload(uploader)
+    uploader.upload(file, tags)
+  end
+
+  def archive(to_dir)
+    date_taken = @parsed.date_time_original
+    target_dir = File.join(
+        to_dir,
+        date_taken.strftime("%y"),
+        date_taken.strftime("%m")
+    )
+
+    File.makedirs(target_dir)
+    FileUtils.mv(@file, File.join(target_dir, File.basename(@file)))
+  end
+
+end

data/lib/flickrup/uploader.rb

@@ -0,0 +1,56 @@
+require "yaml"
+require 'rubygems'
+require "flickraw"
+require "flickrup/logging"
+
+class Uploader
+  include Logging
+
+  def initialize(api_key, shared_secret)
+    FlickRaw.api_key= api_key
+    FlickRaw.shared_secret=shared_secret
+
+    @token_file = File.join(ENV['HOME'], ".flickrup")
+    @flickr = FlickRaw::Flickr.new
+
+    if File.exist?(@token_file)
+      token = YAML.load_file(@token_file)
+      @flickr.access_token = token["access"]
+      @flickr.access_secret = token["secret"]
+    end
+
+    begin
+      login = @flickr.test.login
+    rescue FlickRaw::OAuthClient::FailedResponse => e
+      get_token
+    end
+
+  end
+
+  def get_token
+    token = @flickr.get_request_token
+    auth_url = @flickr.get_authorize_url(token['oauth_token'], :perms => 'write')
+
+    puts "Open this url in your process to complete the authentication process : #{auth_url}"
+    puts "Copy here the number given when you complete the process."
+    verify = gets.strip
+
+    begin
+      @flickr.get_access_token(token['oauth_token'], token['oauth_token_secret'], verify)
+      token = {"access" => @flickr.access_token, "secret" => @flickr.access_secret}
+      login = @flickr.test.login
+      puts "You are now authenticated as #{login.username}"
+      File.open(@token_file, 'w') { |f| f.write(token.to_yaml) }
+    rescue FlickRaw::OAuthClient::FailedResponse => e
+      puts "Authentication failed : #{e.msg}"
+    end
+
+  end
+
+  def upload(image, tags)
+    logger.debug("Uploading #{image} with tags #{tags.join(",")}")
+    @flickr.upload_photo(image, :tags => tags.join(" "))
+    logger.debug("Uploaded #{image}")
+  end
+
+end

data/lib/flickrup.rb

@@ -0,0 +1,43 @@
+require "yaml"
+require "rubygems"
+require "trollop"
+require "logger"
+require "flickrup/quick_listener"
+require "flickrup/slow_listener"
+require "flickrup/tagged_image"
+require "flickrup/uploader"
+require "flickrup/processor"
+require "flickrup/logging"
+
+
+module Flickrup
+
+  def self.run_cmd(args = ARGV)
+    Runner.new.run(args)
+  end
+
+  class Runner
+    include Logging
+
+    def run(args = ARGV)
+      opts = Trollop::options do
+        opt :once, "Run single pass" # flag --once, default false
+        opt :nowait, "Upload immediately on change, no delay"
+        opt :loglevel, "Logging level", :type => :string, :default => "INFO"
+        opt :config, "Configuration file", :type => :string, :default => './flickrup.yml'
+      end
+
+      logger.level = Logger::Severity.const_get(opts.loglevel)
+
+      config = YAML::load(File.open(opts.config, "r"))
+
+      if opts.once
+        Processor.new(config).run
+      elsif opts.nowait
+        QuickListener.new(config).run
+      else
+        SlowListener.new(config).run
+      end
+    end
+  end
+end

metadata

@@ -0,0 +1,167 @@
+--- !ruby/object:Gem::Specification 
+name: flickrup
+version: !ruby/object:Gem::Version 
+  hash: 27
+  prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
+platform: ruby
+authors: 
+- Jonathan Gilbert
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2012-12-21 00:00:00 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
+        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: 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: 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: 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: 0.9.6
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: trollop
+  prerelease: false
+  requirement: &id006 !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: *id006
+description: Flickr auto uploading script
+email: bb..jgilbert@xoxy.net
+executables: 
+- flickrup
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- lib/flickrup/logging.rb
+- lib/flickrup/processor.rb
+- lib/flickrup/quick_listener.rb
+- lib/flickrup/slow_listener.rb
+- lib/flickrup/tagged_image.rb
+- lib/flickrup/uploader.rb
+- lib/flickrup.rb
+- bin/flickrup
+homepage: http://bitbucket.org/jgilbert/flickrup
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+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"
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.8.24
+signing_key: 
+specification_version: 3
+summary: Flickr Uploader!
+test_files: []
+