mspack_rb 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f9c40d23c5867b56e2fa1b1960fd31309cfa799
-  data.tar.gz: 642ae95857d11d712c584a11b2f20ba0b2daeca3
+  metadata.gz: 5ca23ebbd613db3fe80bd92522255ba960a7b039
+  data.tar.gz: a9f7f8bb5d4be741d535d3c6c4b03ae2430c80d5
 SHA512:
-  metadata.gz: 508fd382485b88754746f25ff1bae5006a68306c5ced69a141e52c053470a2c89d6014cb8999f2ea7a261f5e9a535eb4cf5fffd40b46322ef013ca0bc7199f68
-  data.tar.gz: 64dd35882e4fa5fbfa80c147ad422ec30d83caf27d89df1ea130ec743d2e2bb02889b64287b9855375ebbda35851bf155f095b66b8dae948a10beb83b6ad564b
+  metadata.gz: 413f41de3155794d82dcfb7d0e4e5f58319cd4026f652dcaa333ea0b62a300008aa4f27e3edf8d428c3d0d83000becc008b602ad65d98206dc7ab89f6daea72c
+  data.tar.gz: 91758d054375b7d19a7de6e6551b5627161e6eb14744858dbf73394f18b7255f115dfe47260ab20cf32312a984fcb1faf44e7e45f45714409fa75d710a79c955

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "mspack_rb"
+require "mspack"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/ext/mspack_native/chm_decompressor.c

@@ -124,11 +124,11 @@ VALUE chmd_extract_to_path(VALUE self, VALUE file, VALUE outputPath) {
   struct mschm_decompressor *decom;
   Data_Get_Struct(self, struct mschm_decompressor, decom);
 
-  struct mschmd_file *filePtr;
-  Data_Get_Struct(file, struct mschmd_file, filePtr);
+  struct chmd_file_wrapper *wrapper;
+  Data_Get_Struct(file, struct chmd_file_wrapper, wrapper);
   const char *pathStr = StringValueCStr(outputPath);
 
-  int result = decom->extract(decom, filePtr, pathStr);
+  int result = decom->extract(decom, wrapper->file, pathStr);
   return result == MSPACK_ERR_OK ? Qtrue : Qfalse;
 }
 
@@ -167,9 +167,11 @@ VALUE chmd_fast_find(VALUE self, VALUE header, VALUE filename) {
   file->filename = malloc(sizeof(char) * strlen(filenameStr) + 1);
   strcpy(file->filename, filenameStr);
 
-  VALUE fileObj = Data_Wrap_Struct(ChmDFile, NULL, NULL, file);
-  rb_iv_set(fileObj, "is_fast_find", Qtrue);
-  return fileObj;
+  struct chmd_file_wrapper *wrapper = malloc(sizeof(struct chmd_file_wrapper));
+  wrapper->is_fast_find = 1;
+  wrapper->file = file;
+
+  return Data_Wrap_Struct(ChmDFile, NULL, chmd_file_free, wrapper);
 }
 
 void Init_chm_decompressor() {

data/ext/mspack_native/chm_decompressor_file.c

@@ -4,44 +4,51 @@
 #include <mspack.h>
 
 void chmd_file_free(void *ptr) {
-  struct mschmd_file *file = (struct mschmd_file *)ptr;
+  struct chmd_file_wrapper *wrapper = (struct chmd_file_wrapper *)ptr;
 
-  if (file->length == 0) { // only free if it was created in fast_find
-    //if (file->filename) {
-    //  free(file->filename);
-    //}
+  if (wrapper->is_fast_find) {
+    if (wrapper->file->filename) {
+      free(wrapper->file->filename);
+    }
 
-    free(file);
+    free(wrapper->file);
   }
+
+  free(ptr);
 }
 
 VALUE chmd_file_filename(VALUE self) {
-  struct mschmd_file *file;
-  Data_Get_Struct(self, struct mschmd_file, file);
+  struct chmd_file_wrapper *wrapper;
+  Data_Get_Struct(self, struct chmd_file_wrapper, wrapper);
 
-  if (!file->filename) {
+  if (!wrapper->file->filename) {
     return Qnil;
   }
 
-  return rb_str_new2(file->filename);
+  return rb_str_new2(wrapper->file->filename);
 }
 
 VALUE chmd_file_next(VALUE self) {
-  struct mschmd_file *file;
-  Data_Get_Struct(self, struct mschmd_file, file);  
-  struct mschmd_file *next = file->next;
+  struct chmd_file_wrapper *wrapper;
+  Data_Get_Struct(self, struct chmd_file_wrapper, wrapper);
+  struct mschmd_file *next = wrapper->file->next;
 
   if (!next) {
     return Qnil;
   }
 
-  VALUE nextObj = Data_Wrap_Struct(ChmDFile, NULL, chmd_file_free, next);
-  rb_iv_set(nextObj, "is_fast_find", Qfalse);
-  return nextObj;
+  struct chmd_file_wrapper *next_wrapper = 
+    malloc(sizeof(struct chmd_file_wrapper));
+  next_wrapper->is_fast_find = 0;
+  next_wrapper->file = next;
+
+  return Data_Wrap_Struct(ChmDFile, NULL, chmd_file_free, next_wrapper);
 }
 
 VALUE chmd_file_is_fast_find(VALUE self) {
-  return rb_iv_get(self, "is_fast_find");
+  struct chmd_file_wrapper *wrapper;
+  Data_Get_Struct(self, struct chmd_file_wrapper, wrapper);
+  return wrapper->is_fast_find ? Qtrue : Qfalse;
 }
 
 void Init_chm_decompressor_file() {

data/ext/mspack_native/chm_decompressor_file.h

@@ -3,6 +3,15 @@
 
 #include <ruby.h>
 
+struct mschmd_file;
+
+struct chmd_file_wrapper {
+  int is_fast_find;
+  struct mschmd_file *file;
+};
+
+void chmd_file_free(void *ptr);
+
 void Init_chm_decompressor_file();
 
 #endif

data/ext/mspack_native/chm_decompressor_header.c

@@ -1,4 +1,5 @@
 #include "chm_decompressor_header.h"
+#include "chm_decompressor_file.h"
 #include "mspack_native.h"
 
 #include <mspack.h>
@@ -16,10 +17,12 @@ VALUE chmd_header_files(VALUE self) {
   if (!header->files) {
     return Qnil;
   }
+
+  struct chmd_file_wrapper *wrapper = malloc(sizeof(struct chmd_file_wrapper));
+  wrapper->is_fast_find = 0;
+  wrapper->file = header->files;
   
-  VALUE file = Data_Wrap_Struct(ChmDFile, NULL, NULL, header->files);
-  rb_iv_set(file, "is_fast_find", Qfalse);
-  return file;
+  return Data_Wrap_Struct(ChmDFile, NULL, chmd_file_free, wrapper);
 }
 
 VALUE chmd_header_is_fast_open(VALUE self) {

data/lib/mspack/version.rb

@@ -1,3 +1,3 @@
 module Mspack
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mspack_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ben Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler