gphoto4ruby 0.1.2 → 0.1.3

data/CHANGELOG.rdoc

@@ -1,6 +1,12 @@
-== master
+== 0.1.3
 
 * Added "delete file from camera" function
+* Directive :type and class constant to determine config type
+* "Configs" is now "config" (method name change)
+* Configs are now cached in instance variable
+* Added config_merge method
+* ProgrammerError removed
+* Removed allowed values check. Values just dont change instead of raising Errors
 
 == 0.1.2
 

data/README.rdoc

@@ -41,9 +41,13 @@ calling object methods.
 
 == Usage
 
-After installation of this gem rdocs are generated for you. 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
+After installation of this gem rdocs are generated for you. Or you can generate
+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.
 
 <b>example.rb:</b>
@@ -61,9 +65,9 @@ connected through usb in PTP mode.
 
       # list available configuration items with current values and lists
       # of allowed values
-      c.configs.each do |cfg|
-          puts cfg + " value is: " + c[cfg].to_s
-          puts "values available are: " + c[cfg, :all].inspect
+      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
       end
 
       # capture image
@@ -88,9 +92,9 @@ connected through usb in PTP mode.
       ports.each do |port|
           c = GPhoto2::Camera.new(port)
           puts "camera in port: " + port
-          c.configs.each do |cfg|
-              puts cfg + " value is: " + c[cfg].to_s
-              puts "values available are: " + c[cfg, :all].inspect
+          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

data/example.rb

@@ -11,9 +11,9 @@ if ports.empty?
 
     # list available configuration items with current values and lists
     # of allowed values
-    c.configs.each do |cfg|
-        puts cfg + " value is: " + c[cfg].to_s
-        puts "values available are: " + c[cfg, :all].inspect
+    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
     end
 
     # capture image
@@ -38,9 +38,9 @@ else
     ports.each do |port|
         c = GPhoto2::Camera.new(port)
         puts "camera in port: " + port
-        c.configs.each do |cfg|
-            puts cfg + " value is: " + c[cfg].to_s
-            puts "values available are: " + c[cfg, :all].inspect
+        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

data/ext/gphoto4ruby.c

@@ -32,166 +32,129 @@ static void rb_raise_gp_result(int retval) {
     rb_raise(rb_cGPhoto2Exception, "LibGPhoto2 function returned: %s", gp_result_as_string(retval));
 }
 
