gphoto4ruby 0.2.5 → 0.2.6

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.2.6
+
+* Can use config(:no_cache)
+
 == 0.2.5
 
 * Another bug with memory allocation fixed

data/ext/gphoto2camera.c

@@ -421,8 +421,10 @@ VALUE camera_delete(int argc, VALUE *argv, VALUE self) {
 /*
  * call-seq:
  *   config                         =>      hash
+ *   config :no_cache               =>      hash
  *
  * Returns cached hash of adjustable camera configuration with their values.
+ * Can be run with directive <b>:no_cache</b>
  *
  * Examples:
  *
@@ -440,8 +442,54 @@ VALUE camera_delete(int argc, VALUE *argv, VALUE self) {
  *                                           "channel", "encryption"]
  *
  */
-VALUE camera_get_config(VALUE self) {
-    return rb_iv_get(self, "@configuration");
+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");
+
+    switch (argc) {
+        case 1:
+            Check_Type(argv[0], T_SYMBOL);
+            Data_Get_Struct(self, GPhoto2Camera, c);
+            
+            if (strcmp(rb_id2name(rb_to_id(argv[0])), "no_cache") == 0) {
+                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(arr)->len; i++) {
+                    key = RSTRING(RARRAY(arr)->ptr[i])->ptr;
+                    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(arr)->ptr[i], getRadio(c->childConfig));
+                            break;
+                        case GP_WIDGET_TEXT:
+                            rb_hash_aset(cfg, RARRAY(arr)->ptr[i], getText(c->childConfig));
+                            break;
+                        case GP_WIDGET_RANGE:
+                            rb_hash_aset(cfg, RARRAY(arr)->ptr[i], getRange(c->childConfig));
+                            break;
+                        case GP_WIDGET_TOGGLE:
+                            rb_hash_aset(cfg, RARRAY(arr)->ptr[i], getToggle(c->childConfig));
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            } else {
+                rb_raise(rb_cGPhoto2ConfigurationError, "Unknown directive '%s'", rb_id2name(rb_to_id(argv[0])));
+                return Qnil;
+            }
+        case 0:
+            return cfg;
+        default:
+            rb_raise(rb_eArgError, "Wrong number of arguments (%d for 0 or 1)", argc);
+            return Qnil;
+    }
 }
 
 /*

data/ext/gphoto2camera.h

@@ -49,7 +49,7 @@ VALUE camera_capture(int argc, VALUE *argv, VALUE self);
 VALUE camera_save(int argc, VALUE *argv, VALUE self);
 VALUE camera_delete(int argc, VALUE *argv, VALUE self);
 
-VALUE camera_get_config(VALUE self);
+VALUE camera_get_config(int argc, VALUE *argv, VALUE self);
 VALUE camera_config_merge(VALUE self, VALUE hash);
 
 VALUE camera_get_value(int argc, VALUE *argv, VALUE self);

data/ext/gphoto4ruby.c

@@ -70,7 +70,7 @@ void Init_gphoto4ruby() {
     rb_define_alloc_func(rb_cGPhoto2Camera, camera_allocate);
     rb_define_module_function(rb_cGPhoto2Camera, "ports", camera_class_ports, 0); /* in gphoto2camera.c */
     rb_define_method(rb_cGPhoto2Camera, "initialize", camera_initialize, -1); /* in gphoto2camera.c */
-    rb_define_method(rb_cGPhoto2Camera, "config", camera_get_config, 0); /* in gphoto2camera.c */
+    rb_define_method(rb_cGPhoto2Camera, "config", camera_get_config, -1); /* in gphoto2camera.c */
     rb_define_method(rb_cGPhoto2Camera, "config_merge", camera_config_merge, 1); /* in gphoto2camera.c */
     rb_define_method(rb_cGPhoto2Camera, "[]", camera_get_value, -1); /* in gphoto2camera.c */
     rb_define_method(rb_cGPhoto2Camera, "[]=", camera_set_value, 2); /* in gphoto2camera.c */

metadata

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