gphoto4ruby 0.3.1 → 0.3.2

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== 0.3.2
+
+* Added setting and getting of GP_WIDGET_DATE type configs. Behavior is strange
+  though. In nikon D80 config name "time":
+  * libgphoto 2.4.2 -- able to read, but unable to set
+  * libgphoto 2.4.6 -- able to set, but when reading keep getting value 3 hours
+                       earlier. For any camera time zone. But the value set is
+                       correctly applied to exif. So can be used somehow
+
 == 0.3.1
 
 * Added files_count function and parameter allowing to limit files function

data/ext/gphoto2camera.c

@@ -531,6 +531,9 @@ VALUE camera_get_config(int argc, VALUE *argv, VALUE self) {
                         case GP_WIDGET_TOGGLE:
                             rb_hash_aset(cfg, RARRAY(arr)->ptr[i], getToggle(c->childConfig));
                             break;
+                        case GP_WIDGET_DATE:
+                            rb_hash_aset(cfg, RARRAY(arr)->ptr[i], getDate(c->childConfig));
+                            break;
                         default:
                             break;
                     }
@@ -606,6 +609,10 @@ VALUE camera_config_merge(VALUE self, VALUE hash) {
                     rb_ary_push(cfg_changed, rb_str_new2(key));
                     setToggle(self, c, rb_hash_aref(hash, RARRAY(arr)->ptr[i]), 0);
                     break;
+                case GP_WIDGET_DATE:
+                    rb_ary_push(cfg_changed, rb_str_new2(key));
+                    setDate(self, c, rb_hash_aref(hash, RARRAY(arr)->ptr[i]), 0);
+                    break;
                 default:
                     break;
             }
@@ -738,6 +745,20 @@ VALUE camera_get_value(int argc, VALUE *argv, VALUE self) {
                         return Qnil;
                     }
                     break;
+                case GP_WIDGET_DATE:
+                    if (strcmp(rb_id2name(rb_to_id(dir)), "no_cache") == 0) {
+                        val = getDate(c->childConfig);
+                        rb_hash_aset(rb_iv_get(self, "@configuration"), rb_str_new2(name), val);
+                        return val;
+                    } else if (strcmp(rb_id2name(rb_to_id(dir)), "all") == 0) {
+                        return rb_ary_new();
+                    } else if (strcmp(rb_id2name(rb_to_id(dir)), "type") == 0) {
+                        return INT2FIX(GP_WIDGET_DATE);
+                    } 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;
@@ -806,6 +827,11 @@ VALUE camera_set_value(VALUE self, VALUE str, VALUE newVal) {
             rb_ary_push(cfg_changed, rb_str_new2(name));
             return setToggle(self, c, newVal, 1);
             break;
+        case GP_WIDGET_DATE:
+            cfg_changed = rb_iv_get(self, "@configs_changed");
+            rb_ary_push(cfg_changed, rb_str_new2(name));
+            return setDate(self, c, newVal, 1);
+            break;
         default:
             rb_raise(rb_cGPhoto2ConfigurationError, "Cannot access this setting");
             return Qnil;

data/ext/gphoto2camera_utilities.c

@@ -39,7 +39,11 @@ VALUE getRadio(CameraWidget *cc) {
     const char *val;
     
     gp_result_check(gp_widget_get_value(cc, &val));
-    return rb_str_new2(val);
+    if (val == NULL) {
+      return Qnil;
+    } else {
+      return rb_str_new2(val);
+    }
 }
 
 VALUE listRadio(CameraWidget *cc) {
@@ -71,7 +75,11 @@ VALUE getText(CameraWidget *cc) {
     const char *val;
     
     gp_result_check(gp_widget_get_value(cc, &val));
-    return rb_str_new2(val);
+    if (val == NULL) {
+      return Qnil;
+    } else {
+      return rb_str_new2(val);
+    }
 }
 
 VALUE setText(VALUE self, GPhoto2Camera *c, VALUE newVal, int save) {
@@ -165,6 +173,28 @@ VALUE setToggle(VALUE self, GPhoto2Camera *c, VALUE newVal, int save) {
     }
 }
 
+VALUE getDate(CameraWidget *cc) {
+    int val;
+    char str[25];
+    gp_result_check(gp_widget_get_value(cc, &val));
+//    printf("got: %d\n",val);
+    sprintf(str, "Time.at(%d).utc", val);
+    return rb_eval_string(str);
+}
+
+VALUE setDate(VALUE self, GPhoto2Camera *c, VALUE newNum, int save) {
+    int val;
+
+    val = NUM2INT(rb_funcall(newNum, rb_intern("to_i"), 0));
+
+//    printf("setting: %d\n", val);
+    gp_result_check(gp_widget_set_value(c->childConfig, &val));
+    if (save == 1) {
+        saveConfigs(self, c);
+    }
+    return newNum;
+}
+
 void saveConfigs(VALUE self, GPhoto2Camera *c) {
     VALUE cfgs, cfg_changed, name;
     CameraWidgetType widgettype;
@@ -191,6 +221,9 @@ void saveConfigs(VALUE self, GPhoto2Camera *c) {
             case GP_WIDGET_TOGGLE:
                 rb_hash_aset(cfgs, name, getToggle(c->childConfig));
                 break;
+            case GP_WIDGET_DATE:
+                rb_hash_aset(cfgs, name, getDate(c->childConfig));
+                break;
             default:
                 break;
         }
@@ -222,6 +255,10 @@ void populateWithConfigs(CameraWidget *cc, VALUE hash) {
             gp_result_check(gp_widget_get_name(cc, &name));
             rb_hash_aset(hash, rb_str_new2(name), getToggle(cc));
             break;
+        case GP_WIDGET_DATE:
+            gp_result_check(gp_widget_get_name(cc, &name));
+            rb_hash_aset(hash, rb_str_new2(name), getDate(cc));
+            break;
         case GP_WIDGET_WINDOW:
         case GP_WIDGET_SECTION:
             childrenTotal = gp_result_check(gp_widget_count_children(cc));

data/ext/gphoto2camera_utilities.h

@@ -53,6 +53,8 @@ VALUE listRange(CameraWidget *cc);
 VALUE setRange(VALUE self, GPhoto2Camera *c, VALUE newNum, int save);
 VALUE getToggle(CameraWidget *cc);
 VALUE setToggle(VALUE self, GPhoto2Camera *c, VALUE newVal, int save);
+VALUE getDate(CameraWidget *cc);
+VALUE setDate(VALUE self, GPhoto2Camera *c, VALUE newNum, int save);
 void saveConfigs(VALUE self, GPhoto2Camera *c);
 
 void populateWithConfigs(CameraWidget *cc, VALUE arr);

data/ext/gphoto4ruby.c

@@ -61,6 +61,7 @@ void Init_gphoto4ruby() {
     rb_define_const(rb_cGPhoto2Camera, "CONFIG_TYPE_TEXT", INT2FIX(GP_WIDGET_TEXT));
     rb_define_const(rb_cGPhoto2Camera, "CONFIG_TYPE_RANGE", INT2FIX(GP_WIDGET_RANGE));
     rb_define_const(rb_cGPhoto2Camera, "CONFIG_TYPE_TOGGLE", INT2FIX(GP_WIDGET_TOGGLE));
+    rb_define_const(rb_cGPhoto2Camera, "CONFIG_TYPE_DATE", INT2FIX(GP_WIDGET_DATE));
 
     rb_define_const(rb_cGPhoto2CameraEvent, "EVENT_TYPE_UNKNOWN", EVENT_UNKNOWN);
     rb_define_const(rb_cGPhoto2CameraEvent, "EVENT_TYPE_TIMEOUT", EVENT_TIMEOUT);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gphoto4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - heq4 company
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-07 00:00:00 +03:00
+date: 2009-06-11 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gphoto4ruby
-rubygems_version: 1.3.0
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: GPhoto4Ruby is Ruby wrapping around gphoto2 C library