gphoto4ruby 0.4.0 → 0.4.1

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 0.4.1
+
+* Fix for canon cameras to keep "capture=on" between ruby calls. Though it shows
+  "capture=false" but config can be refreshed with config(:no_cache)
+* Added possibility and instructions for compiling gem against specified version
+  of libgphoto2
+
 == 0.4.0
 
 * Tested ruby support including 1.9.1

data/README.rdoc

@@ -17,21 +17,30 @@ calling object methods.
 * First of all you'll need the original gphoto2 C library installed. For
   installation instructions goto http://gphoto.org.
 
-* On Ubuntu 8.04 it is:
+* On (k)ubuntu it is:
 
-    sudo apt-get install gphoto2 libgphoto2-2-dev
+    sudo apt-get install libgphoto2-2-dev
     
-* On Mac OS X gphoto2 is installed through DarwinPorts
+* On Mac OS X gphoto2 is installed through DarwinPorts. Or you can install it
+  from source
     
-* You can install GPhoto4Ruby gem from GitHub or from RubyForge. Use one of
-  the following lines depending on your preferences:
-
-    sudo gem install lonelyelk-gphoto4ruby --source http://gems.github.com
-    
-  <b>or</b>
+* You can install GPhoto4Ruby gem from GemCutter or from RubyForge:
 
     sudo gem install gphoto4ruby
-  
+
+* If you installed libgphoto2 from source you might want to use custom paths
+
+    sudo gem install -i gphoto4ruby -- --with-opt-dir=/opt-custom-prefix
+
+* If you have more than one version of libgphoto2 installed and you want to
+  specify which one to use:
+
+    sudo gem install -i gphoto4ruby -- --with-gphoto2-dir=/custom-prefix --with-dldflags="-Wl,-rpath,/custom-prefix/lib"
+
+  Following code will tell you, which version of libgphoto2 you use:
+
+    GPhoto2::LIBGPHOTO2_VERSION
+
 * Connect your digital camera through usb, locate example.rb file and run:
 
     ruby example.rb
@@ -39,6 +48,11 @@ calling object methods.
 * <b>NOTE!</b> On Mac OS X there is a process you need to kill before using
   gphoto2. You can find more information on this at http://gphoto.org
 
+* <b>NOTE!</b> For unknown reason after upgrade to Kubuntu 9.10 Canon EOS 450D
+  stopped capturing images. It just hangs in infinit loop. Both with my gem and
+  with command line gphoto2 tool. Even for (lib)gphoto2 2.4.7. You can change
+  configuration though. And with kubuntu 9.04 everything is ok.
+
 == Usage
 
 After installation of this gem rdocs are generated for you. Or you can generate
@@ -47,8 +61,8 @@ it manually with:
   rake rdoc
 
 Ruby file <b>example.rb</b> is installed along with this gem. All examples are
-tested on Kubuntu 8.04 and Mac OS X 10.4.11 with digital camera Nikon DSC D80
-connected through usb in PTP mode.
+tested on Kubuntu 8.04-9.04 and Mac OS X 10.4.11 with digital camera Nikon DSC D80
+connected through usb in PTP mode and Canon EOS 450D.
 
 <b>example.rb:</b>
 
@@ -62,7 +76,8 @@ connected through usb in PTP mode.
       ports.each do |port|
           c = GPhoto2::Camera.new(port)
           puts "camera in port: " + port
-          c.config.each do |key, value|
+          c["capture"] = true if c.config.has_key? "capture" # canon? :)
+          c.config(:no_cache).each do |key, value|
               puts key + " value is: " + value.to_s
               puts "values available are: " + c[key, :all].inspect
           end
@@ -85,15 +100,6 @@ connected through usb in PTP mode.
       # save captured file in the current directory on hard drive and delete
       # it from camera
       cams.first.capture.save.delete
