Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
camera:snap task now correctly reads args from call_rake.
  • Loading branch information
andrewhao committed Aug 3, 2011
1 parent 0689fa9 commit 3a21256
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
10 changes: 7 additions & 3 deletions boink/Rakefile
Expand Up @@ -8,8 +8,12 @@ require 'fileutils'
Boink::Application.load_tasks
namespace :camera do
desc 'Execute a camera snap.'
task :snap, :filename, :interval_sec, :num_frames do |t, args|
args.with_defaults(:filename => 'boink_%n.jpg', :interval_sec => 0, :num_frames => 1)
sh "gphoto2 --capture-image-and-download --filename \"#{args[:filename]}\" --force-overwrite --interval #{args[:interval_sec]} --frames #{args[:num_frames]}"
task :snap do |t, args|

filename = ENV['FILENAME'] || 'boink_%n.jpg'
interval_sec = ENV['INTERVAL_SEC'] || 0
num_frames = ENV['NUM_FRAMES'] || 1

sh "gphoto2 --capture-image-and-download --filename \"#{filename}\" --force-overwrite --interval #{interval_sec} --frames #{num_frames}"
end
end
2 changes: 0 additions & 2 deletions boink/app/controllers/application_controller.rb
@@ -1,8 +1,6 @@
class ApplicationController < ActionController::Base
protect_from_forgery

helper_method :call_rake

private
def call_rake(task, options = {})
options[:rails_env] ||= Rails.env
Expand Down
12 changes: 9 additions & 3 deletions boink/app/controllers/booth_controller.rb
Expand Up @@ -19,10 +19,16 @@ def start_snap
PHOTO_COUNT.times do |i|
@response[:timestamps] << start_time + (PHOTO_DELAY * 1000 * i)
end

@pset = PhotoSet.create

# call call_rake to call script to take photos from here, passing in starting timestamp
# and delta so that the camera can start doing work

call_rake('camera:snap', :filename => Rails.public_path + '/images', :interval_sec => PHOTO_DELAY, :frames => PHOTO_COUNT)
# and delta so that the camera can start doing work
call_rake('camera:snap',
:filename => "#{Rails.public_path}/images/sets/#{@pset.id}/boink_%n.jpg",
:interval_sec => PHOTO_DELAY,
:num_frames => PHOTO_COUNT,
:timestamps => @response[:timestamps])

render :json => @response
end
Expand Down

0 comments on commit 3a21256

Please sign in to comment.