ruby-mp3info 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dae26856d6a1cd3953b33d72433d5ec071c12d8
-  data.tar.gz: d05a2acdadfa42efb5801cb2f8207acc0690f954
+  metadata.gz: 2623bb3c42570ac26f433976d36d71e1ed64faf0
+  data.tar.gz: be52e6fb3afb871e59f8a24b9e18dda682f91e70
 SHA512:
-  metadata.gz: 56392604532e62fee6ab829f4a3d1d9d80672f1cde984540b0ff0b1b4eeee41ba96c9eba57b300214ab75954c533f0cdd7ea0d6d57458e358984c302ec681b1d
-  data.tar.gz: 11a5c190a0837fcd840d2e0ce1932652ebf04f4f3017c38655502cc61affcf0edd7fd7990ee460336158ce5efaf10f29be74b97573a1890842e1537777770218
+  metadata.gz: 885f991c667e898af9decb33a2a63515c705f7eaf69f17f682410f117583edbf67febaf0dba7d218fcd9a1fd826a34c26be7abfcfb1cc1ecb4942c73cd2c702c
+  data.tar.gz: a7658745342508647a955ae12c9cdb0b74041e780fb15ac249414bb8aec254e553a51f492384ce27aa834c85f3704ae98dc6f4ffe2f9db2a1840ec37e8947e45

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.8.8 / 2016-01-26
+
+* fix on picture parsing when mime type is wrong
+
 === 0.8.7 / 2015-07-13
 
 *  Cope with malformed UTF16 string tags without BOM  (thanks to mikecrowe)

data/lib/mp3info.rb

@@ -18,7 +18,7 @@ end
 
 class Mp3Info
 
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = {
@@ -461,6 +461,7 @@ class Mp3Info
         FileUtils.rm tempfile_name
       end
     end
+    @io.close unless @io.closed?
   end
 
   # close and reopen the file, i.e. commit changes to disk and

data/lib/mp3info/id3v2.rb

@@ -292,50 +292,45 @@ class ID3v2 < DelegateClass(Hash)
       mime_pos = 0
       
       # safest way to correctly extract jpg and png is finding mime
-      if header.match jpg
+      if header.match jpg and not header.match png
         mime = "jpg"
         mime_pos = header =~ jpg
         start = Regexp.new("\xFF\xD8".force_encoding("BINARY"),
                 Regexp::FIXEDENCODING )
         start_with_anchor = Regexp.new("^\xFF\xD8".force_encoding("BINARY"),
-                            Regexp::FIXEDENCODING )
-      elsif header.match png
+                                       Regexp::FIXEDENCODING )
+         # inspect jpg image header (first 10 chars) for "\xFF\x00" (expect "\xFF")
+         trailing_null_byte = Regexp.new("(\377)(\000)".force_encoding('BINARY'), 
+                                Regexp::FIXEDENCODING)
+         if (data =~ trailing_null_byte) < 10
+           data.gsub!(trailing_null_byte, "\xff".force_encoding('BINARY'))
+         end
+      end
+      
+      if header.match png and not header.match jpg
         mime = "png"
         mime_pos = header =~ png
         start = Regexp.new("\x89PNG".force_encoding("BINARY"),
                 Regexp::FIXEDENCODING )
         start_with_anchor = Regexp.new("^\x89PNG".force_encoding("BINARY"),
                             Regexp::FIXEDENCODING )
-      else
-        mime = "dat"
       end
-
+      
       puts "analysing image: #{header.inspect}..." if $DEBUG
       _, _, desc, data = pic[mime_pos, pic.length].unpack('Z*hZ*a*')
 
-      if mime != "dat" and (!data.match(start_with_anchor) or data.nil?)
+      if mime and (!data.match(start_with_anchor) or data.nil?)
         real_start = pic =~ start
         data = pic[real_start, pic.length]
       end
 
-      if mime == "dat"
+      unless mime
+        mime = "dat"
         # if no jpg or png, extract data anyway e.g. gif
         mime, desc, data = pic.unpack('h Z* h Z* a*').values_at(1,3,4)
       end
 
-      if mime == "jpg"
-         # inspect jpg image header (first 10 chars) for "\xFF\x00" (expect "\xFF")
-         trailing_null_byte = Regexp.new("(\377)(\000)".force_encoding('BINARY'), 
-                                Regexp::FIXEDENCODING)
-         if (data =~ trailing_null_byte) < 10
-           data.gsub!(trailing_null_byte, "\xff".force_encoding('BINARY'))
-         end
-      end
-      
-      desc = "%02i_#{desc[0,25]}" % (index + 1)
-      
-      filename = desc.match("#{mime}$") ? desc : "#{desc}.#{mime}"
-      filename.gsub!('/','')
+      filename = ("%02i_#{desc[0,25]}" % (index + 1)).gsub('/','')
       
       picture[0] = filename
       picture[1] = data
@@ -467,8 +462,8 @@ class ID3v2 < DelegateClass(Hash)
           p out
 =end
           comment = Mp3Info::EncodingHelper.decode_utf16(raw_tag)
-          split_val = RUBY_1_8 ? "\x00\x00" : "\x00".encode(comment.encoding)
-          out = comment.split(split_val).last rescue ""
+          split_val = RUBY_1_8 ? "\x00\x00" : "\x00".encode(comment.encoding).force_encoding('ASCII-8BIT')
+          out = raw_tag.split(split_val).last rescue ""
         else
           comment, out = raw_tag.split("\x00", 2)
         end

data/test/test_ruby-mp3info.rb

@@ -218,6 +218,17 @@ class Mp3InfoTest < TestCase
     end
   end
 
+  def test_id3v2_get_pictures
+    img = "\x89PNG\r\n\u001A\n\u0000\u0000\u0000\rIHDR\u0000\u0000\u0000\u0001\u0000\u0000\u0000\u0001\b\u0002\u0000\u0000\u0000\x90wS\xDE\u0000\u0000\u0000\fIDAT\b\xD7c\xF8\xFF\xFF?\u0000\u0005\xFE\u0002\xFE\xDC\xCCY\xE7\u0000\u0000\u0000\u0000IEND\xAEB`\x82".force_encoding('BINARY')
+    Mp3Info.open(TEMP_FILE) do |mp3|
+      mp3.tag2.add_picture(img, :description => 'example image.png', :mime => 'jpg')
+    end
+    
+    Mp3Info.open(TEMP_FILE) do |mp3|
+      assert_equal(["01_example image.png", img], mp3.tag2.pictures[0])
+    end
+  end
+  
   def test_id3v2_remove_pictures
     jpg_data = "\xFF".force_encoding('BINARY') +
       random_string(123).force_encoding('BINARY')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mp3info
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Guillaume Pierronnet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc