gphoto4ruby 0.2.2 → 0.2.4

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== 0.2.4
+
+* fixed memory allocation bug with CameraFilePath pointer
+
+== 0.2.3
+
+* fixed bug where :no_cache directive had no effect on config caching
+* added create_folder function
+
 == 0.2.2
 
 * fixed bug where event "file added" was not changing file path

data/ext/gphoto2camera.c

@@ -31,6 +31,7 @@ void camera_free(GPhoto2Camera *c) {
     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->path);
     free(c->virtFolder);
     free(c->context);
     free(c);
@@ -39,7 +40,8 @@ void camera_free(GPhoto2Camera *c) {
 VALUE camera_allocate(VALUE klass) {
     GPhoto2Camera *c;
     c = (GPhoto2Camera*) malloc(sizeof(GPhoto2Camera));
-    c->virtFolder = (char*) malloc(sizeof(char)*100);
+    c->virtFolder = (char*) malloc(sizeof(char)*1024);
+    c->path = (CameraFilePath*) malloc(sizeof(CameraFilePath));
     strcpy(c->virtFolder, "/");
     c->context = gp_context_new();
     gp_result_check(gp_camera_new(&(c->camera)));
@@ -198,8 +200,8 @@ VALUE camera_capture(int argc, VALUE *argv, VALUE self) {
     }
 
     gp_result_check(gp_camera_capture(c->camera, GP_CAPTURE_IMAGE, c->path, c->context));
+    printf("captured: %s/%s\n", c->path->folder, c->path->name);
     strcpy(c->virtFolder, c->path->folder);
-//        printf("captured: %s/%s\n", c->path.folder, c->path.name);
     return self;
 }
 
@@ -548,20 +550,9 @@ VALUE camera_get_value(int argc, VALUE *argv, VALUE self) {
     GPhoto2Camera *c;
     CameraWidgetType widgettype;
     VALUE str, dir;
-    
-    switch (argc) {
-        case 1:
-            str = argv[0];
-            break;
-        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);
-            return Qnil;
-    }
+    VALUE val;
+
+    str = argv[0];
     
     switch (TYPE(str)) {
         case T_STRING:
@@ -574,70 +565,90 @@ VALUE camera_get_value(int argc, VALUE *argv, VALUE self) {
             rb_raise(rb_eTypeError, "Not valid parameter type");
             return Qnil;
     }
-    
-    if (argc == 1) {
-        return rb_hash_aref(rb_iv_get(self, "@configuration"), rb_str_new2(name));
-    } else {
-        Data_Get_Struct(self, GPhoto2Camera, c);
-
-        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_TEXT:
-                if (strcmp(rb_id2name(rb_to_id(dir)), "no_cache") == 0) {
-                    return getText(c->childConfig);
-                } 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_TEXT);
-                } 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;
-            case GP_WIDGET_TOGGLE:
-                if (strcmp(rb_id2name(rb_to_id(dir)), "no_cache") == 0) {
-                    return getToggle(c->childConfig);
-                } else if (strcmp(rb_id2name(rb_to_id(dir)), "all") == 0) {
-                    VALUE arr = rb_ary_new();
-                    rb_ary_push(arr, Qtrue);
-                    rb_ary_push(arr, Qfalse);
-                    return arr;
-                } else if (strcmp(rb_id2name(rb_to_id(dir)), "type") == 0) {
-                    return INT2FIX(GP_WIDGET_TOGGLE);
-                } else {
-                    rb_raise(rb_cGPhoto2ConfigurationError, "Unknown directive '%s'", rb_id2name(rb_to_id(dir)));
+
+    switch (argc) {
+        case 1:
+            return rb_hash_aref(rb_iv_get(self, "@configuration"), rb_str_new2(name));
+            break;
+        case 2:
+            dir = argv[1];
+            Check_Type(dir, T_SYMBOL);
+            Data_Get_Struct(self, GPhoto2Camera, c);
+            
+            if (strcmp(rb_id2name(rb_to_id(dir)), "no_cache") == 0) {
+                gp_result_check(gp_camera_get_config(c->camera, &(c->config), c->context));
+            }
+
+            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) {
+                        val = getRadio(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 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_TEXT:
+                    if (strcmp(rb_id2name(rb_to_id(dir)), "no_cache") == 0) {
+                        val = getText(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_TEXT);
+                    } 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) {
+                        val = getRange(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 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;
+                case GP_WIDGET_TOGGLE:
+                    if (strcmp(rb_id2name(rb_to_id(dir)), "no_cache") == 0) {
+                        val = getToggle(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) {
+                        VALUE arr = rb_ary_new();
+                        rb_ary_push(arr, Qtrue);
+                        rb_ary_push(arr, Qfalse);
+                        return arr;
+                    } else if (strcmp(rb_id2name(rb_to_id(dir)), "type") == 0) {
+                        return INT2FIX(GP_WIDGET_TOGGLE);
+                    } 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;
-                }
-                break;
-            default:
-                rb_raise(rb_cGPhoto2ConfigurationError, "Not supported yet");
-                return Qnil;
-        }
+            }
+            break;
+        default:
+            rb_raise(rb_eArgError, "Wrong number of arguments (%d for 1 or 2)", argc);
+            return Qnil;
     }
 }
 
@@ -867,6 +878,32 @@ VALUE camera_folder_down(VALUE self, VALUE folder) {
     return self;
 }
 
+/*
+ * call-seq:
+ *   create_folder(name)            =>      camera
+ *
+ * Creates subfolder in current camera path with specified name. If not
+ * supported by camera throws "Unspecified error" GPhoto2::Exception
+ *
+ * Examples:
+ *
+ *   c = GPhoto2::Camera.new
+ *   c.create_folder "my_store"
+ *
+ */
+VALUE camera_create_folder(VALUE self, VALUE folder) {
+    Check_Type(folder, T_STRING);
+
+    const char *name;
+    GPhoto2Camera *c;
+    
+    Data_Get_Struct(self, GPhoto2Camera, c);
+    
+    name = RSTRING(folder)->ptr;
+    gp_result_check(gp_camera_folder_make_dir(c->camera, c->virtFolder, name, c->context));
+    return self;
+}
+
 /*
  * call-seq:
  *   wait(timeout=2000)             =>      camera event

data/ext/gphoto2camera.h

@@ -60,6 +60,7 @@ VALUE camera_subfolders(VALUE self);
 VALUE camera_files(VALUE self);
 VALUE camera_folder_up(VALUE self);
 VALUE camera_folder_down(VALUE self, VALUE folder);
+VALUE camera_create_folder(VALUE self, VALUE folder);
 
 VALUE camera_wait(int argc, VALUE *argv, VALUE self);
 

data/ext/gphoto4ruby.c

@@ -82,6 +82,7 @@ void Init_gphoto4ruby() {
     rb_define_method(rb_cGPhoto2Camera, "files", camera_files, 0); /* in gphoto2camera.c */
     rb_define_method(rb_cGPhoto2Camera, "folder_up", camera_folder_up, 0); /* in gphoto2camera.c */
     rb_define_method(rb_cGPhoto2Camera, "folder_down", camera_folder_down, 1); /* in gphoto2camera.c */
+    rb_define_method(rb_cGPhoto2Camera, "create_folder", camera_create_folder, 1); /* in gphoto2camera.c */
     rb_define_method(rb_cGPhoto2Camera, "wait", camera_wait, -1); /* in gphoto2camera.c */
 
     rb_define_method(rb_cGPhoto2CameraEvent, "type", camera_event_type, 0); /* in gphoto2camera_event.c */

metadata

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