-static void rb_raise_programmer_error(const char* fName) {
-    rb_raise(rb_cGPhoto2ProgrammerError, "Program was not supposed to get here. Function: %s", fName);
+static int gp_result_check(int retval) {
+    if (retval < GP_OK) {
+        rb_raise_gp_result(retval);
+    }
+    return retval;
 }
 
 static VALUE getRadio(CameraWidget *cc) {
-    int retval;
     const char *val;
-    retval = gp_widget_get_value(cc, &val);
-    if (retval == GP_OK) {
-        return rb_str_new2(val);
-    } else {
-        rb_raise_gp_result(retval);
-        return Qnil;
-    }
+    gp_result_check(gp_widget_get_value(cc, &val));
+    return rb_str_new2(val);
 }
 
 static VALUE listRadio(CameraWidget *cc) {
-    int retval, i, choicesTotal;
+    int i, choicesTotal;
     const char *choice;
     VALUE arr;
 
-    choicesTotal = gp_widget_count_choices(cc);
+    choicesTotal = gp_result_check(gp_widget_count_choices(cc));
     arr = rb_ary_new();
     for (i = 0; i < choicesTotal; i++) {
-        retval = gp_widget_get_choice(cc, i, &choice);
-        if (retval == GP_OK) {
-            rb_ary_push(arr, rb_str_new2(choice));
-        } else {
-            rb_raise_gp_result(retval);
-            return Qnil;
-        }
+        gp_result_check(gp_widget_get_choice(cc, i, &choice));
+        rb_ary_push(arr, rb_str_new2(choice));
     }
     return arr;
 
-static VALUE setRadio(GPhoto2Camera *c, VALUE newVal) {
-    int retval, i, choicesTotal;
-    const char *choice;
+static VALUE setRadio(VALUE self, GPhoto2Camera *c, VALUE newVal, int save) {
+    int i, choicesTotal;
     const char *val;
 
     Check_Type(newVal, T_STRING);
     val = RSTRING(newVal)->ptr;
 
-    choicesTotal = gp_widget_count_choices(c->childConfig);
-    for (i = 0; i < choicesTotal; i++) {
-        gp_widget_get_choice(c->childConfig, i, &choice);
-        if (strcmp(choice, val) == 0) {
-            retval = gp_widget_set_value(c->childConfig, val);
-            if (retval == GP_OK) {
-                retval = gp_camera_set_config(c->camera, c->config, c->context);
-                if (retval == GP_OK) {
-                    return newVal;
-                }
-            }
-        }
-    }
-    if (retval != GP_OK) {
-        rb_raise_gp_result(retval);
-    } else {
-        rb_raise(rb_cGPhoto2ConfigurationError, "Value '%s' is not allowed", val);
+    gp_result_check(gp_widget_set_value(c->childConfig, val));
+    if (save) {
+        saveConfigs(self, c);
     }
-    return Qnil;
+    return newVal;
 }
 
 static VALUE getRange(CameraWidget *cc) {
-    int retval;
     float val;
-    retval = gp_widget_get_value(cc, &val);
-    if (retval == GP_OK) {
-        return rb_float_new(val);
-    } else {
-        rb_raise_gp_result(retval);
-        return Qnil;
-    }
+    gp_result_check(gp_widget_get_value(cc, &val));
+    return rb_float_new(val);
 }
 
 static VALUE listRange(CameraWidget *cc) {
-    int retval;
     float min, max, inc, i;
     VALUE arr;
 
-    retval = gp_widget_get_range(cc, &min, &max, &inc);
-    if ((retval == GP_OK) && (inc > 0)) {
-        arr = rb_ary_new();
+    gp_result_check(gp_widget_get_range(cc, &min, &max, &inc));
+    arr = rb_ary_new();
+    if (inc > 0) {
         for (i = min; i <= max; i = i + inc) {
             rb_ary_push(arr, rb_float_new(i));
         }
-        return arr;
-    } else if (retval != GP_OK) {
-        rb_raise_gp_result(retval);
     } else {
-        return rb_ary_new();
+        rb_ary_push(arr, rb_float_new(min));
     }
-    return Qnil;
+    return arr;
 }
 
-static VALUE setRange(GPhoto2Camera *c, VALUE newNum) {
-    int retval;
-    float min, max, inc, i;
+static VALUE setRange(VALUE self, GPhoto2Camera *c, VALUE newNum, int save) {
     float val;
 
     Check_Type(newNum, T_FLOAT);
     val = NUM2DBL(newNum);
 
-    retval = gp_widget_get_range(c->childConfig, &min, &max, &inc);
-    if ((retval == GP_OK) && (val >= min) && (val <= max) && (inc > 0)) {
-        for (i = min; i <= max; i = i + inc) {
-            if ((val >= i) && (val <= (i+inc))) {
-                if ((val - i) > (inc / 2.0)) {
-                    val = i + inc;
-                } else {
-                    val = i;
-                }
-                retval = gp_widget_set_value(c->childConfig, &val);
-                if (retval == GP_OK) {
-                    retval = gp_camera_set_config(c->camera, c->config, c->context);
-                    if (retval == GP_OK) {
-                        return rb_float_new(val);
-                    }
-                }
-            }
-        }
-    }
-    if (retval != GP_OK) {
-        rb_raise_gp_result(retval);
-    } else {
-        rb_raise(rb_cGPhoto2ConfigurationError, "Value has to be in range: %f .. %f", min, max);
+    gp_result_check(gp_widget_set_value(c->childConfig, &val));
+    if (save) {
+        saveConfigs(self, c);
     }
-    return Qnil;
+    return newNum;
 }
 
-static void populateWithConfigs(CameraWidget *cc, VALUE arr) {
-    int retval, i, childrenTotal;
-    const char *name;
-    CameraWidget *child;
+static void saveConfigs(VALUE self, GPhoto2Camera *c) {
+    VALUE cfgs, cfg_changed, name;
     CameraWidgetType widgettype;
     
-    retval = gp_widget_get_type(cc, &widgettype);
-    if (retval == GP_OK) {
+    gp_result_check(gp_camera_set_config(c->camera, c->config, c->context));
+    gp_result_check(gp_camera_get_config(c->camera, &(c->config), c->context));
+    cfg_changed = rb_iv_get(self, "@configs_changed");
+    cfgs = rb_iv_get(self, "@configuration");
+    name = rb_ary_shift(cfg_changed);
+    while (TYPE(name) != T_NIL) {
+        gp_result_check(gp_widget_get_child_by_name(c->config, RSTRING(name)->ptr, &(c->childConfig)));
+        gp_result_check(gp_widget_get_type(c->childConfig, &widgettype));
         switch (widgettype) {
             case GP_WIDGET_RADIO:
-            case GP_WIDGET_RANGE:
-                retval = gp_widget_get_name(cc, &name);
-                if (retval == GP_OK) {
-                    rb_ary_push(arr, rb_str_new2(name));
-                }
+                rb_hash_aset(cfgs, name, getRadio(c->childConfig));
                 break;
-            case GP_WIDGET_WINDOW:
-            case GP_WIDGET_SECTION:
-                childrenTotal = gp_widget_count_children(cc);
-                for (i = 0; i < childrenTotal; i ++) {
-                    retval = gp_widget_get_child(cc, i, &child);
-                    if (retval == GP_OK) {
-                        populateWithConfigs(child, arr);
-                    }
-                }
+            case GP_WIDGET_RANGE:
+                rb_hash_aset(cfgs, name, getRange(c->childConfig));
                 break;
         }
+        name = rb_ary_shift(cfg_changed);
     }
-    if (retval != GP_OK) {
-        rb_raise_gp_result(retval);
+}
+
+static void populateWithConfigs(CameraWidget *cc, VALUE hash) {
+    int i, childrenTotal;
+    const char *name;
+    CameraWidget *child;
+    CameraWidgetType widgettype;
+    
+    gp_result_check(gp_widget_get_type(cc, &widgettype));
+    switch (widgettype) {
+        case GP_WIDGET_RADIO:
+            gp_result_check(gp_widget_get_name(cc, &name));
+            rb_hash_aset(hash, rb_str_new2(name), getRadio(cc));
+            break;
+        case GP_WIDGET_RANGE:
+            gp_result_check(gp_widget_get_name(cc, &name));
+            rb_hash_aset(hash, rb_str_new2(name), getRange(cc));
+            break;
+        case GP_WIDGET_WINDOW:
+        case GP_WIDGET_SECTION:
+            childrenTotal = gp_result_check(gp_widget_count_children(cc));
+            for (i = 0; i < childrenTotal; i ++) {
+                gp_result_check(gp_widget_get_child(cc, i, &child));
+                populateWithConfigs(child, hash);
+            }
+            break;
     }
 }
 
@@ -199,39 +162,27 @@ static void camera_mark(GPhoto2Camera *c) {
 }
 
 static void camera_free(GPhoto2Camera *c) {
-    int retval;
-    retval = gp_camera_exit(c->camera, c->context);
-    retval = gp_widget_free(c->config);
-    retval = gp_list_free(c->list);
-    retval = gp_file_free(c->file);
-    retval = gp_camera_free(c->camera);
+    gp_result_check(gp_camera_exit(c->camera, c->context));
+    gp_result_check(gp_widget_free(c->config));
+    gp_result_check(gp_list_free(c->list));
+    gp_result_check(gp_file_free(c->file));
+    gp_result_check(gp_camera_free(c->camera));
     free(c->virtFolder);
     free(c->context);
     free(c);
 }
 
 static VALUE camera_allocate(VALUE klass) {
-    int retval;
     GPhoto2Camera *c;
     c = (GPhoto2Camera*) malloc(sizeof(GPhoto2Camera));
     c->virtFolder = (char*) malloc(sizeof(char)*100);
     strcpy(c->virtFolder, "/");
     c->context = gp_context_new();
-    retval = gp_camera_new(&(c->camera));
-    if (retval == GP_OK) {
-        retval = gp_list_new(&(c->list));
-        if (retval == GP_OK) {
-            retval = gp_camera_get_config(c->camera, &(c->config), c->context);
-            if (retval == GP_OK) {
-                retval = gp_file_new(&(c->file));
-                if (retval == GP_OK) {
-                    return Data_Wrap_Struct(klass, camera_mark, camera_free, c);
-                }
-            }
-        }
-    }
-    rb_raise_gp_result(retval);
-    return Qnil;
+    gp_result_check(gp_camera_new(&(c->camera)));
+    gp_result_check(gp_list_new(&(c->list)));
+    gp_result_check(gp_camera_get_config(c->camera, &(c->config), c->context));
+    gp_result_check(gp_file_new(&(c->file)));
+    return Data_Wrap_Struct(klass, camera_mark, camera_free, c);
 }
 
 /*
@@ -250,44 +201,37 @@ static VALUE camera_allocate(VALUE klass) {
  *
  */
 static VALUE camera_initialize(int argc, VALUE *argv, VALUE self) {
+    GPhoto2Camera *c;
+    VALUE cfgs;
+
+    Data_Get_Struct(self, GPhoto2Camera, c);
+
     switch (argc) {
         case 0:
-            return self;
             break;
         case 1:
             Check_Type(argv[0], T_STRING);
-            int retval, portIndex;
+            int portIndex;
             GPPortInfoList *portInfoList;
             GPPortInfo p;
-            GPhoto2Camera *c;
-
-            Data_Get_Struct(self, GPhoto2Camera, c);
             
-            retval = gp_port_info_list_new(&portInfoList);
-            if (retval == GP_OK) {
-                retval = gp_port_info_list_load(portInfoList);
-                if (retval == GP_OK) {
-                    portIndex = gp_port_info_list_lookup_path(portInfoList, RSTRING(argv[0])->ptr);
-                    if (portIndex >= 0) {
-                        retval = gp_port_info_list_get_info(portInfoList, portIndex, &p);
-                        if (retval == GP_OK) {
-                            retval = gp_camera_set_port_info(c->camera, p);
-                            if (retval == GP_OK) {
-                                return self;
-                            }
-                        }
-                    } else {
-                        rb_raise_gp_result(portIndex);
-                        return Qnil;
-                    }
-                }
-            }
-            rb_raise_gp_result(retval);
-            return Qnil;
+            gp_result_check(gp_port_info_list_new(&portInfoList));
+            gp_result_check(gp_port_info_list_load(portInfoList));
+            portIndex = gp_result_check(gp_port_info_list_lookup_path(portInfoList, RSTRING(argv[0])->ptr));
+            gp_result_check(gp_port_info_list_get_info(portInfoList, portIndex, &p));
+            gp_result_check(gp_camera_set_port_info(c->camera, p));
+            break;
         default:
             rb_raise(rb_eArgError, "Wrong number of arguments (%d for 0 or 1)", argc);
             return Qnil;
     }
+    
+    cfgs = rb_hash_new();
+    populateWithConfigs(c->config, cfgs);
+    rb_iv_set(self, "@configuration", cfgs);
+    rb_iv_set(self, "@configs_changed", rb_ary_new());
+    
+    return self;
 }
 
 /*
@@ -306,60 +250,55 @@ static VALUE camera_initialize(int argc, VALUE *argv, VALUE self) {
  *
  */
 static VALUE camera_class_ports(VALUE klass) {
-    int retval, i, portsTotal;
+    int i, portsTotal;
     GPPortInfoList *portInfoList;
     GPPortInfo p;
     VALUE arr;
     
-    retval = gp_port_info_list_new(&portInfoList);
-    if (retval == GP_OK) {
-        retval = gp_port_info_list_load(portInfoList);
-        if (retval == GP_OK) {
-            portsTotal = gp_port_info_list_count(portInfoList);
-            arr = rb_ary_new();
-            for(i = 0; i < portsTotal; i++) {
-                retval = gp_port_info_list_get_info(portInfoList, i, &p);
-                if ((retval == GP_OK) && (strlen(p.path) > 4) && (strncmp(p.path, "usb:", 4) == 0)) {
-                    rb_ary_push(arr, rb_str_new2(p.path));
-                }
-            }
-            retval = gp_port_info_list_free(portInfoList);
-            if (retval == GP_OK) {
-                return arr;
-            }
+    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));
+    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));
         }
     }
-    rb_raise_gp_result(retval);
-    return Qnil;
+    gp_result_check(gp_port_info_list_free(portInfoList));
+    return arr;
 }
 
 /*
  * call-seq:
- *   capture                        =>      camera
+ *   capture(config={})             =>      camera
  *
- * Sends command to camera to capture image with current configuration
+ * Sends command to camera to capture image with current or provided
+ * configuration. Provided configuration is kept after capture.
  *
  * Examples:
  *
  *   c = GPhoto2::Camera.new
  *   c.capture
+ *   c.capture "exptime" => "0.010", "iso" => "400"
  *
  */
-static VALUE camera_capture(VALUE self) {
-    int retval;
+static VALUE camera_capture(int argc, VALUE *argv, VALUE self) {
     GPhoto2Camera *c;
 
     Data_Get_Struct(self, GPhoto2Camera, c);
-
-    retval = gp_camera_capture(c->camera, GP_CAPTURE_IMAGE, &(c->path), c->context);
-    if (retval == GP_OK) {
-        strcpy(c->virtFolder, c->path.folder);
-        printf("captured: %s/%s\n", c->path.folder, c->path.name);
-        return self;
-    } else {
-        rb_raise_gp_result(retval);
+    
+    if (argc == 1) {
+        camera_config_merge(self, argv[0]);
+    } else if (argc != 0) {
+        rb_raise(rb_eArgError, "Wrong number of arguments (%d for 0 or 1)", argc);
         return Qnil;
     }
+
+    gp_result_check(gp_camera_capture(c->camera, GP_CAPTURE_IMAGE, &(c->path), c->context));
+    strcpy(c->virtFolder, c->path.folder);
+//        printf("captured: %s/%s\n", c->path.folder, c->path.name);
+    return self;
 }
 
 /*
@@ -388,7 +327,7 @@ static VALUE camera_capture(VALUE self) {
  *
  */
 static VALUE camera_save(int argc, VALUE *argv, VALUE self) {
-    int retval, i;
+    int i;
     int newName = -1;
     CameraFileType fileType = GP_FILE_TYPE_NORMAL;
     GPhoto2Camera *c;
@@ -467,33 +406,25 @@ static VALUE camera_save(int argc, VALUE *argv, VALUE self) {
             return Qnil;
     }
     
-    retval = gp_filesystem_reset(c->camera->fs);
-    if (retval == GP_OK) {
-        retval = gp_camera_file_get(c->camera, cFolderName, cFileName, fileType, c->file, c->context);
-        if (retval == GP_OK) {
-            retval = gp_file_get_data_and_size(c->file, &fData, &fSize);
-            if (retval == GP_OK) {
-                if (newName == 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);
-                }
-                fd = open(fName, O_CREAT | O_WRONLY, 0644);
-                write(fd, fData, fSize);
-                close(fd);
-                return self;
-            }
+    gp_result_check(gp_filesystem_reset(c->camera->fs));
+    gp_result_check(gp_camera_file_get(c->camera, cFolderName, cFileName, fileType, c->file, c->context));
+    gp_result_check(gp_file_get_data_and_size(c->file, &fData, &fSize));
+    if (newName == 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);
     }
-    rb_raise_gp_result(retval);
-    return Qnil;
+    fd = open(fName, O_CREAT | O_WRONLY, 0644);
+    write(fd, fData, fSize);
+    close(fd);
+    return self;
 }
 
 /*
@@ -514,7 +445,7 @@ static VALUE camera_save(int argc, VALUE *argv, VALUE self) {
  *
  */
 static VALUE camera_delete(int argc, VALUE *argv, VALUE self) {
-    int retval, i;
+    int i;
     GPhoto2Camera *c;
     const char *key;
     char cFileName[100], cFolderName[100];
@@ -554,28 +485,22 @@ static VALUE camera_delete(int argc, VALUE *argv, VALUE self) {
             return Qnil;
     }
     
-    retval = gp_filesystem_reset(c->camera->fs);
-    if (retval == GP_OK) {
-        retval = gp_camera_file_delete(c->camera, cFolderName, cFileName, c->context);
-        if (retval == GP_OK) {
-            return self;
-        }
-    }
-    rb_raise_gp_result(retval);
-    return Qnil;
+    gp_result_check(gp_filesystem_reset(c->camera->fs));
+    gp_result_check(gp_camera_file_delete(c->camera, cFolderName, cFileName, c->context));
+    return self;
 }
 
 /*
  * call-seq:
- *   configs                        =>      array
+ *   config                         =>      hash
  *
- * Returns an array of adjustable camera configurations.
+ * Returns cached hash of adjustable camera configuration with their values.
  *
  * Examples:
  *
  *   c = GPhoto2::Camera.new
  *   # with Nikon DSC D80
- *   c.configs                      #=>     ["capturetarget", "imgquality",
+ *   c.config.keys                  #=>     ["capturetarget", "imgquality",
  *                                           "imgsize", "whitebalance",
  *                                           "f-number", "focallength",
  *                                           "focusmode", "iso",
@@ -587,25 +512,82 @@ static VALUE camera_delete(int argc, VALUE *argv, VALUE self) {
  *                                           "channel", "encryption"]
  *
  */
-static VALUE camera_get_configs(VALUE self) {
+static VALUE camera_get_config(VALUE self) {
+    return rb_iv_get(self, "@configuration");
+}
+
+/*
+ * call-seq:
+ *   config_merge(hash)             =>      hash
+ *
+ * Adjusts camera configuration with given values.
+ *
+ * Examples:
+ *
+ *   c = GPhoto2::Camera.new
+ *   # with Nikon DSC D80
+ *   c.config_merge "f-number" => "f/4", "exptime" => "0.010", "iso" => "200"
+ *
+ */
+static VALUE camera_config_merge(VALUE self, VALUE hash) {
+    Check_Type(hash, T_HASH);
+
+    int i;
+    const char *key;
     GPhoto2Camera *c;
-    VALUE arr = rb_ary_new();
+    CameraWidgetType widgettype;
+    VALUE arr, cfgs, cfg_changed;
 
     Data_Get_Struct(self, GPhoto2Camera, c);
 
-    populateWithConfigs(c->config, arr);
-    
-    return arr;
+    arr = rb_funcall(hash, rb_intern("keys"), 0);
+    cfgs = rb_iv_get(self, "@configuration");
+    cfg_changed = rb_iv_get(self, "@configs_changed");
+    for (i = 0; i < RARRAY(arr)->len; i++) {
+        switch(TYPE(RARRAY(arr)->ptr[i])) {
+            case T_STRING:
+                key = RSTRING(RARRAY(arr)->ptr[i])->ptr;
+                break;
+            case T_SYMBOL:
+                key = rb_id2name(rb_to_id(RARRAY(arr)->ptr[i]));
+                break;
+            default:
+                rb_raise(rb_eTypeError, "Not valid key type");
+                return Qnil;
+        }
+        if (TYPE(rb_funcall(cfgs, rb_intern("has_key?"), 1, rb_str_new2(key))) == T_TRUE) {
+            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_ary_push(cfg_changed, rb_str_new2(key));
+                    setRadio(self, c, rb_hash_aref(hash, RARRAY(arr)->ptr[i]), 0);
+                    break;
+                case GP_WIDGET_RANGE:
+                    rb_ary_push(cfg_changed, rb_str_new2(key));
+                    setRange(self, c, rb_hash_aref(hash, RARRAY(arr)->ptr[i]), 0);
+                    break;
+            }
+        }
+    }
+    saveConfigs(self, c);
+    return cfgs;
 }
 
 /*
  * call-seq:
  *   cam[cfg]                       =>      float or string
  *   cam[cfg, :all]                 =>      array
+ *   cam[cfg, :type]                =>      fixnum
  *
  * Returns current value of specified camera configuration. Configuration name
  * (cfg) can be string or symbol and must be in configs method returned array.
- * When called with directive <b>:all</b> returns an array of allowed values
+ * Configuration is cached in @configuration instance variable.
+ * 
+ * Possible directives:
+ * * <b>:no_cache</b> doesn't use cached configuration value
+ * * <b>:all</b> returns an array of allowed values;
+ * * <b>:type</b> returns one of available CONFIG_TYPE constats
  *
  * Examples:
  *
@@ -614,14 +596,15 @@ static VALUE camera_get_configs(VALUE self) {
  *   c["f-number"]                  #=>     "f/4.5"
  *   c[:focallength]                #=>     10.5
  *   c[:focusmode, :all]            #=>     ["Manual", "AF-S", "AF-C", "AF-A"]
+ *   c[:exptime, :type] == GPhoto2::Camera::CONFIG_TYPE_RADIO
+ *                                  #=>     true
  *
  */
 static VALUE camera_get_value(int argc, VALUE *argv, VALUE self) {
-    int retval;
     const char *name;
     GPhoto2Camera *c;
     CameraWidgetType widgettype;
-    VALUE str, dir;
+    VALUE str, dir, cfgs;
     
     switch (argc) {
         case 1:
@@ -630,6 +613,7 @@ static VALUE camera_get_value(int argc, VALUE *argv, VALUE self) {
         case 2:
             str = argv[0];
             dir = argv[1];
+            Check_Type(dir, T_SYMBOL);
             break;
         default:
             rb_raise(rb_eArgError, "Wrong number of arguments (%d for 1 or 2)", argc);
@@ -648,45 +632,43 @@ static VALUE camera_get_value(int argc, VALUE *argv, VALUE self) {
             return Qnil;
     }
     
-    Data_Get_Struct(self, GPhoto2Camera, c);
+    if (argc == 1) {
+        return rb_hash_aref(rb_iv_get(self, "@configuration"), rb_str_new2(name));
+    } else {
+        Data_Get_Struct(self, GPhoto2Camera, c);
 
-    retval = gp_widget_get_child_by_name(c->config, name, &(c->childConfig));
-    if (retval == GP_OK) {
-        retval = gp_widget_get_type(c->childConfig, &widgettype);
-        if (retval == GP_OK) {
-            switch (widgettype) {
-                case GP_WIDGET_RADIO:
-                    if (argc == 1) {
-                        return getRadio(c->childConfig);
-                    } else if (strcmp(rb_id2name(rb_to_id(dir)), "all") == 0) {
-                        return listRadio(c->childConfig);
-                    } else {
-                        rb_raise(rb_cGPhoto2ConfigurationError, "Second parameter not valid");
-                        return Qnil;
-                    }
-                    break;
-                case GP_WIDGET_RANGE:
-                    if (argc == 1) {
-                        return getRange(c->childConfig);
-                    } else if (strcmp(rb_id2name(rb_to_id(dir)), "all") == 0) {
-                        return listRange(c->childConfig);
-                    } else {
-                        rb_raise(rb_cGPhoto2ConfigurationError, "Second parameter not valid");
-                        return Qnil;
-                    }
-                    break;
-                default:
-                    rb_raise(rb_cGPhoto2ConfigurationError, "Not supported yet");
+        gp_result_check(gp_widget_get_child_by_name(c->config, name, &(c->childConfig)));
+        gp_result_check(gp_widget_get_type(c->childConfig, &widgettype));
+        switch (widgettype) {
+            case GP_WIDGET_RADIO:
+                if (strcmp(rb_id2name(rb_to_id(dir)), "no_cache") == 0) {
+                    return getRadio(c->childConfig);
+                } else if (strcmp(rb_id2name(rb_to_id(dir)), "all") == 0) {
+                    return listRadio(c->childConfig);
+                } else if (strcmp(rb_id2name(rb_to_id(dir)), "type") == 0) {
+                    return INT2FIX(GP_WIDGET_RADIO);
+                } else {
+                    rb_raise(rb_cGPhoto2ConfigurationError, "Unknown directive '%s'", rb_id2name(rb_to_id(dir)));
                     return Qnil;
-            }
+                }
+                break;
+            case GP_WIDGET_RANGE:
+                if (strcmp(rb_id2name(rb_to_id(dir)), "no_cache") == 0) {
+                    return getRange(c->childConfig);
+                } else if (strcmp(rb_id2name(rb_to_id(dir)), "all") == 0) {
+                    return listRange(c->childConfig);
+                } else if (strcmp(rb_id2name(rb_to_id(dir)), "type") == 0) {
+                    return INT2FIX(GP_WIDGET_RANGE);
+                } else {
+                    rb_raise(rb_cGPhoto2ConfigurationError, "Unknown directive '%s'", rb_id2name(rb_to_id(dir)));
+                    return Qnil;
+                }
+                break;
+            default:
+                rb_raise(rb_cGPhoto2ConfigurationError, "Not supported yet");
+                return Qnil;
         }
     }
-    if (retval != GP_OK) {
-        rb_raise_gp_result(retval);
-    } else {
-        rb_raise_programmer_error("camera_get_value");
-    }
-    return Qnil;
 }
 
 /*
@@ -704,10 +686,10 @@ static VALUE camera_get_value(int argc, VALUE *argv, VALUE self) {
  *
  */
 static VALUE camera_set_value(VALUE self, VALUE str, VALUE newVal) {
-    int retval;
     const char *name;
     GPhoto2Camera *c;
     CameraWidgetType widgettype;
+    VALUE cfg_changed;
     
     switch (TYPE(str)) {
         case T_STRING:
@@ -723,29 +705,23 @@ static VALUE camera_set_value(VALUE self, VALUE str, VALUE newVal) {
     
     Data_Get_Struct(self, GPhoto2Camera, c);
 
-    retval = gp_widget_get_child_by_name(c->config, name, &(c->childConfig));
-    if (retval == GP_OK) {
-        retval = gp_widget_get_type(c->childConfig, &widgettype);
-        if (retval == GP_OK) {
-            switch (widgettype) {
-                case GP_WIDGET_RADIO:
-                    return setRadio(c, newVal);
-                    break;
-                case GP_WIDGET_RANGE:
-                    return setRange(c, newVal);
-                    break;
-                default:
-                    rb_raise(rb_cGPhoto2ConfigurationError, "Cannot access this setting");
-                    return Qnil;
-            }
-        }
-    }
-    if (retval != GP_OK) {
-        rb_raise_gp_result(retval);
-    } else {
-        rb_raise_programmer_error("camera_set_value");
+    gp_result_check(gp_widget_get_child_by_name(c->config, name, &(c->childConfig)));
+    gp_result_check(gp_widget_get_type(c->childConfig, &widgettype));
+    switch (widgettype) {
+        case GP_WIDGET_RADIO:
+            cfg_changed = rb_iv_get(self, "@configs_changed");
+            rb_ary_push(cfg_changed, rb_str_new2(name));
+            return setRadio(self, c, newVal, 1);
+            break;
+        case GP_WIDGET_RANGE:
+            cfg_changed = rb_iv_get(self, "@configs_changed");
+            rb_ary_push(cfg_changed, rb_str_new2(name));
+            return setRange(self, c, newVal, 1);
+            break;
+        default:
+            rb_raise(rb_cGPhoto2ConfigurationError, "Cannot access this setting");
+            return Qnil;
     }
-    return Qnil;
 }
 
 /*
@@ -787,31 +763,21 @@ static VALUE camera_folder(VALUE self) {
  *
  */
 static VALUE camera_subfolders(VALUE self) {
-    int retval, i, count;
+    int i, count;
     const char *name;
     GPhoto2Camera *c;
     VALUE arr;
     
     Data_Get_Struct(self, GPhoto2Camera, c);
     
-    retval = gp_camera_folder_list_folders(c->camera, c->virtFolder, c->list, c->context);
-    if (retval == GP_OK) {
-        count = gp_list_count(c->list);
-        if (count < 0) {
-            rb_raise_gp_result(retval);
-            return Qnil;
-        }
-        arr = rb_ary_new();
-        for (i = 0; i < count; i++) {
-            retval = gp_list_get_name(c->list, i, &name);
-            if (retval == GP_OK) {
-                rb_ary_push(arr, rb_str_new2(name));
-            }
-        }
-        return arr;
+    gp_result_check(gp_camera_folder_list_folders(c->camera, c->virtFolder, c->list, c->context));
+    count = gp_result_check(gp_list_count(c->list));
+    arr = rb_ary_new();
+    for (i = 0; i < count; i++) {
+        gp_result_check(gp_list_get_name(c->list, i, &name));
+        rb_ary_push(arr, rb_str_new2(name));
     }
-    rb_raise_gp_result(retval);
-    return Qnil;
+    return arr;
 }
 
 /*
@@ -832,34 +798,22 @@ static VALUE camera_subfolders(VALUE self) {
  *
  */
 static VALUE camera_files(VALUE self) {
-    int retval, i, count;
+    int i, count;
     const char *name;
     GPhoto2Camera *c;
     VALUE arr;
     
     Data_Get_Struct(self, GPhoto2Camera, c);
     
-    retval = gp_filesystem_reset(c->camera->fs);
-    if (retval == GP_OK) {
-        retval = gp_camera_folder_list_files(c->camera, c->virtFolder, c->list, c->context);
-        if (retval == GP_OK) {
-            count = gp_list_count(c->list);
-            if (count < 0) {
-                rb_raise_gp_result(retval);
-                return Qnil;
-            }
-            arr = rb_ary_new();
-            for (i = 0; i < count; i++) {
-                retval = gp_list_get_name(c->list, i, &name);
-                if (retval == GP_OK) {
-                    rb_ary_push(arr, rb_str_new2(name));
-                }
-            }
-            return arr;
-        }
+    gp_result_check(gp_filesystem_reset(c->camera->fs));
+    gp_result_check(gp_camera_folder_list_files(c->camera, c->virtFolder, c->list, c->context));
+    count = gp_result_check(gp_list_count(c->list));
+    arr = rb_ary_new();
+    for (i = 0; i < count; i++) {
+        gp_result_check(gp_list_get_name(c->list, i, &name));
+        rb_ary_push(arr, rb_str_new2(name));
     }
-    rb_raise_gp_result(retval);
-    return Qnil;
+    return arr;
 }
 
 /*
@@ -916,7 +870,7 @@ static VALUE camera_folder_up(VALUE self) {
  */
 static VALUE camera_folder_down(VALUE self, VALUE folder) {
     Check_Type(folder, T_STRING);
-    int retval;
+
     const char *name;
     int index;
     GPhoto2Camera *c;
@@ -924,16 +878,12 @@ static VALUE camera_folder_down(VALUE self, VALUE folder) {
     Data_Get_Struct(self, GPhoto2Camera, c);
     
     name = RSTRING(folder)->ptr;
-    retval = gp_camera_folder_list_folders(c->camera, c->virtFolder, c->list, c->context);
-    if (retval == GP_OK) {
-        retval = gp_list_find_by_name(c->list, &index, name);
-        if (retval == GP_OK) {
-            if (strlen(c->virtFolder) > 1) {
-                strcat(c->virtFolder, "/");
-            }
-            strcat(c->virtFolder, name);
-        }
+    gp_result_check(gp_camera_folder_list_folders(c->camera, c->virtFolder, c->list, c->context));
+    gp_result_check(gp_list_find_by_name(c->list, &index, name));
+    if (strlen(c->virtFolder) > 1) {
+        strcat(c->virtFolder, "/");
     }
+    strcat(c->virtFolder, name);
     return self;
 }
 
@@ -957,18 +907,18 @@ void Init_gphoto4ruby() {
      * supported
      */
     rb_cGPhoto2ConfigurationError = rb_define_class_under(rb_mGPhoto2, "ConfigurationError", rb_eStandardError);
-    /*
-     * GPhoto2::ProgrammerError is never raised. :) Only when program gets
-     * where it could never get.
-     */
-    rb_cGPhoto2ProgrammerError = rb_define_class_under(rb_mGPhoto2, "ProgrammerError", rb_eStandardError);
+    
+    rb_define_const(rb_cGPhoto2Camera, "CONFIG_TYPE_RADIO", INT2FIX(GP_WIDGET_RADIO));
+    rb_define_const(rb_cGPhoto2Camera, "CONFIG_TYPE_RANGE", INT2FIX(GP_WIDGET_RANGE));
+    
     rb_define_alloc_func(rb_cGPhoto2Camera, camera_allocate);
     rb_define_module_function(rb_cGPhoto2Camera, "ports", camera_class_ports, 0);
     rb_define_method(rb_cGPhoto2Camera, "initialize", camera_initialize, -1);
-    rb_define_method(rb_cGPhoto2Camera, "configs", camera_get_configs, 0);
+    rb_define_method(rb_cGPhoto2Camera, "config", camera_get_config, 0);
+    rb_define_method(rb_cGPhoto2Camera, "config_merge", camera_config_merge, 1);
     rb_define_method(rb_cGPhoto2Camera, "[]", camera_get_value, -1);
     rb_define_method(rb_cGPhoto2Camera, "[]=", camera_set_value, 2);
-    rb_define_method(rb_cGPhoto2Camera, "capture", camera_capture, 0);
+    rb_define_method(rb_cGPhoto2Camera, "capture", camera_capture, -1);
     rb_define_method(rb_cGPhoto2Camera, "save", camera_save, -1);
     rb_define_method(rb_cGPhoto2Camera, "delete", camera_delete, -1);
     rb_define_method(rb_cGPhoto2Camera, "folder", camera_folder, 0);

data/ext/gphoto4ruby.h

@@ -36,17 +36,17 @@ static VALUE rb_mGPhoto2;
 static VALUE rb_cGPhoto2Camera;
 static VALUE rb_cGPhoto2Exception;
 static VALUE rb_cGPhoto2ConfigurationError;
-static VALUE rb_cGPhoto2ProgrammerError;
 
 static void rb_raise_gp_result(int retval);
 static void rb_raise_programmer_error(const char* fName);
 
 static VALUE getRadio(CameraWidget *cc);
 static VALUE listRadio(CameraWidget *cc);
-static VALUE setRadio(GPhoto2Camera *c, VALUE newVal);
+static VALUE setRadio(VALUE self, GPhoto2Camera *c, VALUE newVal, int save);
 static VALUE getRange(CameraWidget *cc);
 static VALUE listRange(CameraWidget *cc);
-static VALUE setRange(GPhoto2Camera *c, VALUE newNum);
+static VALUE setRange(VALUE self, GPhoto2Camera *c, VALUE newNum, int save);
+static void saveConfigs(VALUE self, GPhoto2Camera *c);
 
 static void populateWithConfigs(CameraWidget *cc, VALUE arr);
 
@@ -57,11 +57,13 @@ static VALUE camera_allocate(VALUE klass);
 static VALUE camera_initialize(int argc, VALUE *argv, VALUE self);
 static VALUE camera_class_ports(VALUE klass);
 
-static VALUE camera_capture(VALUE self);
+static VALUE camera_capture(int argc, VALUE *argv, VALUE self);
 
 static VALUE camera_save(int argc, VALUE *argv, VALUE self);
 
-static VALUE camera_get_configs(VALUE self);
+static VALUE camera_get_config(VALUE self);
+static VALUE camera_config_merge(VALUE self, VALUE hash);
+
 static VALUE camera_get_value(int argc, VALUE *argv, VALUE self);
 static VALUE camera_set_value(VALUE self, VALUE str, VALUE newVal);
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gphoto4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - heq4 company
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-19 00:00:00 +04:00
+date: 2008-08-26 00:00:00 +04:00
 default_executable: 
 dependencies: []