ffi-gphoto2 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fb2cb331909ca8e1522318738dfbfe6675c6aba
-  data.tar.gz: d895c48398334dc8c60565b7302673244402f06d
+  metadata.gz: 0b41989c0a0a69883e01f7f220c8afc02a7f14a6
+  data.tar.gz: 437b613df85ec51ef13c28b160e0614bd84019ff
 SHA512:
-  metadata.gz: 6dbbfd432cd4ad2516ba6ebfbeda293debd0a02587b41b5bf2d21f6c2d35c7bee9b70ed06265958158cec9a66b9b7d12c237bb636b668b289947c08c152971a8
-  data.tar.gz: c9c4ae048625002e761f87390d7a57d664c8e471344e88395d5581910efba2ca16edc0910c3cbbbc54dbd0432ea6a766b713ee0f6add001b999fb130cc11fc10
+  metadata.gz: 7b0ad2ed9e8ca01acbbee01466196f787e12c2472eefbe5dc51b56ae8abafa1598546310a7dca52eb464d681f688790c8650b950d1459ce40157fc0233430e48
+  data.tar.gz: 9030436814f22ad5d8af8065cb8918c8f7503968afa44d745dd81720a2e4a38097ea21af371b42aa5c75289931cd13704fde8a83136211dd9a0504b57bf62f19

data/README.md

@@ -9,7 +9,7 @@ canonical Ruby way.
 ### Prerequisites
 
   * Ruby >= 1.9
-  * libgphoto2 >= 2.5.0 (`brew install libgphoto2`)
+  * libgphoto2 >= 2.5.0
 
 ### Gem
 
@@ -79,7 +79,11 @@ canonical Ruby way.
     => ["DSC_0001.JPG", "DSC_0002.JPG", ...]
 
     # save a file
-    files.first.save
+    file = files.first
+    file.save
+
+    # and delete it
+    file.delete
 
     # close the camera
     camera.finalize

data/examples/record_movie.rb

@@ -0,0 +1,30 @@
+# The camera must have a `movie` config key for this to work.
+#
+# Unlike capturing photos, which typically save to internal memory, videos
+# save to the memory card. The next `file_added` event from the camera after
+# stopping the recording will contain data pointing to the video file.
+
+require 'gphoto2'
+
+camera = GPhoto2::Camera.first
+
+begin
+  # start recording
+  camera.update(movie: true)
+
+  # record for ~10 seconds
+  sleep 10
+
+  # stop recording
+  camera.update(movie: false)
+
+  # wait for the camera to finish with the file
+  begin
+    event = camera.wait
+  end until event.type == :file_added
+
+  # the event data has a camera file that can be saved
+  event.data.save
+ensure
+  camera.finalize
+end

data/lib/ffi/gphoto2.rb

@@ -52,6 +52,7 @@ module FFI
     attach_function :gp_camera_folder_list_files, [Camera.by_ref, :string, CameraList.by_ref, GPContext.by_ref], :int
     attach_function :gp_camera_folder_list_folders, [Camera.by_ref, :string, CameraList.by_ref, GPContext.by_ref], :int
     attach_function :gp_camera_file_get, [Camera.by_ref, :string, :string, CameraFileType, CameraFile.by_ref, GPContext.by_ref], :int
+    attach_function :gp_camera_file_delete, [Camera.by_ref, :string, :string, GPContext.by_ref], :int
 
     # gphoto2/gphoto2-context.h
     attach_function :gp_context_new, [], :pointer

data/lib/gphoto2/camera.rb

@@ -2,15 +2,18 @@ module GPhoto2
   class Camera
     include FFI::GPhoto2
 
-    attr_reader :context, :model, :port
+    attr_reader :context, :port
 
     def self.all
       context = Context.new
 
-      camera_abilities_list = CameraAbilitiesList.new(context)
-      camera_list = camera_abilities_list.detect
+      abilities = CameraAbilitiesList.new(context)
+      cameras = abilities.detect
 
