X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=ext%2Fext.c;h=a734dfad6da6370ae878b0b82b3903dca2f6356a;hb=6289e751f9a1a7c0a46345503da94f64426a71fe;hp=94b21bf4a226af15e522640821bfa8035ab96792;hpb=9a2acd97ed51919ffb4dcc44dc872df4e200b0cd;p=ruby-eet.git

diff --git a/ext/ext.c b/ext/ext.c
index 94b21bf..a734dfa 100644
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ext.c 38 2005-05-13 18:30:15Z tilman $
+ * $Id: ext.c 49 2005-05-30 19:52:36Z tilman $
  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -25,6 +25,7 @@
 
 #include <Eet.h>
 #include <ruby.h>
+#include <st.h>
 
 #define CHECK_KEY(key) \
 	if (rb_funcall (key, id_include, 1, INT2FIX (0)) == Qtrue) \
@@ -44,7 +45,11 @@
 
 static VALUE c_close (VALUE self);
 
-static VALUE id_include;
+static VALUE cStream, cChunk,
+             eEetError, eNameError, ePropError;
+static ID id_include, id_serialize, id_push, id_empty,
+          id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
+          id_tag, id_data;
 
 static void
 c_free (Eet_File **ef)
@@ -433,7 +438,6 @@ stream_serialize (VALUE self)
 {
 	VALUE ret;
 	struct RArray *stream;
-	static ID id_serialize;
 	long i;
 
 	ret = rb_str_new2 ("");
@@ -442,9 +446,6 @@ stream_serialize (VALUE self)
 	if (!stream->len)
 		return ret;
 
-	if (!id_serialize)
-		id_serialize = rb_intern ("serialize");
-
 	for (i = 0; i < stream->len; i++) {
 		VALUE str = rb_funcall (stream->ptr[i], id_serialize, 0, NULL);
 
@@ -454,6 +455,30 @@ stream_serialize (VALUE self)
 	return ret;
 }
 
+static VALUE
+chunk_init (VALUE self, VALUE tag, VALUE data)
+{
+	unsigned long len;
+
+	StringValue (tag);
+	StringValue (data);
+
+	if (rb_funcall (tag, id_include, 1, INT2FIX (0)) == Qtrue) \
+		rb_raise (rb_eArgError, "tag must not contain binary zeroes");
+
+	/* libeet uses a signed 32bit integer to store the
+	 * chunk size, so make sure we don't overflow it
+	 */
+	len = RSTRING (tag)->len + 1 + RSTRING (data)->len;
+	if (len < 0 || len >= 2147483647L)
+		rb_raise (rb_eArgError, "tag or data too long");
+
+	rb_ivar_set (self, id_tag, rb_str_dup_frozen (tag));
+	rb_ivar_set (self, id_data, rb_str_dup_frozen (data));
+
+	return self;
+}
+
 static VALUE
 chunk_serialize (VALUE self)
 {
@@ -461,13 +486,6 @@ chunk_serialize (VALUE self)
 	unsigned int size, buf_len;
 	unsigned char *buf;
 	struct RString *tag, *data;
-	static ID id_tag, id_data;
-
-	if (!id_tag)
-		id_tag = rb_intern ("@tag");
-
-	if (!id_data)
-		id_data = rb_intern ("@data");
 
 	tmp = rb_ivar_get (self, id_tag);
 	StringValue (tmp);
@@ -501,10 +519,71 @@ chunk_serialize (VALUE self)
 	return ret;
 }
 
+static int
+for_each_prop (VALUE tag, VALUE arg, VALUE stream)
+{
+	VALUE value, type, chunks;
+	long len, i;
+
+	if (rb_obj_is_kind_of (arg, rb_cArray) == Qfalse)
+		rb_raise (ePropError, "hash value is not an array");
+
+	value = rb_ary_entry (arg, 0);
+	if (NIL_P (value))
+		return ST_CONTINUE;
+
+	type = rb_ary_entry (arg, 1);
+	chunks = rb_funcall (value, id_to_eet_chunks, 2, tag, type);
+
+	len = RARRAY (chunks)->len;
+
+	for (i = 0; i < len; i++)
+		rb_funcall (stream, id_push, 1, rb_ary_entry (chunks, i));
+
+	return ST_CONTINUE;
+}
+
+/*
+ * :call-seq:
+ *  object.to_eet -> string
+ *
+ * Serializes the receiver to EET format.
+ */
+static VALUE
+c_to_eet (VALUE self)
+{
+	VALUE props, name, stream, chunk, args[2];
+
+	props = rb_funcall (self, id_to_eet_properties, 0);
+
+	if (rb_obj_is_kind_of (props, rb_cHash) == Qfalse ||
+	    rb_funcall (props, id_empty, 0) == Qtrue)
+		rb_raise (ePropError, "invalid EET properties");
+
+	name = rb_funcall (self, id_to_eet_name, 0);
+	StringValue (name);
+
+	if (rb_funcall (name, id_include, 1, INT2FIX (0)) == Qtrue ||
+	    rb_funcall (name, id_empty, 0) == Qtrue)
+		rb_raise (eNameError, "invalid EET name");
+
+	stream = rb_class_new_instance (0, NULL, cStream);
+
+	rb_hash_foreach (props, for_each_prop, stream);
+
+	args[0] = name;
+	args[1] = rb_funcall (stream, id_serialize, 0);
+	chunk = rb_class_new_instance (2, args, cChunk);
+
+	stream = rb_class_new_instance (1, &chunk, cStream);
+
+	return rb_funcall (stream, id_serialize, 0);
+}
+
 void
 Init_eet_ext ()
 {
-	VALUE m, c, cs, cc;
+	VALUE m, c;
 
 	m = rb_define_module ("Eet");
 
@@ -520,11 +599,29 @@ Init_eet_ext ()
 	rb_define_method (c, "read_image", c_read_image, 1);
 	rb_define_method (c, "write_image", c_write_image, -1);
 
-	cs = rb_define_class_under (m, "Stream", rb_cArray);
-	rb_define_method (cs, "serialize", stream_serialize, 0);
+	cStream = rb_define_class_under (m, "Stream", rb_cArray);
+	rb_define_method (cStream, "serialize", stream_serialize, 0);
+
+	cChunk = rb_define_class_under (m, "Chunk", rb_cObject);
+	rb_define_method (cChunk, "initialize", chunk_init, 2);
+	rb_define_method (cChunk, "serialize", chunk_serialize, 0);
+
+	rb_define_attr (cChunk, "tag", 1, 0);
+	rb_define_attr (cChunk, "data", 1, 0);
+
+	rb_define_method (rb_cObject, "to_eet", c_to_eet, 0);
 
-	cc = rb_define_class_under (m, "Chunk", rb_cObject);
-	rb_define_method (cc, "serialize", chunk_serialize, 0);
+	eEetError = rb_define_class_under (m, "EetError", rb_eStandardError);
+	eNameError = rb_define_class_under (m, "NameError", eEetError);
+	ePropError = rb_define_class_under (m, "PropertyError", eEetError);
 
 	id_include = rb_intern ("include?");
+	id_serialize = rb_intern ("serialize");
+	id_push = rb_intern ("push");
+	id_empty = rb_intern ("empty?");
+	id_to_eet_chunks = rb_intern ("to_eet_chunks");
+	id_to_eet_name = rb_intern ("to_eet_name");
+	id_to_eet_properties = rb_intern ("to_eet_properties");
+	id_tag = rb_intern ("@tag");
+	id_data = rb_intern ("@data");
 }