libarchive-ruby-swig 0.3.1 → 0.4.0

data/ext/libarchive-ruby-swig/libarchive.i

@@ -24,6 +24,8 @@
 /* --- WRAPPER CODE START --- */
 %}
 
+%apply (char *STRING, int LENGTH) { (const char *string, int length) };
+
 %include "reader.h"
 %include "writer.h"
 %include "entry.h"

data/ext/libarchive-ruby-swig/reader.cpp

@@ -19,7 +19,8 @@
 Reader::Reader(struct archive *ar)
     : _ar(ar),
     _buf((char*) malloc(1024)),
-    _buf_size(1024)
+    _buf_size(1024),
+    _archive_content(0)
 {}
 
 
@@ -38,10 +39,15 @@ void Reader::close()
         archive_read_finish(_ar);
         _ar = 0;
     }
+
+    if(_archive_content) {
+        free(_archive_content);
+        _archive_content = 0;
+    }
 }
 
 
-Reader *Reader::read_open_filename(const char * filename) 
+Reader *Reader::read_open_filename(const char *filename) 
 {
     struct archive *ar = archive_read_new();
 
@@ -65,6 +71,35 @@ Reader *Reader::read_open_filename(const char * filename)
 }
 
 
+Reader *Reader::read_open_memory(const char *string, int length)
+{
+    struct archive *ar = archive_read_new();
+    char *archive_content = (char*) malloc(length);
+    memcpy((void*) archive_content, (void*) string, length);
+
+    try {
+        if(archive_read_support_compression_all(ar) != ARCHIVE_OK)
+            throw 0;
+
+        if(archive_read_support_format_all(ar) != ARCHIVE_OK)
+            throw 0;
+
+        if(archive_read_open_memory(ar, (void*) archive_content, length) != ARCHIVE_OK)
+            throw 0;
+
+    } catch(...) {
+        std::string error_msg = archive_error_string(ar);
+        archive_read_finish(ar);
+        free(archive_content);
+        throw Error(error_msg);
+    }
+
+    Reader *reader_obj = new Reader(ar);
+    reader_obj->_archive_content = archive_content;
+    return reader_obj;
+}
+
+
 Entry *Reader::next_header()
 {
     Entry * result = 0;

data/ext/libarchive-ruby-swig/reader.h

@@ -40,10 +40,13 @@ class Reader
 
 #ifdef SWIG
 %newobject read_open_filename(const char *filename);
+%newobject read_open_memory(const char *string, int length);
 %newobject next_header();
 #endif
 
         static Reader *read_open_filename(const char *filename);
+        static Reader *read_open_memory(const char *string, int length);
+
         Entry *next_header();
         VALUE read_data_helper(int len);
 
@@ -54,6 +57,7 @@ class Reader
     private:
         struct archive *_ar;
         char *_buf;
+        char *_archive_content;
         int _buf_size;
 };
 

data/ext/libarchive-ruby-swig/writer.h

@@ -82,10 +82,6 @@ class Writer
 
         void write_header(Entry *entry);
 
-#ifdef SWIG
-%apply (char *STRING, int LENGTH) { (const char *string, int length) };
-#endif
-
         void write_data_helper(const char *string, int length);
 
 #ifdef SWIG

data/lib/libarchive_rs.rb

@@ -102,6 +102,17 @@ module Archive
     end
   end
 
+  def self.read_open_memory(string)
+    ar = Reader.read_open_memory(string)
+
+    if block_given?
+      yield ar
+      ar.close()
+    else
+      return ar
+    end
+  end
+
   def self.write_open_filename(filename, compression, format)
     if compression.is_a? String
       if compression.index('/').nil?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libarchive-ruby-swig
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tobias Koch