gphoto4ruby 0.4.1 → 0.4.2

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+== 0.4.2
+
+Pulled changes from Tallak Tveide
+
+* Added pthread to keep camera alive when library is available
+* Added several question mark methods (has_config?, has_image_capture? and
+  has_preview?) based on gphoto2 camera abilities
+* Added model_name
+* Added dispose method that allows to reuse same code and reinitialize camera
+
 == 0.4.1
 
 * Fix for canon cameras to keep "capture=on" between ruby calls. Though it shows

data/README.rdoc

@@ -101,6 +101,11 @@ connected through usb in PTP mode and Canon EOS 450D.
       # it from camera
       cams.first.capture.save.delete
   end
+
+
+  On supported systems, instanciating a camera will start a thread that 
+  prevents the camera from posering off automatically.
+
 == Contact
 
 neq4 company:: http://neq4.com

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/example.rb

@@ -8,6 +8,7 @@ if ports.any?
     ports.each do |port|
         c = GPhoto2::Camera.new(port)
         puts "camera in port: " + port
+        puts 'Model: ' + c.model_name
         c["capture"] = true if c.config.has_key? "capture" # canon? :)
         c.config(:no_cache).each do |key, value|
             puts key + " value is: " + value.to_s

data/ext/gphoto2camera.c

@@ -20,8 +20,36 @@
  *
  */
 
