zipruby 0.2.3 → 0.2.4

data/README.txt

@@ -93,6 +93,16 @@ https://rubyforge.org/frs/?group_id=6124
       ar.add_buffer('dirname/zoo.txt', 'Hello, world!')
             # args: <entry name>,      <source>
     end
+    
+    # add huge file
+    source = %w(London Bridge is falling down)
+    
+    Zip::Archive.open('filename.zip') do |ar|
+      # lb.txt => 'LondonBridgeisfallingdown'
+      ar.add('lb.txt') do # add(<filename>, <mtime>)
+        source.shift # end of stream is nil
+      end
+    end
 
 === modifying zip archive
 

data/ext/zipruby.h

@@ -1,7 +1,7 @@
 #ifndef __ZIPRUBY_H__
 #define __ZIPRUBY_H__
 
-#define VERSION "0.2.3"
+#define VERSION "0.2.4"
 #define ERRSTR_BUFSIZE 256
 #define DATA_BUFSIZE 8192
 

data/ext/zipruby_archive.c

@@ -3,6 +3,7 @@
 #include "zip.h"
 #include "zipruby.h"
 #include "zipruby_archive.h"
+#include "zipruby_zip_source_proc.h"
 #include "ruby.h"
 #include "rubyio.h"
 
@@ -19,12 +20,15 @@ static VALUE zipruby_archive_get_stat(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_add_buffer(VALUE self, VALUE name, VALUE source);
 static VALUE zipruby_archive_add_file(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_add_filep(int argc, VALUE *argv, VALUE self);
+static VALUE zipruby_archive_add_function(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_replace_buffer(VALUE self, VALUE index, VALUE source);
 static VALUE zipruby_archive_replace_file(VALUE self, VALUE index, VALUE fname);
 static VALUE zipruby_archive_replace_filep(VALUE self, VALUE index, VALUE file);
+static VALUE zipruby_archive_replace_function(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_add_or_replace_buffer(VALUE self, VALUE name, VALUE source);
 static VALUE zipruby_archive_add_or_replace_file(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_add_or_replace_filep(int argc, VALUE *argv, VALUE self);
+static VALUE zipruby_archive_add_or_replace_function(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_update(VALUE self, VALUE srcarchive);
 static VALUE zipruby_archive_get_comment(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_set_comment(VALUE self, VALUE comment);
@@ -60,12 +64,15 @@ void Init_zipruby_archive() {
   rb_define_method(Archive, "add_buffer", zipruby_archive_add_buffer, 2);
   rb_define_method(Archive, "add_file", zipruby_archive_add_file, -1);
   rb_define_method(Archive, "add_filep", zipruby_archive_add_filep, -1);
+  rb_define_method(Archive, "add", zipruby_archive_add_function, -1);
   rb_define_method(Archive, "replace_buffer", zipruby_archive_replace_buffer, 2);
   rb_define_method(Archive, "replace_file", zipruby_archive_replace_file, 2);
   rb_define_method(Archive, "replace_filep", zipruby_archive_replace_filep, 2);
+  rb_define_method(Archive, "replace", zipruby_archive_replace_function, -1);
   rb_define_method(Archive, "add_or_replace_buffer", zipruby_archive_add_or_replace_buffer, 2);
   rb_define_method(Archive, "add_or_replace_file", zipruby_archive_add_or_replace_file, -1);
   rb_define_method(Archive, "add_or_replace_filep", zipruby_archive_add_or_replace_filep, -1);
+  rb_define_method(Archive, "add_or_replace", zipruby_archive_add_or_replace_function, -1);
   rb_define_method(Archive, "update", zipruby_archive_update, 1);
   rb_define_method(Archive, "<<", zipruby_archive_add_filep, -1);
   rb_define_method(Archive, "get_comment", zipruby_archive_get_comment, -1);
@@ -522,6 +529,114 @@ static VALUE zipruby_archive_add_or_replace_filep(int argc, VALUE *argv, VALUE s
   }
 }
 
+/* */
+static VALUE zipruby_archive_add_function(int argc, VALUE *argv, VALUE self) {
+  VALUE name, mtime;
+  struct zipruby_archive *p_archive;
+  struct zip_source *zsource;
+  struct read_proc *z;
+
+  rb_scan_args(argc, argv, "11", &name, &mtime);
+  rb_need_block();
+
+  if (NIL_P(mtime)) {
+    mtime = rb_funcall(rb_cTime, rb_intern("now"), 0);
+  } else if (!rb_obj_is_instance_of(mtime, rb_cTime)) {
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected Time)", rb_class2name(CLASS_OF(mtime)));
+  }
+
+  Data_Get_Struct(self, struct zipruby_archive, p_archive); 
+  Check_Archive(p_archive);
+
+  if ((z = malloc(sizeof(struct read_proc))) == NULL) {
+    zip_unchange_all(p_archive->archive);
+    zip_unchange_archive(p_archive->archive);
+    rb_raise(rb_eRuntimeError, "Add failed - %s: Cannot allocate memory", StringValuePtr(name));
+  }
+
+  z->proc = rb_block_proc();
+  z->mtime = mtime;
+
+  if ((zsource = zip_source_proc(p_archive->archive, z)) == NULL) {
+    free(z);
+    rb_raise(Error, "Add failed - %s: %s", StringValuePtr(name), zip_strerror(p_archive->archive));
+  }
+
+  if (zip_add(p_archive->archive, StringValuePtr(name), zsource) == -1) {
+    zip_source_free(zsource);
+    zip_unchange_all(p_archive->archive);
+    zip_unchange_archive(p_archive->archive);
+    rb_raise(Error, "Add file failed - %s: %s", StringValuePtr(name), zip_strerror(p_archive->archive));
+  }
+
+  return Qnil;
+}
+
+/* */
+static VALUE zipruby_archive_replace_function(int argc, VALUE *argv, VALUE self) {
+  VALUE index, mtime;
+  struct zipruby_archive *p_archive;
+  struct zip_source *zsource;
+  struct read_proc *z;
+
+  rb_scan_args(argc, argv, "11", &index, &mtime);
+  rb_need_block();
+  Check_Type(index, T_FIXNUM);
+
+  if (NIL_P(mtime)) {
+    mtime = rb_funcall(rb_cTime, rb_intern("now"), 0);
+  } else if (!rb_obj_is_instance_of(mtime, rb_cTime)) {
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected Time)", rb_class2name(CLASS_OF(mtime)));
+  }
+
+  Data_Get_Struct(self, struct zipruby_archive, p_archive); 
+  Check_Archive(p_archive);
+
+  if ((z = malloc(sizeof(struct read_proc))) == NULL) {
+    zip_unchange_all(p_archive->archive);
+    zip_unchange_archive(p_archive->archive);
+    rb_raise(rb_eRuntimeError, "Replace failed at %d: Cannot allocate memory", NUM2INT(index));
+  }
+
+  z->proc = rb_block_proc();
+  z->mtime = mtime;
+
+  if ((zsource = zip_source_proc(p_archive->archive, z)) == NULL) {
+    free(z);
+    rb_raise(Error, "Replace failed at %d: %s", NUM2INT(index), zip_strerror(p_archive->archive));
+  }
+
+  if (zip_replace(p_archive->archive, NUM2INT(index), zsource) == -1) {
+    zip_source_free(zsource);
+    zip_unchange_all(p_archive->archive);
+    zip_unchange_archive(p_archive->archive);
+    rb_raise(Error, "Replace failed at %d: %s", NUM2INT(index), zip_strerror(p_archive->archive));
+  }
+
+  return Qnil;
+}
+
+/* */
+static VALUE zipruby_archive_add_or_replace_function(int argc, VALUE *argv, VALUE self) {
+  VALUE name, mtime;
+  struct zipruby_archive *p_archive;
+  int index;
+
+  rb_scan_args(argc, argv, "11", &name, &mtime);
+  Check_Type(name, T_STRING);
+  Data_Get_Struct(self, struct zipruby_archive, p_archive);
+  Check_Archive(p_archive);
+
+  index = zip_name_locate(p_archive->archive, StringValuePtr(name), ZIP_FL_NOCASE);
+
+  if (index >= 0) {
+    VALUE args[] = { INT2NUM(index), mtime };
+    return zipruby_archive_replace_function(2, args, self);
+  } else {
+    return zipruby_archive_add_function(argc, argv, self);
+  }
+}
+
 /* */
 static VALUE zipruby_archive_update(VALUE self, VALUE srcarchive) {
   struct zipruby_archive *p_archive, *p_srcarchive;

data/ext/zipruby_zip_source_proc.c

@@ -0,0 +1,64 @@
+#include <string.h>
+
+#include "zip.h"
+#include "zipint.h"
+#include "zipruby_zip_source_proc.h"
+#include "ruby.h"
+
+static ssize_t read_proc(void *state, void *data, size_t len, enum zip_source_cmd cmd) {
+  struct read_proc *z;
+  VALUE src;
+  char *buf;
+  size_t n;
+
+  z = (struct read_proc *) state;
+  buf = (char *) data;
+
+  switch (cmd) {
+  case ZIP_SOURCE_OPEN:
+    return 0;
+
+  case ZIP_SOURCE_READ:
+    src = rb_funcall(z->proc, rb_intern("call"), 1, ULONG2NUM(len));
+
+    if (NIL_P(src)) {
+      return 0;
+    }
+
+    src = rb_check_convert_type(src, T_STRING, "String", "to_s");
+    n = RSTRING(src)->len;
+
+    if (n > 0) {
+      n = (n > len) ? len : n;
+      memcpy(buf, StringValuePtr(src), n);
+    }
+
+    return n;
+
+  case ZIP_SOURCE_CLOSE:
+    return 0;
+
+  case ZIP_SOURCE_STAT:
+    {
+      struct zip_stat *st = (struct zip_stat *)data;
+      zip_stat_init(st);
+      st->mtime = NUM2LONG(rb_funcall(z->mtime, rb_intern("tv_sec"), 0));
+      return sizeof(*st);
+    }
+
+  case ZIP_SOURCE_ERROR:
+    return 0;
+
+  case ZIP_SOURCE_FREE:
+    free(z);
+    return 0;
+  }
+
+  return -1;
+}
+
+struct zip_source *zip_source_proc(struct zip *za, struct read_proc *z) {
+  struct zip_source *zs;
+  zs = zip_source_function(za, read_proc, z);
+  return zs;
+}

data/ext/zipruby_zip_source_proc.h

@@ -0,0 +1,14 @@
+#ifndef __ZIPRUBY_ZIP_SOURCE_PROC_H__
+#define __ZIPRUBY_ZIP_SOURCE_PROC_H__
+
+#include "zip.h"
+#include "ruby.h"
+
+struct read_proc {
+  VALUE proc;
+  VALUE mtime;
+};
+
+struct zip_source *zip_source_proc(struct zip *za, struct read_proc *z);
+
+#endif

data/zipruby.c

@@ -22,6 +22,7 @@ void Init_zipruby() {
 #include "zip.h"
 #include "zipruby.h"
 #include "zipruby_archive.h"
+#include "zipruby_zip_source_proc.h"
 #include "ruby.h"
 #include "rubyio.h"
 
@@ -38,12 +39,15 @@ static VALUE zipruby_archive_get_stat(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_add_buffer(VALUE self, VALUE name, VALUE source);
 static VALUE zipruby_archive_add_file(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_add_filep(int argc, VALUE *argv, VALUE self);
+static VALUE zipruby_archive_add_function(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_replace_buffer(VALUE self, VALUE index, VALUE source);
 static VALUE zipruby_archive_replace_file(VALUE self, VALUE index, VALUE fname);
 static VALUE zipruby_archive_replace_filep(VALUE self, VALUE index, VALUE file);
+static VALUE zipruby_archive_replace_function(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_add_or_replace_buffer(VALUE self, VALUE name, VALUE source);
 static VALUE zipruby_archive_add_or_replace_file(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_add_or_replace_filep(int argc, VALUE *argv, VALUE self);
+static VALUE zipruby_archive_add_or_replace_function(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_update(VALUE self, VALUE srcarchive);
 static VALUE zipruby_archive_get_comment(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_set_comment(VALUE self, VALUE comment);
@@ -79,12 +83,15 @@ void Init_zipruby_archive() {
   rb_define_method(Archive, "add_buffer", zipruby_archive_add_buffer, 2);
   rb_define_method(Archive, "add_file", zipruby_archive_add_file, -1);
   rb_define_method(Archive, "add_filep", zipruby_archive_add_filep, -1);
+  rb_define_method(Archive, "add", zipruby_archive_add_function, -1);
   rb_define_method(Archive, "replace_buffer", zipruby_archive_replace_buffer, 2);
   rb_define_method(Archive, "replace_file", zipruby_archive_replace_file, 2);
   rb_define_method(Archive, "replace_filep", zipruby_archive_replace_filep, 2);
+  rb_define_method(Archive, "replace", zipruby_archive_replace_function, -1);
   rb_define_method(Archive, "add_or_replace_buffer", zipruby_archive_add_or_replace_buffer, 2);
   rb_define_method(Archive, "add_or_replace_file", zipruby_archive_add_or_replace_file, -1);
   rb_define_method(Archive, "add_or_replace_filep", zipruby_archive_add_or_replace_filep, -1);
+  rb_define_method(Archive, "add_or_replace", zipruby_archive_add_or_replace_function, -1);
   rb_define_method(Archive, "update", zipruby_archive_update, 1);
   rb_define_method(Archive, "<<", zipruby_archive_add_filep, -1);
   rb_define_method(Archive, "get_comment", zipruby_archive_get_comment, -1);
@@ -541,6 +548,114 @@ static VALUE zipruby_archive_add_or_replace_filep(int argc, VALUE *argv, VALUE s
   }
 }
 
+/* */
+static VALUE zipruby_archive_add_function(int argc, VALUE *argv, VALUE self) {
+  VALUE name, mtime;
+  struct zipruby_archive *p_archive;
+  struct zip_source *zsource;
+  struct read_proc *z;
+
+  rb_scan_args(argc, argv, "11", &name, &mtime);
+  rb_need_block();
+
+  if (NIL_P(mtime)) {
+    mtime = rb_funcall(rb_cTime, rb_intern("now"), 0);
+  } else if (!rb_obj_is_instance_of(mtime, rb_cTime)) {
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected Time)", rb_class2name(CLASS_OF(mtime)));
+  }
+
+  Data_Get_Struct(self, struct zipruby_archive, p_archive); 
+  Check_Archive(p_archive);
+
+  if ((z = malloc(sizeof(struct read_proc))) == NULL) {
+    zip_unchange_all(p_archive->archive);
+    zip_unchange_archive(p_archive->archive);
+    rb_raise(rb_eRuntimeError, "Add failed - %s: Cannot allocate memory", StringValuePtr(name));
+  }
+
+  z->proc = rb_block_proc();
+  z->mtime = mtime;
+
+  if ((zsource = zip_source_proc(p_archive->archive, z)) == NULL) {
+    free(z);
+    rb_raise(Error, "Add failed - %s: %s", StringValuePtr(name), zip_strerror(p_archive->archive));
+  }
+
+  if (zip_add(p_archive->archive, StringValuePtr(name), zsource) == -1) {
+    zip_source_free(zsource);
+    zip_unchange_all(p_archive->archive);
+    zip_unchange_archive(p_archive->archive);
+    rb_raise(Error, "Add file failed - %s: %s", StringValuePtr(name), zip_strerror(p_archive->archive));
+  }
+
+  return Qnil;
+}
+
+/* */
+static VALUE zipruby_archive_replace_function(int argc, VALUE *argv, VALUE self) {
+  VALUE index, mtime;
+  struct zipruby_archive *p_archive;
+  struct zip_source *zsource;
+  struct read_proc *z;
+
+  rb_scan_args(argc, argv, "11", &index, &mtime);
+  rb_need_block();
+  Check_Type(index, T_FIXNUM);
+
+  if (NIL_P(mtime)) {
+    mtime = rb_funcall(rb_cTime, rb_intern("now"), 0);
+  } else if (!rb_obj_is_instance_of(mtime, rb_cTime)) {
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected Time)", rb_class2name(CLASS_OF(mtime)));
+  }
+
+  Data_Get_Struct(self, struct zipruby_archive, p_archive); 
+  Check_Archive(p_archive);
+
+  if ((z = malloc(sizeof(struct read_proc))) == NULL) {
+    zip_unchange_all(p_archive->archive);
+    zip_unchange_archive(p_archive->archive);
+    rb_raise(rb_eRuntimeError, "Replace failed at %d: Cannot allocate memory", NUM2INT(index));
+  }
+
+  z->proc = rb_block_proc();
+  z->mtime = mtime;
+
+  if ((zsource = zip_source_proc(p_archive->archive, z)) == NULL) {
+    free(z);
+    rb_raise(Error, "Replace failed at %d: %s", NUM2INT(index), zip_strerror(p_archive->archive));
+  }
+
+  if (zip_replace(p_archive->archive, NUM2INT(index), zsource) == -1) {
+    zip_source_free(zsource);
+    zip_unchange_all(p_archive->archive);
+    zip_unchange_archive(p_archive->archive);
+    rb_raise(Error, "Replace failed at %d: %s", NUM2INT(index), zip_strerror(p_archive->archive));
+  }
+
+  return Qnil;
+}
+
+/* */
+static VALUE zipruby_archive_add_or_replace_function(int argc, VALUE *argv, VALUE self) {
+  VALUE name, mtime;
+  struct zipruby_archive *p_archive;
+  int index;
+
+  rb_scan_args(argc, argv, "11", &name, &mtime);
+  Check_Type(name, T_STRING);
+  Data_Get_Struct(self, struct zipruby_archive, p_archive);
+  Check_Archive(p_archive);
+
+  index = zip_name_locate(p_archive->archive, StringValuePtr(name), ZIP_FL_NOCASE);
+
+  if (index >= 0) {
+    VALUE args[] = { INT2NUM(index), mtime };
+    return zipruby_archive_replace_function(2, args, self);
+  } else {
+    return zipruby_archive_add_function(argc, argv, self);
+  }
+}
+
 /* */
 static VALUE zipruby_archive_update(VALUE self, VALUE srcarchive) {
   struct zipruby_archive *p_archive, *p_srcarchive;
@@ -1474,3 +1589,67 @@ void Init_zipruby_zip() {
   rb_define_const(Zip, "EM_TRAD_PKWARE", INT2NUM(ZIP_EM_TRAD_PKWARE));
   // XXX: Strong Encryption Header not parsed yet
 }
+#include <string.h>
+
+#include "zip.h"
+#include "zipint.h"
+#include "zipruby_zip_source_proc.h"
+#include "ruby.h"
+
+static ssize_t read_proc(void *state, void *data, size_t len, enum zip_source_cmd cmd) {
+  struct read_proc *z;
+  VALUE src;
+  char *buf;
+  size_t n;
+
+  z = (struct read_proc *) state;
+  buf = (char *) data;
+
+  switch (cmd) {
+  case ZIP_SOURCE_OPEN:
+    return 0;
+
+  case ZIP_SOURCE_READ:
+    src = rb_funcall(z->proc, rb_intern("call"), 1, ULONG2NUM(len));
+
+    if (NIL_P(src)) {
+      return 0;
+    }
+
+    src = rb_check_convert_type(src, T_STRING, "String", "to_s");
+    n = RSTRING(src)->len;
+
+    if (n > 0) {
+      n = (n > len) ? len : n;
+      memcpy(buf, StringValuePtr(src), n);
+    }
+
+    return n;
+
+  case ZIP_SOURCE_CLOSE:
+    return 0;
+
+  case ZIP_SOURCE_STAT:
+    {
+      struct zip_stat *st = (struct zip_stat *)data;
+      zip_stat_init(st);
+      st->mtime = NUM2LONG(rb_funcall(z->mtime, rb_intern("tv_sec"), 0));
+      return sizeof(*st);
+    }
+
+  case ZIP_SOURCE_ERROR:
+    return 0;
+
+  case ZIP_SOURCE_FREE:
+    free(z);
+    return 0;
+  }
+
+  return -1;
+}
+
+struct zip_source *zip_source_proc(struct zip *za, struct read_proc *z) {
+  struct zip_source *zs;
+  zs = zip_source_function(za, read_proc, z);
+  return zs;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zipruby
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - winebarrel
@@ -42,6 +42,8 @@ files:
 - ext/zipruby_stat.h
 - ext/zipruby_zip.c
 - ext/zipruby_zip.h
+- ext/zipruby_zip_source_proc.c
+- ext/zipruby_zip_source_proc.h
 - ext/zip_add.c
 - ext/zip_add_dir.c
 - ext/zip_close.c