libarchive-ruby-swig 0.4.0 → 0.4.1

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

@@ -47,13 +47,18 @@ void Reader::close()
 }
 
 
-Reader *Reader::read_open_filename(const char *filename) 
+Reader *Reader::read_open_filename(const char *filename, const char *cmd) 
 {
     struct archive *ar = archive_read_new();
 
     try {
-        if(archive_read_support_compression_all(ar) != ARCHIVE_OK)
-            throw 0;
+        if(cmd) {
+            if(archive_read_support_compression_program(ar, cmd) != ARCHIVE_OK)
+                throw 0;
+        } else {
+            if(archive_read_support_compression_all(ar) != ARCHIVE_OK)
+                throw 0;
+        }
 
         if(archive_read_support_format_all(ar) != ARCHIVE_OK)
             throw 0;
@@ -71,31 +76,37 @@ Reader *Reader::read_open_filename(const char *filename)
 }
 
 
-Reader *Reader::read_open_memory(const char *string, int length)
+Reader *Reader::read_open_memory(const char *string, int length,
+    const char *cmd)
 {
     struct archive *ar = archive_read_new();
-    char *archive_content = (char*) malloc(length);
-    memcpy((void*) archive_content, (void*) string, length);
+    char *content = (char*) malloc(length);
+    memcpy((void*) content, (void*) string, length);
 
     try {
-        if(archive_read_support_compression_all(ar) != ARCHIVE_OK)
-            throw 0;
+        if(cmd) {
+            if(archive_read_support_compression_program(ar, cmd) != ARCHIVE_OK)
+                throw 0;
+        } else {
+            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)
+        if(archive_read_open_memory(ar, (void*) content, length) != ARCHIVE_OK)
             throw 0;
 
     } catch(...) {
         std::string error_msg = archive_error_string(ar);
         archive_read_finish(ar);
-        free(archive_content);
+        free(content);
         throw Error(error_msg);
     }
 
     Reader *reader_obj = new Reader(ar);
-    reader_obj->_archive_content = archive_content;
+    reader_obj->_archive_content = content;
     return reader_obj;
 }
 

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

@@ -39,13 +39,15 @@ class Reader
 #endif
 
 #ifdef SWIG
-%newobject read_open_filename(const char *filename);
-%newobject read_open_memory(const char *string, int length);
+%newobject read_open_filename(const char *filename, const char *cmd);
+%newobject read_open_memory(const char *string, int length, const char *cmd);
 %newobject next_header();
 #endif
 
-        static Reader *read_open_filename(const char *filename);
-        static Reader *read_open_memory(const char *string, int length);
+        static Reader *read_open_filename(const char *filename,
+            const char *cmd = 0);
+        static Reader *read_open_memory(const char *string, int length,
+            const char *cmd = 0);
 
         Entry *next_header();
         VALUE read_data_helper(int len);

data/lib/libarchive_rs.rb

@@ -91,8 +91,12 @@ module Archive
     private_class_method :new
   end
 
-  def self.read_open_filename(filename)
-    ar = Reader.read_open_filename(filename)
+  def self.read_open_filename(filename, cmd = nil)
+    unless cmd.nil?
+      cmd = locate_cmd(cmd)
+    end
+
+    ar = Reader.read_open_filename(filename, cmd)
  
     if block_given?
       yield ar
@@ -102,8 +106,12 @@ module Archive
     end
   end
 
-  def self.read_open_memory(string)
-    ar = Reader.read_open_memory(string)
+  def self.read_open_memory(string, cmd = nil)
+    unless cmd.nil?
+      cmd = locate_cmd(cmd)
+    end
+
+    ar = Reader.read_open_memory(string, cmd)
 
     if block_given?
       yield ar
@@ -115,18 +123,7 @@ module Archive
 
   def self.write_open_filename(filename, compression, format)
     if compression.is_a? String
-      if compression.index('/').nil?
-        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-          if File.executable?(path + '/' + compression)
-            compression = path + '/' + compression
-            break
-          end
-        end
-      end
-
-      unless File.executable? compression
-        raise Error, "executable '#{compression}' not found."
-      end
+      compresion = locate_cmd(compression)
     end
 
     ar = Writer.write_open_filename(filename, compression, format)
@@ -139,5 +136,28 @@ module Archive
     end
   end
 
+  private
+
+  def self.locate_cmd(cmd)
+    unless cmd.is_a? String
+      raise Error, "exepected String but found #{cmd.class}"
+    end
+
+    if cmd.index('/').nil?
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        if File.executable?(path + '/' + cmd)
+          cmd = path + '/' + cmd
+          break
+        end
+      end
+    end
+
+    unless File.executable? cmd
+      raise Error, "executable '#{cmd}' not found"
+    end
+
+    return cmd
+  end
+
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libarchive-ruby-swig
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Tobias Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 +02:00
+date: 2011-02-06 00:00:00 +02:00
 default_executable: 
 dependencies: []