+/* CAMERA TIMEOUT FUNCTIONALITY COPIED FROM libgphoto2 */
+/*
+ * Copyright © 2002 Lutz Müller <lutz@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+
 #include "gphoto2camera.h"
 
+#ifdef HAVE_PTHREAD
+    #include <time.h> 
+    #include <pthread.h>
+#endif
+
+
 VALUE rb_mGPhoto2;
 VALUE rb_cGPhoto2Camera;
 
@@ -49,10 +77,74 @@ VALUE rb_cGPhoto2ConfigurationError;
     }                                   \
 }
 
+
+
+#ifdef HAVE_PTHREAD
+static void thread_cleanup_func (void *data) {
+	ThreadData *td = data;
+	free (td);
+}
+
+static void * thread_func (void *data) {
+	ThreadData *td = data;
+	time_t t, last;
+	int dummy;
+        struct timespec interval, remainder; 
+	double diff;
+
+	pthread_cleanup_push (thread_cleanup_func, td);
+
+	last = time (NULL);
+	while (1) {
+		/* Sleep first to avoid loop using all CPU */
+		t = time (NULL);
+		interval.tv_sec = td-> timeout - (t - last); 
+		interval.tv_nsec = 0;
+		pthread_setcanceltype(PTHREAD_CANCEL_ENABLE, &dummy);
+		nanosleep(*interval, *remainder);
+		pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &dummy);
+
+		t = time (NULL);
+		if (t - last > td->timeout) {
+			td->func (td->camera, NULL);
+			last = t;
+		}
+		pthread_testcancel ();
+	}
+	pthread_cleanup_pop (1);
+}
+
+static unsigned int start_timeout_func (Camera *camera, unsigned int timeout, CameraTimeoutFunc func, void __unused__ *data) {
+	pthread_t tid;
+	ThreadData *td;
+
+	td = malloc (sizeof (ThreadData));
+	if (!td)
+		return 0;
+	memset (td, 0, sizeof (ThreadData));
+	td->camera = camera;
+	td->timeout = timeout;
+	td->func = func;
+
+	pthread_create (&tid, NULL, thread_func, td);
+
+	return (tid);
+}
+
+static void stop_timeout_func (Camera __unused__ *camera, unsigned int id, void __unused__ *data) {
+	pthread_t tid = id;
+	pthread_cancel (tid);
+	pthread_join (tid, NULL);
+}
+
+#endif
+
+
 void camera_mark(GPhoto2Camera *c) {
 }
 
 void camera_free(GPhoto2Camera *c) {
+  if (!c->disposed) {
     gp_result_check(gp_camera_exit(c->camera, c->context));
     gp_result_check(gp_widget_free(c->config));
     gp_result_check(gp_camera_unref(c->camera));
@@ -60,7 +152,8 @@ void camera_free(GPhoto2Camera *c) {
     free(c->virtFolder);
     free(c->lastName);
     free(c->context);
-    free(c);
+  }
+  free(c);
 }
 
 VALUE camera_allocate(VALUE klass) {
@@ -71,9 +164,11 @@ VALUE camera_allocate(VALUE klass) {
     strcpy(c->virtFolder, "/");
     c->lastName[0] = '\0';
     c->context = gp_context_new();
+    c->disposed = 0;
     gp_result_check(gp_camera_new(&(c->camera)));
     gp_result_check(gp_camera_get_config(c->camera, &(c->config), c->context));
     gp_result_check(gp_camera_ref(c->camera));
+    gp_result_check(gp_camera_get_abilities (c->camera, &((*c).abilities)));
     return Data_Wrap_Struct(klass, camera_mark, camera_free, c);
 }
 
@@ -122,10 +217,53 @@ VALUE camera_initialize(int argc, VALUE *argv, VALUE self) {
     populateWithConfigs(c->config, cfgs);
     rb_iv_set(self, "@configuration", cfgs);
     rb_iv_set(self, "@configs_changed", rb_ary_new());
+
+#ifdef HAVE_PTHREAD
+    gp_camera_set_timeout_funcs (c->camera, start_timeout_func, stop_timeout_func, NULL);
+#endif
+
+
     
     return self;
 }
 
+
+/*
+ * call-seq:
+ *   dispose                     => nil
+ *
+ * Releases resources aquired by the Camera class so that is will be possible
+ * to connect to the camera again even before Ruby garbage collection has
+ * released the Camera from memory
+ *
+ * Examples:
+ *
+ *   c = GPhoto2::Camera.new
+ *   begin
+ *     c.capture
+ *   ensure
+ *     c.dispose # if capture failed, this code may run again in the same process
+ *   end
+ *
+ */
+VALUE camera_dispose(VALUE self) {
+    GPhoto2Camera *c;
+    Data_Get_Struct(self, GPhoto2Camera, c);
+    if (!c->disposed) {
+        gp_result_check(gp_camera_exit(c->camera, c->context));
+        gp_result_check(gp_widget_free(c->config));
+        gp_result_check(gp_camera_unref(c->camera));
+        gp_result_check(gp_camera_free(c->camera));
+        free(c->virtFolder);
+        free(c->lastName);
+        free(c->context);
+        c->disposed = -1;
+        return Qtrue;
+    } else {
+        return Qfalse;
+    }
+}
+
 /*
  * call-seq:
  *   GPhoto2::Camera.ports          =>      array
@@ -211,6 +349,7 @@ VALUE camera_capture(int argc, VALUE *argv, VALUE self) {
     CameraFilePath path;
 
     Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
     
     if (argc == 1) {
         camera_config_merge(self, argv[0]);
@@ -271,6 +410,7 @@ VALUE camera_save(int argc, VALUE *argv, VALUE self) {
     VALUE arr, hVal;
     
     Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
     
     gp_list_new(&list);
     
@@ -372,19 +512,34 @@ VALUE camera_save(int argc, VALUE *argv, VALUE self) {
             strcat(fName, newNameStr);
             pchNew = strrchr(newNameStr, '.');
             pchSrc = strrchr(cFileName, '.');
+            if (fileType == GP_FILE_TYPE_PREVIEW) {
+              pchSrc = ".JPG"; /* previews are always jpeg, even if original is RAW/TIF/etc */
+            }
             if (pchNew == NULL) {
                 strcat(fName, pchSrc);
-            } else if (strcmp(pchNew, pchSrc) != 0) {
+            } else if (strcasecmp(pchNew, pchSrc) != 0) {
                 strcat(fName, pchSrc);
             }
         } else {
-            strcat(fName, cFileName);
+            pchSrc = strrchr(cFileName, '.');
+            if (fileType == GP_FILE_TYPE_PREVIEW && pchSrc) {
+              strncat(fName, cFileName, pchSrc - cFileName);
+              strcat(fName, ".JPG");
+            } else {
+              strcat(fName, cFileName);
+            }
         }
     } else {
-        strcat(fName, cFileName);
+        pchSrc = strrchr(cFileName, '.');
+        if (fileType == GP_FILE_TYPE_PREVIEW && pchSrc) {
+          strncat(fName, cFileName, pchSrc - cFileName);
+          strcat(fName, ".JPG");
+        } else {
+          strcat(fName, cFileName);
+        }
     }
-    fd = open(fName, O_CREAT | O_WRONLY, 0644);
-    retVal = write(fd, fData, fSize);
+    fd = open(fName, O_CREAT | O_WRONLY, 0644);
+    retVal = write(fd, fData, fSize);
     close(fd);
     gp_file_free(file);
     gp_list_free(list);
@@ -425,6 +580,7 @@ VALUE camera_delete(int argc, VALUE *argv, VALUE self) {
     VALUE arr;
     
     Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
     
     gp_list_new(&list);
     
@@ -532,6 +688,7 @@ VALUE camera_get_config(int argc, VALUE *argv, VALUE self) {
         case 1:
             Check_Type(argv[0], T_SYMBOL);
             Data_Get_Struct(self, GPhoto2Camera, c);
+            check_disposed(c);
             
             if (strcmp(rb_id2name(rb_to_id(argv[0])), "no_cache") == 0) {
                 gp_widget_free(c->config);
@@ -573,6 +730,7 @@ VALUE camera_config_merge(VALUE self, VALUE hash) {
     VALUE arr, cfgs, cfg_changed;
 
     Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
 
     arr = rb_funcall(hash, rb_intern("keys"), 0);
     cfgs = rb_iv_get(self, "@configuration");
@@ -677,6 +835,7 @@ VALUE camera_get_value(int argc, VALUE *argv, VALUE self) {
             dir = argv[1];
             Check_Type(dir, T_SYMBOL);
             Data_Get_Struct(self, GPhoto2Camera, c);
+            check_disposed(c);
             
             if (strcmp(rb_id2name(rb_to_id(dir)), "no_cache") == 0) {
                 gp_widget_free(c->config);
@@ -803,6 +962,7 @@ VALUE camera_set_value(VALUE self, VALUE str, VALUE newVal) {
     }
     
     Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(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));
@@ -838,6 +998,65 @@ VALUE camera_set_value(VALUE self, VALUE str, VALUE newVal) {
     }
 }
 
+
+
+/*
+ * call-seq:
+ *   model_name                      =>      string
+ *
+ * Returns the model name of the camera
+ *
+ */
+VALUE camera_model_name(VALUE self) {
+    GPhoto2Camera *c;
+    Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
+    return rb_str_new2((*c).abilities.model);
+}
+  
+/*
+ * call-seq:
+ *   has_image_capture?                  =>      bool
+ *
+ * Returns true if the camera is capable of image capture
+ *
+ */
+VALUE camera_has_image_capture(VALUE self) {
+    GPhoto2Camera *c;
+    Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
+    return ((*c).abilities.operations & GP_OPERATION_CAPTURE_IMAGE) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *   has_preview?                  =>      bool
+ *
+ * Returns true if the camera is capable of generatig image previews
+ *
+ */
+VALUE camera_has_preview(VALUE self) {
+    GPhoto2Camera *c;
+    Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
+    return ((*c).abilities.operations & GP_OPERATION_CAPTURE_PREVIEW) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *   has_config?                  =>      bool
+ *
+ * Returns true if the camera has any configuration values
+ *
+ */
+VALUE camera_has_config(VALUE self) {
+    GPhoto2Camera *c;
+    Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
+    return ((*c).abilities.operations & GP_OPERATION_CONFIG) ? Qtrue : Qfalse;
+}
+
+
 /*
  * call-seq:
  *   folder                         =>      string
@@ -858,6 +1077,7 @@ VALUE camera_folder(VALUE self) {
     GPhoto2Camera *c;
     
     Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
     
     return rb_str_new2(c->virtFolder);
 }
@@ -887,6 +1107,7 @@ VALUE camera_subfolders(VALUE self) {
     VALUE arr;
     
     Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
     
     gp_list_new(&list);
     
@@ -940,6 +1161,7 @@ VALUE camera_files(int argc, VALUE *argv, VALUE self) {
     }
     
     Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
     
     gp_list_new(&list);
     
@@ -985,6 +1207,7 @@ VALUE camera_files_count(VALUE self) {
     CameraList *list;
     
     Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
     
     gp_list_new(&list);
     
@@ -1020,6 +1243,7 @@ VALUE camera_folder_up(VALUE self) {
     GPhoto2Camera *c;
     
     Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
     
     pch = strrchr(c->virtFolder, '/');
     if ((pch - c->virtFolder) == 0) {
@@ -1060,6 +1284,7 @@ VALUE camera_folder_down(VALUE self, VALUE folder) {
     GPhoto2Camera *c;
     
     Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
     
     gp_list_new(&list);
     
@@ -1094,6 +1319,7 @@ VALUE camera_create_folder(VALUE self, VALUE folder) {
     GPhoto2Camera *c;
     
     Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
     
     name = RSTRING_PTR(folder);
     gp_result_check(gp_camera_folder_make_dir(c->camera, c->virtFolder, name, c->context));
@@ -1156,6 +1382,7 @@ VALUE camera_wait(int argc, VALUE *argv, VALUE self) {
     }
     
     Data_Get_Struct(self, GPhoto2Camera, c);
+    check_disposed(c);
     ce = (GPhoto2CameraEvent*) ALLOC(GPhoto2CameraEvent);
     
 //    RESULT_CHECK_EVENT(gp_filesystem_reset(c->camera->fs), ce);

data/ext/gphoto2camera.h

@@ -42,7 +42,11 @@ void camera_mark(GPhoto2Camera *c);
 void camera_free(GPhoto2Camera *c);
 VALUE camera_allocate(VALUE klass);
 
+
+
+
 VALUE camera_initialize(int argc, VALUE *argv, VALUE self);
+VALUE camera_dispose(VALUE self);
 VALUE camera_class_ports(VALUE klass);
 
 VALUE camera_capture(int argc, VALUE *argv, VALUE self);
@@ -66,4 +70,9 @@ VALUE camera_create_folder(VALUE self, VALUE folder);
 
 VALUE camera_wait(int argc, VALUE *argv, VALUE self);
 
+VALUE camera_model_name(VALUE self);
+VALUE camera_has_image_capture(VALUE self);
+VALUE camera_has_preview(VALUE self);
+VALUE camera_has_config(VALUE self);
+
 #endif /* _INC_CAMERA */

data/ext/gphoto2camera_utilities.c

@@ -35,6 +35,13 @@ int gp_result_check(int retval) {
     return retval;
 }
 
+void check_disposed(GPhoto2Camera* c) {
+  if ((*c).disposed) {
+    rb_raise(rb_cGPhoto2Exception, "Camera has been disposed");
+  }
+}
+
+
 VALUE getRadio(CameraWidget *cc) {
     const char *val;
     
@@ -272,3 +279,5 @@ void populateWithConfigs(CameraWidget *cc, VALUE hash) {
     }
 }
 
+
+

data/ext/gphoto2camera_utilities.h

@@ -48,12 +48,16 @@ typedef struct {
     
     char *virtFolder;
     char *lastName;
+
+    CameraAbilities abilities;
+    int disposed;
 } GPhoto2Camera;
 
 extern VALUE rb_cGPhoto2Exception;
 
 void rb_raise_gp_result(int retval);
 int gp_result_check(int retval);
+void check_disposed(GPhoto2Camera* c);
 
 VALUE getRadio(CameraWidget *cc);
 VALUE listRadio(CameraWidget *cc);

data/ext/gphoto4ruby.c

@@ -85,6 +85,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, "dispose", camera_dispose, 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 */
@@ -103,5 +104,10 @@ 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_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 */
+    rb_define_method(rb_cGPhoto2Camera, "has_preview?", camera_has_preview, 0); /* in gphoto2camera.c */
+    rb_define_method(rb_cGPhoto2Camera, "has_config?", camera_has_config, 0); /* in gphoto2camera.c */
 }
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gphoto4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - neq4 company
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 +03:00
+date: 2010-02-28 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -65,18 +70,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: gphoto4ruby
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: GPhoto4Ruby is Ruby wrapping around gphoto2 C library