-
-      # to capture image with all attached cameras simultaneously use:
-      cams.each_index do |index|
-          if index < cams.length - 1
-              fork {cams[index].capture; exit!}
-          else
-              cams[index].capture
-          end
-      end
   end
 == Contact
 

data/Rakefile

@@ -28,6 +28,7 @@ begin
   spec = Gem::Specification.new do |s|
     s.name = "gphoto4ruby"
     s.summary = "GPhoto4Ruby is Ruby wrapping around gphoto2 C library"
+    s.description = "GPhoto4Ruby is used to control PPTP cameras (the ones that can be controlled with gphoto2) using power of ruby."
 
     s.authors = ["neq4 company", "Sergey Kruk"]
     s.email = "sergey.kruk@gmail.com"

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/example.rb

@@ -8,7 +8,8 @@ if ports.any?
     ports.each do |port|
         c = GPhoto2::Camera.new(port)
         puts "camera in port: " + port
-        c.config.each do |key, value|
+        c["capture"] = true if c.config.has_key? "capture" # canon? :)
+        c.config(:no_cache).each do |key, value|
             puts key + " value is: " + value.to_s
             puts "values available are: " + c[key, :all].inspect
         end
@@ -31,13 +32,4 @@ if ports.any?
     # save captured file in the current directory on hard drive and delete
     # it from camera
     cams.first.capture.save.delete
-
-    # to capture image with all attached cameras simultaneously use:
-    cams.each_index do |index|
-        if index < cams.length - 1
-            fork {cams[index].capture; exit!}
-        else
-            cams[index].capture
-        end
-    end
 end

data/ext/extconf.rb

@@ -1,6 +1,7 @@
 require "mkmf"
 
-dir_config("gphoto4ruby", "/usr/local")
+lib_gp_paths = dir_config("gphoto2")
+
 if have_library("gphoto2")
     if RUBY_VERSION =~ /1\.9/
         $CPPFLAGS += " -DRUBY_19"
@@ -8,5 +9,5 @@ if have_library("gphoto2")
     $CFLAGS = '-Wall ' + $CFLAGS
     create_makefile("gphoto4ruby")
 else
-    raise "You need gphoto2 installed to compile and use this library"
+    raise "You need libgphoto2 installed to compile and use this library"
 end

data/ext/gphoto2camera.c

