gphoto4ruby 0.4.2 → 0.4.3

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.4.3
+
+* Added folder method to CameraEvent
+* File and folder methods now correctly deal with FOLDER_ADDED and FILE_ADDED events
+
 == 0.4.2
 
 Pulled changes from Tallak Tveide

data/ext/gphoto2camera.c

@@ -1359,6 +1359,7 @@ VALUE camera_create_folder(VALUE self, VALUE folder) {
  *   evt.type == GPhoto2::CameraEvent::EVENT_TYPE_FILE_ADDED
  *                                  #=>     true
  *   evt.file                       #=>     "DSC_0384.JPG"
+ *   evt.folder                     #=>     "/store_00010001/DCIM/100NCD80"
  *   
  *   # do nothing
  *   c.wait(1).type                 #=>     "timeout"

data/ext/gphoto2camera_event.c

@@ -74,7 +74,7 @@ VALUE camera_event_type(VALUE self) {
  *   file                           =>      string or nil
  *
  * Returns file name of manually captured image. Only applies to
- * EVENT_TYPE_FILE_ADDED event.
+ * EVENT_TYPE_FILE_ADDED or EVENT_TYPE_FOLDER_ADDED event.
  *
  * Examples:
  *
@@ -94,10 +94,44 @@ VALUE camera_event_file(VALUE self) {
     
     Data_Get_Struct(self, GPhoto2CameraEvent, ce);
     
-    if (ce->type == GP_EVENT_FILE_ADDED) {
+    if ((ce->type == GP_EVENT_FILE_ADDED) ||
+        (ce->type == GP_EVENT_FOLDER_ADDED)) {
         return rb_str_new2(ce->path->name);
     } else {
         return Qnil;
     }
 }
 
+/*
+ * call-seq:
+ *   folder                         =>      string or nil
+ *
+ * Returns file name of manually captured image. Only applies to
+ * EVENT_TYPE_FILE_ADDED or EVENT_TYPE_FOLDER_ADDED event.
+ *
+ * Examples:
+ *
+ *   c = GPhoto2::Camera.new
+ *   # capture the image manually
+ *   evt = c.wait
+ *   evt.type                       #=>     "file added"
+ *   evt.type == GPhoto2::CameraEvent::EVENT_TYPE_FOLDER_ADDED
+ *                                  #=>     true
+ *   evt.file                       #=>     "101NCD80"
+ *   evt.folder                     #=>     "/store_00010001/DCIM"
+ * 
+ * In example above is default behaviour for that type of event when it occurs
+ */
+VALUE camera_event_folder(VALUE self) {
+    GPhoto2CameraEvent *ce;
+    
+    Data_Get_Struct(self, GPhoto2CameraEvent, ce);
+    
+    if ((ce->type == GP_EVENT_FILE_ADDED) ||
+        (ce->type == GP_EVENT_FOLDER_ADDED)) {
+        return rb_str_new2(ce->path->folder);
+    } else {
+        return Qnil;
+    }
+}
+

data/ext/gphoto2camera_event.h

@@ -20,7 +20,7 @@
  *
  */
 
-#include <gphoto2/gphoto2.h>
+#include <gphoto2/gphoto2.h>
 #include <ruby.h>
 
 #ifndef _INC_CAMERA_EVENT
@@ -43,5 +43,6 @@ void camera_event_free(GPhoto2CameraEvent *ce);
 
 VALUE camera_event_type(VALUE self);
 VALUE camera_event_file(VALUE self);
+VALUE camera_event_folder(VALUE self);
 
 #endif /* _INC_CAMERA_EVENT */

data/ext/gphoto4ruby.c

@@ -104,6 +104,7 @@ void Init_gphoto4ruby() {
 
     rb_define_method(rb_cGPhoto2CameraEvent, "type", camera_event_type, 0); /* in gphoto2camera_event.c */
     rb_define_method(rb_cGPhoto2CameraEvent, "file", camera_event_file, 0); /* in gphoto2camera_event.c */
+    rb_define_method(rb_cGPhoto2CameraEvent, "folder", camera_event_folder, 0); /* in gphoto2camera_event.c */
 
     rb_define_method(rb_cGPhoto2Camera, "model_name", camera_model_name, 0); /* in gphoto2camera.c */
     rb_define_method(rb_cGPhoto2Camera, "has_image_capture?", camera_has_image_capture, 0); /* in gphoto2camera.c */

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - neq4 company
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 +03:00
+date: 2010-05-14 00:00:00 +04:00
 default_executable: 
 dependencies: []