-      entries = camera_list.to_a.map { |entry| Camera.new(entry) }
+      entries = cameras.to_a.map do |entry|
+        model, port = entry.name, entry.value
+        Camera.new(port, model)
+      end
 
       context.finalize
 
@@ -23,8 +26,8 @@ module GPhoto2
       entries.first
     end
 
-    def self.open(entry)
-      camera = new(entry)
+    def self.open(port, model = nil)
+      camera = new(port, model)
 
       if block_given?
         begin
@@ -41,8 +44,8 @@ module GPhoto2
       all.select { |c| c.model.match(pattern) }
     end
 
-    def initialize(entry)
-      @model, @port = entry.name, entry.value
+    def initialize(port, model = nil)
+      @port, @model = port, model
       @dirty = false
     end
 
@@ -73,6 +76,19 @@ module GPhoto2
       wait_for_event(timeout)
     end
 
+    def model
+      @model ||= begin
+        abilities = CameraAbilitiesList.new(context).detect
+        cameras = abilities.detect
+
+        entry = cameras.map(&:value).find { |port| port == @port }
+
+        raise RuntimeError, "no camera found on port #{@port}" if entry.nil?
+
+        entry.name
+      end
+    end
+
     def ptr
       @ptr || (init && @ptr)
     end
@@ -107,8 +123,12 @@ module GPhoto2
       file_get(file)
     end
 
+    def delete(file)
+      file_delete(file)
+    end
+
     def [](key)
-      config[key]
+      config[key.to_s]
     end
 
     def []=(key, value)
@@ -117,6 +137,14 @@ module GPhoto2
       value
     end
 
+    def update(attributes = {})
+      attributes.each do |key, value|
+        self[key] = value
+      end
+
+      save
+    end
+
     def dirty?
       @dirty
     end
@@ -197,6 +225,11 @@ module GPhoto2
       file
     end
 
+    def file_delete(file)
+      rc = gp_camera_file_delete(ptr, file.folder, file.name, context.ptr)
+      GPhoto2.check!(rc)
+    end
+
     def unref
       rc = gp_camera_unref(ptr)
       GPhoto2.check!(rc)
@@ -210,10 +243,29 @@ module GPhoto2
       data_ptr = FFI::MemoryPointer.new(:pointer)
       data_ptr.write_pointer(data)
 
-      rc = gp_camera_wait_for_event(ptr, timeout, type, data, context.ptr)
+      rc = gp_camera_wait_for_event(ptr, timeout, type, data_ptr, context.ptr)
       GPhoto2.check!(rc)
 
-      CameraEventType[type.read_int]
+      type = CameraEventType[type.read_int]
+      data = data_ptr.read_pointer
+
+      data =
+        case type
+        when :unknown
+          data.null? ? nil : data.read_string
+        when :file_added
+          path_ptr = FFI::GPhoto2::CameraFilePath.new(data)
+          path = CameraFilePath.new(path_ptr)
+          CameraFile.new(self, path.folder, path.name)
+        when :folder_added
+          path_ptr = FFI::GPhoto2::CameraFilePath.new(data)
+          path = CameraFilePath.new(path_ptr)
+          CameraFolder.new(self, '%s/%s' % [path.folder, path.name])
+        else
+          nil
+        end
+
+      CameraEvent.new(type, data)
     end
   end
 end

data/lib/gphoto2/camera_event.rb

@@ -0,0 +1,10 @@
+module GPhoto2
+  class CameraEvent
+    attr_reader :type, :data
+
+    def initialize(type, data)
+      @type = type
+      @data = data
+    end
+  end
+end

data/lib/gphoto2/camera_file.rb

@@ -18,6 +18,10 @@ module GPhoto2
       File.binwrite(pathname, data)
     end
 
+    def delete
+      @camera.delete(self)
+    end
+
     def data
       data_and_size.first
     end

data/lib/gphoto2/camera_file_path.rb

