gphoto4ruby 0.1.4 → 0.1.5

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.1.5
+
+* GPhoto2::Camera.ports now returns only ports with cameras and
+  doesn't return empty array if there is one camera connected.
+
 == 0.1.4
 
 * Added option to download first and last files with save method

data/README.rdoc

@@ -2,7 +2,7 @@
 
 == Summary
 
-GPhoto4Ruby is Ruby wrapping around libgphoto2 C library
+GPhoto4Ruby is Ruby wrapping around gphoto2 C library
 (See http://gphoto.org for more information on libgphoto2 and gphoto2).
 It maps a digital camera to Ruby object and allows operating it by
 calling object methods.
@@ -19,7 +19,7 @@ calling object methods.
 
 * On Ubuntu 8.04 it is:
 
-    sudo apt-get install gphoto2
+    sudo apt-get install gphoto2 libgphoto2-2-dev
     
 * On Mac OS X gphoto2 is installed through DarwinPorts
     
@@ -54,50 +54,38 @@ connected through usb in PTP mode.
 
   require "rubygems"
   require "gphoto4ruby"
-
+  
   ports = GPhoto2::Camera.ports
-  if ports.empty?
-
-      # ports array can be empty if there is only one camera plugged in
-      # or there are no cameras connected to the computer
-      # assuming there is one
-      c = GPhoto2::Camera.new()
-
-      # list available configuration items with current values and lists
-      # of allowed values
-      c.config.each_key do |cfg_key|
-          puts cfg_key + " value is: " + c.config[cfg_key].to_s # or c[cfg_key].to_s
-          puts "values available are: " + c[cfg_key, :all].inspect
+  if ports.any?
+      puts ports.length.to_s + "cameras connected"
+      cams = []
+      ports.each do |port|
+          c = GPhoto2::Camera.new(port)
+          puts "camera in port: " + port
+          c.config.each do |key, value|
+              puts key + " value is: " + value.to_s
+              puts "values available are: " + c[key, :all].inspect
+          end
+          cams.push c
       end
 
       # capture image
-      c.capture
-        
+      cams.first.capture
+      
       # now camera virtual path is in the folder with images
       # list image file names
-      puts "files on camera: " + c.files.inspect
-        
+      puts "files on camera: " + cams.first.files.inspect
+      
       # just an example of camera browsing
-      puts "some folder stuff: " + c.folder_up.subfolders.inspect
-        
+      puts "some folder stuff: " + cams.first.folder_up.subfolders.inspect
+      
       # save preview of captured image in the current directory on hard drive
-      c.capture.save :type => :preview, :new_name => "PREVIEW.JPG"
-        
+      cams.first.capture.save :type => :preview, :new_name => "PREVIEW.JPG"
+      
       # save captured file in the current directory on hard drive and delete
       # it from camera
-      c.capture.save.delete
-  else
-      puts ports.length.to_s + "cameras connected"
-      cams = []
-      ports.each do |port|
-          c = GPhoto2::Camera.new(port)
-          puts "camera in port: " + port
-          c.config.each_key do |cfg_key|
-              puts cfg_key + " value is: " + c[cfg_key].to_s
-              puts "values available are: " + c[cfg_key, :all].inspect
-          end
-          cams.push c
-      end
+      cams.first.capture.save.delete
+
       # to capture image with all attached cameras simultaneously use:
       cams.each_index do |index|
           if index < cams.length - 1
@@ -107,7 +95,6 @@ connected through usb in PTP mode.
           end
       end
   end
-
 == Contact
 
 neq4 company:: http://neq4.com

data/example.rb

@@ -2,48 +2,36 @@ require "rubygems"
 require "gphoto4ruby"
 
 ports = GPhoto2::Camera.ports
-if ports.empty?
-
-    # ports array can be empty if there is only one camera plugged in
-    # or there are no cameras connected to the computer
-    # assuming there is one
-    c = GPhoto2::Camera.new()
-
-    # list available configuration items with current values and lists
-    # of allowed values
-    c.config.each_key do |cfg_key|
-        puts cfg_key + " value is: " + c.config[cfg_key].to_s # or c[cfg_key].to_s
-        puts "values available are: " + c[cfg_key, :all].inspect
+if ports.any?
+    puts ports.length.to_s + "cameras connected"
+    cams = []
+    ports.each do |port|
+        c = GPhoto2::Camera.new(port)
+        puts "camera in port: " + port
+        c.config.each do |key, value|
+            puts key + " value is: " + value.to_s
+            puts "values available are: " + c[key, :all].inspect
+        end
+        cams.push c
     end
 
     # capture image
-    c.capture
+    cams.first.capture
     
     # now camera virtual path is in the folder with images
     # list image file names
-    puts "files on camera: " + c.files.inspect
+    puts "files on camera: " + cams.first.files.inspect
     
     # just an example of camera browsing
-    puts "some folder stuff: " + c.folder_up.subfolders.inspect
+    puts "some folder stuff: " + cams.first.folder_up.subfolders.inspect
     
     # save preview of captured image in the current directory on hard drive
-    c.capture.save :type => :preview, :new_name => "PREVIEW.JPG"
+    cams.first.capture.save :type => :preview, :new_name => "PREVIEW.JPG"
     
     # save captured file in the current directory on hard drive and delete
     # it from camera
-    c.capture.save.delete
-else
-    puts ports.length.to_s + "cameras connected"
-    cams = []
-    ports.each do |port|
-        c = GPhoto2::Camera.new(port)
-        puts "camera in port: " + port
-        c.config.each_key do |cfg_key|
-            puts cfg_key + " value is: " + c[cfg_key].to_s
-            puts "values available are: " + c[cfg_key, :all].inspect
-        end
-        cams.push c
-    end
+    cams.first.capture.save.delete
+
     # to capture image with all attached cameras simultaneously use:
     cams.each_index do |index|
         if index < cams.length - 1

data/ext/gphoto4ruby.c

@@ -238,34 +238,50 @@ static VALUE camera_initialize(int argc, VALUE *argv, VALUE self) {
  * call-seq:
  *   GPhoto2::Camera.ports          =>      array
  *
- * Returns an array of usb port paths with cameras. If only one camera
- * is connected, returned array is empty.
+ * Returns an array of usb port paths with cameras. Port paths are the same
+ * as in <b>gphoto2 --auto-detect</b> output. Assuming that if there are
+ * cameras detected with long port paths, then the one with short port path
+ * is a duplicate of one of the others.
  *
  * Examples:
  *
  *   # with one camera connected
- *   GPhoto2::Camera.ports          #=>     []
+ *   GPhoto2::Camera.ports          #=>     ["usb:"]
  *   # with two cameras connected
  *   GPhoto2::Camera.ports          #=>     ["usb:005,004", "usb:005,006"]
  *
  */
 static VALUE camera_class_ports(VALUE klass) {
-    int i, portsTotal;
+    int i, camsTotal;
+    GPContext *context;
+    CameraAbilitiesList *abilList;
     GPPortInfoList *portInfoList;
-    GPPortInfo p;
+    CameraList *camList;
+    const char *pName = NULL;
+    char *e = "";
     VALUE arr;
-    
+
+    context = gp_context_new();
     gp_result_check(gp_port_info_list_new(&portInfoList));
     gp_result_check(gp_port_info_list_load(portInfoList));
-    portsTotal = gp_result_check(gp_port_info_list_count(portInfoList));
+    gp_result_check(gp_abilities_list_new(&abilList));
+    gp_result_check(gp_abilities_list_load(abilList, context));
+    gp_result_check(gp_list_new(&camList));
+    
+    gp_result_check(gp_abilities_list_detect(abilList, portInfoList, camList, context));
+    
+    camsTotal = gp_result_check(gp_list_count(camList));
     arr = rb_ary_new();
-    for(i = 0; i < portsTotal; i++) {
-        gp_result_check(gp_port_info_list_get_info(portInfoList, i, &p));
-        if ((strlen(p.path) > 4) && (strncmp(p.path, "usb:", 4) == 0)) {
-            rb_ary_push(arr, rb_str_new2(p.path));
+    for(i = 0; i < camsTotal; i++) {
+        gp_result_check(gp_list_get_value(camList, i, &pName));
+        if ((camsTotal == 1) || (strlen(pName) > 4)) {
+            rb_ary_push(arr, rb_str_new2(pName));
         }
     }
+    gp_result_check(gp_list_free(camList));
     gp_result_check(gp_port_info_list_free(portInfoList));
+    gp_result_check(gp_abilities_list_free(abilList));
+    free(context);
     return arr;
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gphoto4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - heq4 company
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-28 00:00:00 +04:00
+date: 2008-09-05 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -70,6 +70,6 @@ rubyforge_project: gphoto4ruby
 rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
-summary: GPhoto4Ruby is Ruby wrapping around libgphoto2 C library
+summary: GPhoto4Ruby is Ruby wrapping around gphoto2 C library
 test_files: []