@@ -55,20 +55,25 @@ void camera_mark(GPhoto2Camera *c) {
 void camera_free(GPhoto2Camera *c) {
     gp_result_check(gp_camera_exit(c->camera, c->context));
     gp_result_check(gp_widget_free(c->config));
+    gp_result_check(gp_camera_unref(c->camera));
     gp_result_check(gp_camera_free(c->camera));
     free(c->virtFolder);
+    free(c->lastName);
     free(c->context);
     free(c);
 }
 
 VALUE camera_allocate(VALUE klass) {
     GPhoto2Camera *c;
-    c = (GPhoto2Camera*) malloc(sizeof(GPhoto2Camera));
-    c->virtFolder = (char*) malloc(sizeof(char)*1024);
+    c = (GPhoto2Camera*) ALLOC(GPhoto2Camera);
+    c->virtFolder = (char*) ALLOC_N(char, 1024);
+    c->lastName = (char*) ALLOC_N(char, 256);
     strcpy(c->virtFolder, "/");
+    c->lastName[0] = '\0';
     c->context = gp_context_new();
     gp_result_check(gp_camera_new(&(c->camera)));
     gp_result_check(gp_camera_get_config(c->camera, &(c->config), c->context));
+    gp_result_check(gp_camera_ref(c->camera));
     return Data_Wrap_Struct(klass, camera_mark, camera_free, c);
 }
 
@@ -217,6 +222,7 @@ VALUE camera_capture(int argc, VALUE *argv, VALUE self) {
     gp_result_check(gp_camera_capture(c->camera, GP_CAPTURE_IMAGE, &path, c->context));
 //    printf("captured: %s/%s\n", path.folder, path.name);
     strcpy(c->virtFolder, path.folder);
+    strcpy(c->lastName, path.name);
     return self;
 }
 
@@ -249,9 +255,9 @@ VALUE camera_capture(int argc, VALUE *argv, VALUE self) {
  */
 VALUE camera_save(int argc, VALUE *argv, VALUE self) {
     int i, count, retVal;
-    int newName = 0;
     const char *fData, *key, *val, *name;
-    char *fPath, *newNameStr, *pchNew, *pchSrc;
+    char *fPath, *pchNew, *pchSrc;
+    char  *newNameStr = NULL;
     char fName[100], cFileName[100], cFolderName[100];
     unsigned long int fSize;
     int fd;
@@ -268,22 +274,25 @@ VALUE camera_save(int argc, VALUE *argv, VALUE self) {
     
     gp_list_new(&list);
     
-    strcpy(fName, "");
+    fName[0] = '\0';
     strcpy(cFolderName, c->virtFolder);
 
-    RESULT_CHECK_LIST(gp_filesystem_reset(c->camera->fs), list);
-    RESULT_CHECK_LIST(gp_camera_folder_list_files(c->camera, c->virtFolder, list, c->context), list);
-    count = gp_list_count(list);
-    RESULT_CHECK_LIST(count, list);
-    if (count == 0) {
-        gp_list_free(list);
-        return self; // Nothing to save
+    if (strlen(c->lastName) > 0) {
+        strcpy(cFileName, c->lastName);
     } else {
-        count -= 1;
+        RESULT_CHECK_LIST(gp_filesystem_reset(c->camera->fs), list);
+        RESULT_CHECK_LIST(gp_camera_folder_list_files(c->camera, c->virtFolder, list, c->context), list);
+        count = gp_list_count(list);
+        RESULT_CHECK_LIST(count, list);
+        if (count == 0) {
+            gp_list_free(list);
+            return self; // Nothing to save
+        } else {
+            count -= 1;
+        }
+        RESULT_CHECK_LIST(gp_list_get_name(list, count, &name), list);
+        strcpy(cFileName, name);
     }
-    RESULT_CHECK_LIST(gp_list_get_name(list, count, &name), list);
-
-    strcpy(cFileName, name);
 
     switch(argc) {
         case 0:
@@ -320,9 +329,6 @@ VALUE camera_save(int argc, VALUE *argv, VALUE self) {
                     } 
                 } else if (strcmp(key, "new_name") == 0) {
                     newNameStr = RSTRING_PTR(rb_hash_aref(argv[0], RARRAY_PTR(arr)[i]));
-                    if (strlen(newNameStr) > 0) {
-                        newName = 1;
-                    }
                 } else if (strcmp(key, "type") == 0) {
                     hVal = rb_hash_aref(argv[0], RARRAY_PTR(arr)[i]);
                     Check_Type(hVal, T_SYMBOL);
@@ -361,14 +367,18 @@ VALUE camera_save(int argc, VALUE *argv, VALUE self) {
     gp_file_new(&file);
     RESULT_CHECK_LIST_FILE(gp_camera_file_get(c->camera, cFolderName, cFileName, fileType, file, c->context), list, file);
     RESULT_CHECK_LIST_FILE(gp_file_get_data_and_size(file, &fData, &fSize), list, file);
-    if (newName == 1)  {
-        strcat(fName, newNameStr);
-        pchNew = strrchr(newNameStr, '.');
-        pchSrc = strrchr(cFileName, '.');
-        if (pchNew == NULL) {
-            strcat(fName, pchSrc);
-        } else if (strcmp(pchNew, pchSrc) != 0) {
-            strcat(fName, pchSrc);
+    if (newNameStr)  {
+        if (strlen(newNameStr) > 0) {
+            strcat(fName, newNameStr);
+            pchNew = strrchr(newNameStr, '.');
+            pchSrc = strrchr(cFileName, '.');
+            if (pchNew == NULL) {
+                strcat(fName, pchSrc);
+            } else if (strcmp(pchNew, pchSrc) != 0) {
+                strcat(fName, pchSrc);
+            }
+        } else {
+            strcat(fName, cFileName);
         }
     } else {
         strcat(fName, cFileName);
@@ -420,18 +430,22 @@ VALUE camera_delete(int argc, VALUE *argv, VALUE self) {
     
     strcpy(cFolderName, c->virtFolder);
 
-    RESULT_CHECK_LIST(gp_filesystem_reset(c->camera->fs), list);
-    RESULT_CHECK_LIST(gp_camera_folder_list_files(c->camera, c->virtFolder, list, c->context), list);
-    count = gp_list_count(list);
-    RESULT_CHECK_LIST(count, list);
-    if (count == 0) {
-        gp_list_free(list);
-        return self; // Nothing to delete
+    if (strlen(c->lastName) > 0) {
+        strcpy(cFileName, c->lastName);
     } else {
-        count -= 1;
+        RESULT_CHECK_LIST(gp_filesystem_reset(c->camera->fs), list);
+        RESULT_CHECK_LIST(gp_camera_folder_list_files(c->camera, c->virtFolder, list, c->context), list);
+        count = gp_list_count(list);
+        RESULT_CHECK_LIST(count, list);
+        if (count == 0) {
+            gp_list_free(list);
+            return self; // Nothing to save
+        } else {
+            count -= 1;
+        }
+        RESULT_CHECK_LIST(gp_list_get_name(list, count, &name), list);
+        strcpy(cFileName, name);
     }
-    RESULT_CHECK_LIST(gp_list_get_name(list, count, &name), list);
-    strcpy(cFileName, name);
     
     switch(argc) {
         case 0:
@@ -474,8 +488,12 @@ VALUE camera_delete(int argc, VALUE *argv, VALUE self) {
     
     if (one == 1) {
         RESULT_CHECK_LIST(gp_camera_file_delete(c->camera, cFolderName, cFileName, c->context), list);
+        if (strcmp(c->lastName, cFileName) == 0) {
+            c->lastName[0] = '\0';
+        }
     } else {
         RESULT_CHECK_LIST(gp_camera_folder_delete_all(c->camera, cFolderName, c->context), list);
+        c->lastName[0] = '\0';
     }
     RESULT_CHECK_LIST(gp_filesystem_reset(c->camera->fs), list);
     gp_list_free(list);
@@ -507,13 +525,8 @@ VALUE camera_delete(int argc, VALUE *argv, VALUE self) {
  *
  */
 VALUE camera_get_config(int argc, VALUE *argv, VALUE self) {
-    int i;
-    const char *key;
     GPhoto2Camera *c;
-    CameraWidgetType widgettype;
-    VALUE arr, cfg;
-
-    cfg = rb_iv_get(self, "@configuration");
+    VALUE cfg = rb_iv_get(self, "@configuration");
 
     switch (argc) {
         case 1:
@@ -523,31 +536,8 @@ VALUE camera_get_config(int argc, VALUE *argv, VALUE self) {
             if (strcmp(rb_id2name(rb_to_id(argv[0])), "no_cache") == 0) {
                 gp_widget_free(c->config);
                 gp_result_check(gp_camera_get_config(c->camera, &(c->config), c->context));
-                arr = rb_funcall(cfg, rb_intern("keys"), 0);
-                for (i = 0; i < RARRAY_LEN(arr); i++) {
-                    key = RSTRING_PTR(RARRAY_PTR(arr)[i]);
-                    gp_result_check(gp_widget_get_child_by_name(c->config, key, &(c->childConfig)));
-                    gp_result_check(gp_widget_get_type(c->childConfig, &widgettype));
-                    switch (widgettype) {
-                        case GP_WIDGET_RADIO:
-                            rb_hash_aset(cfg, RARRAY_PTR(arr)[i], getRadio(c->childConfig));
-                            break;
-                        case GP_WIDGET_TEXT:
-                            rb_hash_aset(cfg, RARRAY_PTR(arr)[i], getText(c->childConfig));
-                            break;
-                        case GP_WIDGET_RANGE:
-                            rb_hash_aset(cfg, RARRAY_PTR(arr)[i], getRange(c->childConfig));
-                            break;
-                        case GP_WIDGET_TOGGLE:
-                            rb_hash_aset(cfg, RARRAY_PTR(arr)[i], getToggle(c->childConfig));
-                            break;
-                        case GP_WIDGET_DATE:
-                            rb_hash_aset(cfg, RARRAY_PTR(arr)[i], getDate(c->childConfig));
-                            break;
-                        default:
-                            break;
-                    }
-                }
+                rb_funcall(cfg, rb_intern("replace"), 1, rb_hash_new());
+                populateWithConfigs(c->config, cfg);
             } else {
                 rb_raise(rb_cGPhoto2ConfigurationError, "Unknown directive '%s'", rb_id2name(rb_to_id(argv[0])));
                 return Qnil;
@@ -1166,7 +1156,7 @@ VALUE camera_wait(int argc, VALUE *argv, VALUE self) {
     }
     
     Data_Get_Struct(self, GPhoto2Camera, c);
-    ce = (GPhoto2CameraEvent*) malloc(sizeof(GPhoto2CameraEvent));
+    ce = (GPhoto2CameraEvent*) ALLOC(GPhoto2CameraEvent);
     
 //    RESULT_CHECK_EVENT(gp_filesystem_reset(c->camera->fs), ce);
     RESULT_CHECK_EVENT(gp_camera_wait_for_event(c->camera, to, &(ce->type), &evtData, c->context), ce);
@@ -1176,6 +1166,7 @@ VALUE camera_wait(int argc, VALUE *argv, VALUE self) {
         case GP_EVENT_FOLDER_ADDED:
             ce->path = (CameraFilePath*)evtData;
             strcpy(c->virtFolder, ce->path->folder);
+            strcpy(c->lastName, ce->path->name);
             break;
         case GP_EVENT_UNKNOWN:
             break;

data/ext/gphoto2camera_utilities.h

@@ -47,6 +47,7 @@ typedef struct {
     GPContext *context;
     
     char *virtFolder;
+    char *lastName;
 } GPhoto2Camera;
 
 extern VALUE rb_cGPhoto2Exception;

data/ext/gphoto4ruby.c

@@ -21,15 +21,34 @@
  */
 
 #include <ruby.h>
+#include <gphoto2/gphoto2-version.h>
 #include "gphoto2camera_event.h"
 #include "gphoto2camera_utilities.h"
 #include "gphoto2camera.h"
 
 void Init_gphoto4ruby() {
+    const char **v = gp_library_version(GP_VERSION_SHORT);
+    char libGPVersion[256];
+    int i;
+
+    strcpy(libGPVersion, v[0]);
+    for (i = 1; v[i] != NULL; i++) {
+        if (v[i+1] != NULL) {
+            strcat(libGPVersion, v[i]);
+            strcat(libGPVersion, ", ");
+        } else {
+            strcat(libGPVersion, v[i]);
+        }
+    }
+
     /*
      * Module contains camera class definition and some exceptions.
      */
     rb_mGPhoto2 = rb_define_module("GPhoto2");
+    /*
+     * Version of libgphoto used by gem
+     */
+    rb_define_const(rb_mGPhoto2, "LIBGPHOTO2_VERSION", rb_str_new2(libGPVersion));
     /*
      * GPhoto2::Camera object is a Ruby wrapping aroung gphoto2 C library.
      */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gphoto4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - neq4 company
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 +04:00
+date: 2009-11-06 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
-description: 
+description: GPhoto4Ruby is used to control PPTP cameras (the ones that can be controlled with gphoto2) using power of ruby.
 email: sergey.kruk@gmail.com
 executables: []