@@ -2,8 +2,8 @@ module GPhoto2
   class CameraFilePath
     attr_reader :ptr
 
-    def initialize
-      @ptr = FFI::GPhoto2::CameraFilePath.new
+    def initialize(ptr = nil)
+      @ptr = ptr || FFI::GPhoto2::CameraFilePath.new
     end
 
     def name

data/lib/gphoto2/version.rb

@@ -1,3 +1,3 @@
 module GPhoto2
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/gphoto2.rb

@@ -17,6 +17,7 @@ require 'gphoto2/camera_widgets/window_camera_widget'
 require 'gphoto2/camera'
 require 'gphoto2/camera_abilities'
 require 'gphoto2/camera_abilities_list'
+require 'gphoto2/camera_event'
 require 'gphoto2/camera_file'
 require 'gphoto2/camera_file_path'
 require 'gphoto2/camera_folder'

data/spec/gphoto2/camera_file_spec.rb

@@ -52,6 +52,14 @@ module GPhoto2
       end
     end
 
+    describe '#delete' do
+      it 'delegates the deletion of the file to the camera' do
+        file = CameraFile.new(camera, folder, name)
+        expect(camera).to receive(:delete).with(file)
+        file.delete
+      end
+    end
+
     describe '#data' do
       it 'returns the data of the camera file' do
         file = CameraFile.new(camera, folder, name)

data/spec/gphoto2/camera_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module GPhoto2
   describe Camera do
-    let(:port) { double('entry', name: 'model', value: 'usb:250,006') }
+    let(:port) { 'usb:250,006' }
 
     describe '.all' do
       let(:abilities_list) { double('camera_abilities_list') }
@@ -13,7 +13,7 @@ module GPhoto2
         Context.stub(:stub)
         CameraAbilitiesList.stub(:new).and_return(abilities_list)
         abilities_list.stub(:detect).and_return(camera_list)
-        camera_list.stub(:to_a).and_return([port])
+        camera_list.stub_chain(:to_a, :map).and_return([camera])
       end
 
       it 'returns a list of device entries' do
@@ -192,6 +192,15 @@ module GPhoto2
       end
     end
 
+    describe '#delete' do
+      it 'deletes a file from the camera' do
+        camera = Camera.new(port)
+        camera.stub(:file_delete)
+        expect(camera).to receive(:file_delete)
+        camera.delete(double('camera_file'))
+      end
+    end
+
     describe '#[]' do
       let(:window) { double('camera_widget') }
 
@@ -227,7 +236,7 @@ module GPhoto2
         camera
       end
 
-      it "set a widget's value" do
+      it "sets a widget's value" do
         camera['iso'] = 400
       end
 
@@ -241,6 +250,25 @@ module GPhoto2
       end
     end
 
+    describe '#update' do
+      let(:camera) do
+        camera = Camera.new(port)
+        camera.stub(:[]=)
+        camera.stub(:save)
+        camera
+      end
+
+      it 'sets one or more camera setting' do
+        expect(camera).to receive(:[]=).exactly(2).times
+        camera.update('iso' => 400, 'shutterspeed2' => '1/30')
+      end
+
+       it 'immediately saves the settings to the camera' do
+        expect(camera).to receive(:save)
+        camera.update
+       end
+    end
+
     describe '#dirty?' do
       context 'when the configuration changed' do
         it 'returns true' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-gphoto2
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Macias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - examples/intervalometer.rb
 - examples/live_view.rb
+- examples/record_movie.rb
 - ffi-gphoto2.gemspec
 - lib/ffi/gphoto2.rb
 - lib/ffi/gphoto2/camera.rb
@@ -111,6 +112,7 @@ files:
 - lib/gphoto2/camera.rb
 - lib/gphoto2/camera_abilities.rb
 - lib/gphoto2/camera_abilities_list.rb
+- lib/gphoto2/camera_event.rb
 - lib/gphoto2/camera_file.rb
 - lib/gphoto2/camera_file_path.rb
 - lib/gphoto2/camera_folder.rb