mediainfo-native 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0f56b4c58101337bd45b648203546d54f092327
-  data.tar.gz: b81cf0c184cffefc4c1a1d63054a7d153c36f7e3
+  metadata.gz: 96cbdd0092637b32864710d15fac06c55bbc6500
+  data.tar.gz: fc283a05212d70048b0e69bfa3829d5b86d2f5fa
 SHA512:
-  metadata.gz: f8c714cabd82f191654d64a501af61c53b8814a725e35109ea219ca343d3142fb8179715ff689f5ccbcfc01382292a2c2d45291c8f0505ab3128c5944bc3c366
-  data.tar.gz: 88879bd09a869d7a9c0cbb20dcbdd8386c016d97fbfc7b45f7fd4f34f03625ce0ce62c78dd20d40a71733af3738693f072d76a1bc6677251cff7246d8d6022f7
+  metadata.gz: cc8efacc08144c5b3d6ddb97342c83d6ce0e9e9db04620ade5701ffd539abf54baf5c23800c648a1e448e1cee7fa89f3a09672c4fd4325a3c2091c3aa2c45f31
+  data.tar.gz: 285c144f1f61558a7ef0a705e89e01b2cfd198515700908f05c385b2aefc66bdea6660d45f3e8a53b448a9a9a8eb15718ef768a0223672ee0b180dcf71ead822

data/ext/mediainfo_native/MediaInfoDLL.h

@@ -16,8 +16,8 @@
 #define MediaInfoDLLH
 
 
-#undef UNICODE
-#undef _UNICODE
+#define UNICODE
+#define _UNICODE
 
 //***************************************************************************
 // Platforms (from libzen)

data/ext/mediainfo_native/mediainfo_wrapper.cpp

@@ -68,7 +68,7 @@ extern "C"
     Check_Type(path, T_STRING);
     GET_WRAPPER(miw);
 
-    OpenParams params = { miw, value_to_ansi_string(path), 0 };
+    OpenParams params = { miw, value_to_mediainfo_string(path), 0 };
     rb_thread_call_without_gvl(miw_open_without_gvl, (void*) &params, NULL, NULL);
 
     switch(params.result) {
@@ -103,7 +103,7 @@ extern "C"
     Check_Type(path, T_STRING);
     GET_WRAPPER(miw);
 
-    miw->open(value_to_ansi_string(path));
+    miw->open(value_to_mediainfo_string(path));
     VALUE inform = miw->inform();
     miw->close();
 
@@ -169,9 +169,9 @@ MediaInfoWrapper::MediaInfoWrapper(bool ignore_continuous_file_names)
 : file_opened(false)
 {
   mi = new MediaInfoDLL::MediaInfo();
-  mi->Option("Inform", "XML");
-  mi->Option("Complete", "1");
-  mi->Option("File_TestContinuousFileNames", ignore_continuous_file_names ? "0" : "1");
+  mi->Option(L"Inform", L"XML");
+  mi->Option(L"Complete", L"1");
+  mi->Option(L"File_TestContinuousFileNames", ignore_continuous_file_names ? L"0" : L"1");
 }
 
 MediaInfoWrapper::~MediaInfoWrapper()
@@ -183,7 +183,7 @@ MediaInfoWrapper::~MediaInfoWrapper()
     delete mi;
 }
 
-int MediaInfoWrapper::open(std::string path)
+int MediaInfoWrapper::open(MediaInfoDLL::String path)
 {
   if(file_opened)
     return 1;
@@ -225,20 +225,20 @@ VALUE MediaInfoWrapper::wrapStreams()
 
 VALUE MediaInfoWrapper::get(StreamType type, unsigned int idx, VALUE key) const
 {
-  MediaInfoDLL::String mi_key(value_to_ansi_string(key));
-  return ansi_string_to_value(mi->Get(convertToMediaInfoStreamType(type), idx, mi_key));
+  MediaInfoDLL::String mi_key(value_to_mediainfo_string(key));
+  return mediainfo_string_to_value(mi->Get(convertToMediaInfoStreamType(type), idx, mi_key));
 }
 
 VALUE MediaInfoWrapper::inform() const
 {
   CHECK_OPEN;
 
-  return ansi_string_to_value(mi->Inform());
+  return mediainfo_string_to_value(mi->Inform());
 }
 
 VALUE MediaInfoWrapper::option() const
 {
-  return ansi_string_to_value(mi->Option("Info_Parameters"));
+  return mediainfo_string_to_value(mi->Option(L"Info_Parameters"));
 }
 
 } /* namespace MediaInfoNative */

data/ext/mediainfo_native/unicode.cpp

@@ -1,19 +1,36 @@
 #include <ruby.h>
-#include <ruby/encoding.h>
+#include <cstdlib>
 #include "unicode.h"
 
-MediaInfoDLL::String value_to_ansi_string(VALUE s)
+MediaInfoDLL::String value_to_mediainfo_string(VALUE s)
 {
-  rb_encoding* enc = rb_enc_find("ANSI");
-  VALUE exported = rb_str_export_to_enc(s, enc);
-  return MediaInfoDLL::String(StringValueCStr(exported));
+  size_t  nchars = RSTRING_LEN(s);
+  wchar_t buf[nchars + 1];
+
+  nchars = mbstowcs(buf, StringValueCStr(s), nchars);
+
+  if((size_t) (-1) == nchars)
+    rb_raise(rb_eArgError, "invalid multi-byte sequence in char array");
+  else
+    // According to mbstowcs(3), this is not nul-terminated when max characters
+    // have been written.
+    buf[nchars] = L'\0';
+
+  return MediaInfoDLL::String(buf);
 }
 
-VALUE ansi_string_to_value(MediaInfoDLL::String s)
+VALUE mediainfo_string_to_value(MediaInfoDLL::String s)
 {
-#ifdef RBX_RUBY_VERSION
-  return rb_external_str_new_with_enc(s.c_str(), s.length(), rb_enc_find("ANSI"));
-#else
-  return rb_external_str_new_with_enc(s.c_str(), s.length(), rb_ascii8bit_encoding());
-#endif
+  size_t nbytes = s.length() * 2;
+  char   buf[nbytes + 1];
+
+  nbytes = wcstombs(buf, s.data(), nbytes);
+
+  if((size_t) (-1) == nbytes)
+    rb_raise(rb_eArgError, "wide-char sequence not representable in char array");
+  else
+    // This should actually always be there, just to make sure.
+    buf[nbytes] = '\0';
+
+  return rb_locale_str_new_cstr(buf);
 }

data/ext/mediainfo_native/unicode.h

@@ -4,7 +4,7 @@
 #include <ruby.h>
 #include "MediaInfoDLL.h"
 
-MediaInfoDLL::String value_to_ansi_string(VALUE s);
-VALUE ansi_string_to_value(MediaInfoDLL::String s);
+MediaInfoDLL::String value_to_mediainfo_string(VALUE s);
+VALUE mediainfo_string_to_value(MediaInfoDLL::String s);
   
 #endif /* MEDIAINFO_NATIVE_UNICODE_H */

data/lib/mediainfo-native/version.rb

@@ -1,3 +1,3 @@
 module MediaInfoNative
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediainfo-native
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -91,3 +91,4 @@ signing_key:
 specification_version: 4
 summary: Native bindings for mediainfo
 test_files: []
+has_rdoc: