zipruby 0.1.0-mswin32 → 0.1.1-mswin32

data/zipruby.c

@@ -17,6 +17,8 @@ void Init_zipruby() {
   Init_zipruby_stat();
   Init_zipruby_error();
 }
+#include <errno.h>
+
 #include "zip.h"
 #include "zipruby.h"
 #include "zipruby_archive.h"
@@ -34,10 +36,13 @@ 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_zip(VALUE self, VALUE srcarchive);
 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_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_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);
 static VALUE zipruby_archive_locate_name(int argc, VALUE *argv, VALUE self);
@@ -70,10 +75,13 @@ 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_zip", zipruby_archive_add_zip, 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, "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, "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);
   rb_define_method(Archive, "comment", zipruby_archive_get_comment, -1);
@@ -192,7 +200,7 @@ static VALUE zipruby_archive_get_name(int argc, VALUE *argv, VALUE self) {
   Check_Archive(p_archive);
 
   if ((name = zip_get_name(p_archive->archive, NUM2INT(index), i_flags)) == NULL) {
-    rb_raise(Error, "Get name failed: %s", zip_strerror(p_archive->archive));
+    rb_raise(Error, "Get name failed at %d: %s", index, zip_strerror(p_archive->archive));
   }
 
   return (name != NULL) ? rb_str_new2(name) : Qnil;
@@ -298,6 +306,24 @@ static VALUE zipruby_archive_replace_buffer(VALUE self, VALUE index, VALUE sourc
   return Qnil;
 }
 
+/* */
+static VALUE zipruby_archive_add_or_replace_buffer(VALUE self, VALUE name, VALUE source) {
+  struct zipruby_archive *p_archive;
+  int index;
+
+  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) {
+    return zipruby_archive_replace_buffer(self, INT2NUM(index), source);
+  } else {
+    return zipruby_archive_add_buffer(self, name, source);
+  }
+}
+
 /* */
 static VALUE zipruby_archive_add_file(int argc, VALUE *argv, VALUE self) {
   VALUE name, fname;
@@ -306,18 +332,18 @@ static VALUE zipruby_archive_add_file(int argc, VALUE *argv, VALUE self) {
 
   rb_scan_args(argc, argv, "11", &name, &fname);
 
-
   if (NIL_P(fname)) {
     fname = name;
     name = Qnil;
   }
 
+  Check_Type(fname, T_STRING);
+
   if (NIL_P(name)) {
     name = rb_funcall(rb_cFile, rb_intern("basename"), 1, fname);
   }
 
   Check_Type(name, T_STRING);
-  Check_Type(fname, T_STRING);
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
   Check_Archive(p_archive);
 
@@ -359,6 +385,38 @@ static VALUE zipruby_archive_replace_file(VALUE self, VALUE index, VALUE fname)
   return Qnil;
 }
 
+/* */
+static VALUE zipruby_archive_add_or_replace_file(int argc, VALUE *argv, VALUE self) {
+  VALUE name, fname;
+  struct zipruby_archive *p_archive;
+  int index;
+
+  rb_scan_args(argc, argv, "11", &name, &fname);
+
+  if (NIL_P(fname)) {
+    fname = name;
+    name = Qnil;
+  }
+
+  Check_Type(fname, T_STRING);
+
+  if (NIL_P(name)) {
+    name = rb_funcall(rb_cFile, rb_intern("basename"), 1, fname);
+  }
+
+  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) {
+    return zipruby_archive_replace_file(self, INT2NUM(index), fname);
+  } else {
+    return zipruby_archive_add_file(argc, argv, self);
+  }
+}
+
 /* */
 static VALUE zipruby_archive_add_filep(int argc, VALUE *argv, VALUE self) {
   VALUE name, file, source;
@@ -392,31 +450,40 @@ static VALUE zipruby_archive_replace_filep(VALUE self, VALUE index, VALUE file)
 }
 
 /* */
-static VALUE zipruby_archive_get_comment(int argc, VALUE *argv, VALUE self) {
-  VALUE flags;
+static VALUE zipruby_archive_add_or_replace_filep(int argc, VALUE *argv, VALUE self) {
+  VALUE name, file;
   struct zipruby_archive *p_archive;
-  const char *comment;
-  int lenp, i_flags = 0;
+  int index;
 
-  rb_scan_args(argc, argv, "01", &flags);
+  rb_scan_args(argc, argv, "11", &name, &file);
 
-  if (!NIL_P(flags)) {
-    i_flags = NUM2INT(flags);
+  if (NIL_P(file)) {
+    file = name;
+    name = Qnil;
+  }
+
+  Check_Type(file, T_FILE);
+
+  if (NIL_P(name)) {
+    name = rb_funcall(rb_cFile, rb_intern("basename"), 1, rb_funcall(file, rb_intern("path"), 0));
   }
 
+  Check_Type(name, T_STRING);
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
   Check_Archive(p_archive);
 
-  // XXX: How is the error checked?
-  comment = zip_get_archive_comment(p_archive->archive, &lenp, i_flags);
+  index = zip_name_locate(p_archive->archive, StringValuePtr(name), ZIP_FL_NOCASE);
 
-  return comment ? rb_str_new(comment, lenp) : Qnil;
+  if (index >= 0) {
+    return zipruby_archive_replace_filep(self, INT2NUM(index), file);
+  } else {
+    return zipruby_archive_add_filep(argc, argv, self);
+  }
 }
 
 /* */
-static VALUE zipruby_archive_add_zip(VALUE self, VALUE srcarchive) {
+static VALUE zipruby_archive_update(VALUE self, VALUE srcarchive) {
   struct zipruby_archive *p_archive, *p_srcarchive;
-  struct zip_source *zsource;
   int i, num_files;
 
   if (!rb_obj_is_instance_of(srcarchive, Archive)) {
@@ -431,21 +498,111 @@ static VALUE zipruby_archive_add_zip(VALUE self, VALUE srcarchive) {
   num_files = zip_get_num_files(p_srcarchive->archive);
 
   for (i = 0; i < num_files; i++) {
-    if ((zsource = zip_source_zip(p_archive->archive, p_srcarchive->archive, i, 0, 0, -1)) == NULL) {
-      rb_raise(Error, "Add zip failed: %s", zip_strerror(p_archive->archive));
+    struct zip_source *zsource;
+    struct zip_file *fzip;
+    struct zip_stat sb;
+    char *buf;
+    const char *name;
+    int index, error;
+
+    zip_stat_init(&sb);
+
+    if (zip_stat_index(p_srcarchive->archive, i, 0, &sb)) {
+      zip_unchange_all(p_archive->archive);
+      zip_unchange_archive(p_archive->archive);
+      rb_raise(Error, "Update archive failed: %s", zip_strerror(p_srcarchive->archive));
+    }
+
+    if ((buf = malloc(sb.size)) == NULL) {
+      zip_unchange_all(p_archive->archive);
+      zip_unchange_archive(p_archive->archive);
+      rb_raise(rb_eRuntimeError, "Update archive failed: Cannot allocate memory");
+    }
+
+    fzip = zip_fopen_index(p_srcarchive->archive, i, 0);
+
+    if (fzip == NULL) {
+      free(buf);
+      zip_unchange_all(p_archive->archive);
+      zip_unchange_archive(p_archive->archive);
+      rb_raise(Error, "Update archive failed: %s", zip_strerror(p_srcarchive->archive));
+    }
+
+    if (zip_fread(fzip, buf, sb.size) == -1) {
+      free(buf);
+      zip_fclose(fzip);
+      zip_unchange_all(p_archive->archive);
+      zip_unchange_archive(p_archive->archive);
+      rb_raise(Error, "Update archive failed: %s", zip_file_strerror(fzip));
+    }
+
+    if ((error = zip_fclose(fzip)) != 0) {
+      char errstr[ERRSTR_BUFSIZE];
+      free(buf);
+      zip_unchange_all(p_archive->archive);
+      zip_unchange_archive(p_archive->archive);
+      zip_error_to_str(errstr, ERRSTR_BUFSIZE, error, errno);
+      rb_raise(Error, "Update archive failed: %s", errstr);
     }
 
-    if (zip_add(p_archive->archive, zip_get_name(p_srcarchive->archive, i, 0), zsource) == -1) {
+    if ((zsource = zip_source_buffer(p_archive->archive, buf, sb.size, 1)) == NULL) {
+      free(buf);
+      zip_unchange_all(p_archive->archive);
+      zip_unchange_archive(p_archive->archive);
+      rb_raise(Error, "Update archive failed: %s", zip_strerror(p_archive->archive));
+    }
+
+    if ((name = zip_get_name(p_srcarchive->archive, i, 0)) == NULL) {
       zip_source_free(zsource);
       zip_unchange_all(p_archive->archive);
       zip_unchange_archive(p_archive->archive);
-      rb_raise(Error, "Add zip failed: %s", zip_strerror(p_archive->archive));
+      rb_raise(Error, "Update archive failed: %s", zip_strerror(p_srcarchive->archive));
+    }
+
+    index = zip_name_locate(p_archive->archive, name, ZIP_FL_NOCASE);
+
+    if (index >= 0) {
+      if (zip_replace(p_archive->archive, i, zsource) == -1) {
+        zip_source_free(zsource);
+        zip_unchange_all(p_archive->archive);
+        zip_unchange_archive(p_archive->archive);
+        rb_raise(Error, "Update archive failed: %s", zip_strerror(p_archive->archive));
+      }
+    } else {
+      if (zip_add(p_archive->archive, name, zsource) == -1) {
+        zip_source_free(zsource);
+        zip_unchange_all(p_archive->archive);
+        zip_unchange_archive(p_archive->archive);
+        rb_raise(Error, "Update archive failed: %s", zip_strerror(p_archive->archive));
+      }
     }
   }
 
   return Qnil;
 }
 
+/* */
+static VALUE zipruby_archive_get_comment(int argc, VALUE *argv, VALUE self) {
+  VALUE flags;
+  struct zipruby_archive *p_archive;
+  const char *comment;
+  int lenp, i_flags = 0;
+
+  rb_scan_args(argc, argv, "01", &flags);
+
+  if (!NIL_P(flags)) {
+    i_flags = NUM2INT(flags);
+  }
+
+  Data_Get_Struct(self, struct zipruby_archive, p_archive);
+  Check_Archive(p_archive);
+
+  // XXX: How is the error checked?
+  comment = zip_get_archive_comment(p_archive->archive, &lenp, i_flags);
+
+  return comment ? rb_str_new(comment, lenp) : Qnil;
+}
+
 /* */
 static VALUE zipruby_archive_set_comment(VALUE self, VALUE comment) {
   struct zipruby_archive *p_archive;
@@ -779,7 +936,7 @@ static VALUE zipruby_file_initialize(int argc, VALUE *argv, VALUE self) {
     fzip = zip_fopen_index(p_archive->archive, i_index, i_flags);
 
     if (fzip == NULL) {
-      rb_raise(Error, "Open file failed at %d", i_index, zip_strerror(p_archive->archive));
+      rb_raise(Error, "Open file failed at %d: %s", i_index, zip_strerror(p_archive->archive));
     }
   }
 
@@ -804,8 +961,8 @@ static VALUE zipruby_file_close(VALUE self) {
 
   if ((error = zip_fclose(p_file->file)) != 0) {
     char errstr[ERRSTR_BUFSIZE];
-    zip_error_to_str(errstr, ERRSTR_BUFSIZE, error, errno);
     zip_unchange(p_file->archive, p_file->sb->index);
+    zip_error_to_str(errstr, ERRSTR_BUFSIZE, error, errno);
     rb_raise(Error, "Close file failed: %s", errstr);
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zipruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: mswin32
 authors: 
 - winebarrel