ruby-mp3info 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce54c521b67a367467f344b231debdbb1e36b543
-  data.tar.gz: 160261476cab97ea32fddd4870ff67a92ffd6ac5
+  metadata.gz: ec6e84b6d95639a26f8ff0baf64625889bfd6b3a
+  data.tar.gz: 9de4508c025b0c865f0eb4b29fe9c70b75495ed2
 SHA512:
-  metadata.gz: 0609877cdd0fba3d09a74bc613338da699eb67dfe7bedf80f872ff09bdc23689bcb3e86c97632133f4c60bbad1c4ba8ac6e188799670e73772f818803627c9a4
-  data.tar.gz: 08999c5701caab8ba9a2a6e0d0ac0961e076d1acea747114878f1d84e2238631cf36cf472f5b2a4ad3bc880c6efa0eef2f0b558d544afb20bdfaf8c94c7e6076
+  metadata.gz: f619a8973e5dee36135546d5be127c9a9d105e255cd94323ce073ec58f03aa4e668dcc156398984c5ab4a9a756dd8ea9006cadab62e2824a3741c6a6f20a6d77
+  data.tar.gz: 171267103c889d7a3136e5f727a74db06acc664d5d7a5118e9cfb011abe0daa2165d06d1b71f2d4edd77ff6b8f4669d306c94a256ade3c6f7b4093e1eb5e9629

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.8.10 / 2016-10-31
+
+* bugfix on /^(T|COM|USLT)/ tags parsing
+
 === 0.8.9 / 2016-02-03
 
 * bugfix on JPEG picture parsing + testsuite

data/lib/mp3info.rb

@@ -18,7 +18,7 @@ end
 
 class Mp3Info
 
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = {

data/lib/mp3info/extension_modules.rb

@@ -17,19 +17,7 @@ class Mp3Info
     end
   end  
   
-  class ::String
-    if RUBY_VERSION < "1.9.0"
-      alias getbyte []
-    end
-  end
-
   module Mp3FileMethods #:nodoc: 
-    if RUBY_VERSION < "1.9.0"
-      def getbyte
-        getc
-      end
-    end
-                        
     def get32bits
       (getbyte << 24) + (getbyte << 16) + (getbyte << 8) + getbyte
     end
@@ -41,26 +29,15 @@ class Mp3Info
 
   class EncodingHelper #:nodoc:
     def self.convert_to(value, from, to)
-      if RUBY_1_8
-        if to == "iso-8859-1"
-          to = to + "//TRANSLIT"
-        end
-        ruby_18_encode(from, to, value)
+      if to == "utf-16"
+        ("\uFEFF" +  value).encode("UTF-16LE") # Chab 01.apr.2012 : moved from big to little endian for more compatibility (Windows Media Player, older Quicktime..)
       else
-        if to == "utf-16"
-          ("\uFEFF" +  value).encode("UTF-16LE") # Chab 01.apr.2012 : moved from big to little endian for more compatibility (Windows Media Player, older Quicktime..)
-        else
-          value.encode(to)
-        end
+        value.encode(to)
       end
     end
 
     def self.convert_from_iso_8859_1(value)
-      if RUBY_1_8
-        ruby_18_encode("utf-8", "iso-8859-1", value)
-      else
-        value.force_encoding("iso-8859-1").encode("utf-8")
-      end
+      value.force_encoding("iso-8859-1").encode("utf-8")
     end
 
     def self.ruby_18_encode(from, to, value)
@@ -68,26 +45,22 @@ class Mp3Info
     end
 
     def self.decode_utf16(out)
-      if RUBY_1_8
-        convert_to(out, "UTF-8", "UTF-16")
+      # String#bytes is not an array in Ruby 1.9
+      bytes = out.bytes.to_a
+      if out.length >= 2 and bytes[0] == 0xff and bytes[1] == 0xfe
+        tag_encoding = "UTF-16LE"
+        first_valid = 1
+      elsif out.length >= 2 and bytes[0] == 0xfe and bytes[1] == 0xff
+        tag_encoding = "UTF-16BE"
+        first_valid = 1
       else
-        # String#bytes is not an array in Ruby 1.9
-        bytes = out.bytes.to_a
-        if out.length >= 2 and bytes[0] == 0xff and bytes[1] == 0xfe
-          tag_encoding = "UTF-16LE"
-          first_valid = 1
-        elsif out.length >= 2 and bytes[0] == 0xfe and bytes[1] == 0xff
-          tag_encoding = "UTF-16BE"
-          first_valid = 1
-        else
-          # ID3v2.3.0 section 3.3 mandates a BOM but some software
-          # erroneously omits it so we have to guess. Since most of
-          # the world is little endian we might as well go with that.
-          tag_encoding = "UTF-16LE"
-          first_valid = 0
-        end
-        out = out.dup.force_encoding(tag_encoding)[first_valid..-1]
+        # ID3v2.3.0 section 3.3 mandates a BOM but some software
+        # erroneously omits it so we have to guess. Since most of
+        # the world is little endian we might as well go with that.
+        tag_encoding = "UTF-16LE"
+        first_valid = 0
       end
+      out = out.dup.force_encoding(tag_encoding)[first_valid..-1]
     end
   end
 end

data/lib/mp3info/id3v2.rb

@@ -4,13 +4,6 @@
 
 require "delegate"
 
-if RUBY_VERSION[0..2] == "1.8"
-  require "iconv"
-  RUBY_1_8 = true
-else
-  RUBY_1_8 = false
-end
-
 require "mp3info/extension_modules"
 
 class ID3v2Error < StandardError ; end
@@ -19,8 +12,8 @@ class ID3v2Error < StandardError ; end
 # It works like a hash, where key represents the tag name as 3 or 4 upper case letters
 # (respectively related to 2.2 and 2.3+ tag) and value represented as array or raw value.
 # Written version is always 2.3.
-class ID3v2 < DelegateClass(Hash) 
-  
+class ID3v2 < DelegateClass(Hash)
+
   TAGS = {
     "AENC" => "Audio encryption",
     "APIC" => "Attached picture",
@@ -168,17 +161,17 @@ class ID3v2 < DelegateClass(Hash)
 
   # In Ruby 2.1.0 (and possibly others), DelegateClass breaks Kernel methods.
   include Kernel
-  
+
   # this is the position in the file where the tag really ends
   attr_reader :io_position
 
   # :+lang+: for writing comments
   #
-  # [DEPRECATION] :+encoding+: one of the string of +TEXT_ENCODINGS+, 
+  # [DEPRECATION] :+encoding+: one of the string of +TEXT_ENCODINGS+,
   # use of :encoding parameter is DEPRECATED. In ruby 1.8, use utf-8 encoded strings for tags.
   # In ruby >= 1.9, strings are automatically transcoded from their originaloriginal  encoding.
   attr_reader :options
-  
+
   # possible options are described above ('options' attribute)
   # you can access this object like an hash, with [] and []= methods
   # special cases are ["disc_number"] and ["disc_total"] mirroring TPOS attribute
@@ -208,7 +201,7 @@ class ID3v2 < DelegateClass(Hash)
   def changed?
     @hash_orig != @hash
   end
-  
+
   # full version of this tag (like "2.3.0") or nil
   # if tag was not correctly read
   def version
@@ -237,14 +230,14 @@ class ID3v2 < DelegateClass(Hash)
   end
 
   ### ID3V2::add_picture
-  ### Takes an image string as input and writes it with header. 
+  ### Takes an image string as input and writes it with header.
   ### Mime type is automatically guessed by default.
   ### It is possible but not necessary to include:
   ###  :pic_type => 0 - 14 (see http://id3.org/id3v2.3.0#Attached_picture)
-  ###  :mime => 'gif' 
+  ###  :mime => 'gif'
   ###  :description => "Image description"
   def add_picture(data, opts = {})
-    options = { 
+    options = {
                 :pic_type => 0,
                 :mime => nil,
                 :description => "image"
@@ -282,7 +275,7 @@ class ID3v2 < DelegateClass(Hash)
     apic_images.each_index do |index|
       pic = apic_images[index]
       next if !pic.is_a?(String) or pic == ""
-      pic.force_encoding 'BINARY' 
+      pic.force_encoding 'BINARY'
       picture = []
       jpg_regexp = Regexp.new("jpg|JPG|jpeg|JPEG".force_encoding("BINARY"),
                    Regexp::FIXEDENCODING )
@@ -290,7 +283,7 @@ class ID3v2 < DelegateClass(Hash)
                    Regexp::FIXEDENCODING )
       header = pic.unpack('a120').first.force_encoding "BINARY"
       mime_pos = 0
-      
+
       # safest way to correctly extract jpg and png is finding mime
       if header.match jpg_regexp and not header.match png_regexp
         mime = "jpg"
@@ -300,7 +293,7 @@ class ID3v2 < DelegateClass(Hash)
         start_with_anchor = Regexp.new("^\xFF\xD8".force_encoding("BINARY"),
                                        Regexp::FIXEDENCODING )
       end
-      
+
       if header.match png_regexp and not header.match jpg_regexp
         mime = "png"
         mime_pos = header =~ png_regexp
@@ -309,7 +302,7 @@ class ID3v2 < DelegateClass(Hash)
         start_with_anchor = Regexp.new("^\x89PNG".force_encoding("BINARY"),
                             Regexp::FIXEDENCODING )
       end
-      
+
       puts "analysing image: #{header.inspect}..." if $DEBUG
       _, _, desc, data = pic[mime_pos, pic.length].unpack('Z*hZ*a*')
 
@@ -318,10 +311,10 @@ class ID3v2 < DelegateClass(Hash)
           real_start = pic =~ start
           data = pic[real_start, pic.length]
         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'), 
+          trailing_null_byte = Regexp.new("(\377)(\000)".force_encoding('BINARY'),
                                           Regexp::FIXEDENCODING)
           md = data =~ trailing_null_byte
           if !md.nil? and md < 10
@@ -335,7 +328,7 @@ class ID3v2 < DelegateClass(Hash)
       end
 
       filename = ("%02i_#{desc[0,25]}" % (index + 1)).gsub('/','')
-      
+
       picture[0] = filename
       picture[1] = data
       result << picture
@@ -346,7 +339,7 @@ class ID3v2 < DelegateClass(Hash)
   def inspect
     self.to_inspect_hash
   end
-  
+
   def remove_pictures
     self["APIC"] = ""
     self["PIC"]  = ""
@@ -362,7 +355,7 @@ class ID3v2 < DelegateClass(Hash)
     raise(ID3v2Error, "can't find version_maj ('#{version_maj}')") unless [2, 3, 4].include?(version_maj)
     @version_maj, @version_min = version_maj, version_min
     @tag_length = @io.get_syncsafe
-    
+
     @parsed = true
     begin
       case @version_maj
@@ -409,9 +402,7 @@ class ID3v2 < DelegateClass(Hash)
         tag << k[0,4]   #4 characte max for a tag's key
         #tag << to_syncsafe(data.size) #+1 because of the language encoding byte
         size = data.size
-        unless RUBY_1_8
-          size = data.dup.force_encoding("binary").size
-        end
+        size = data.dup.force_encoding("binary").size
         tag << [size].pack("N") #+1 because of the language encoding byte
         tag << "\x00"*2 #flags
         tag << data
@@ -442,9 +433,8 @@ class ID3v2 < DelegateClass(Hash)
       s = [ 1, @options[:lang], "\xFE\xFF\x00\x00", transcoded_value].pack("ca3a*a*")
       return s
     when /^T/
-      unless RUBY_1_8
-        transcoded_value.force_encoding("BINARY")
-      end
+      transcoded_value.force_encoding("BINARY")
+
 	return "\x01" + transcoded_value
       else
         return value
@@ -455,55 +445,55 @@ class ID3v2 < DelegateClass(Hash)
   def decode_tag(name, raw_value)
     puts("decode_tag(#{name.inspect}, #{raw_value.inspect})") if $DEBUG
     if name =~ /^(T|COM|USLT)/
-      if name =~ /^(COM|USLT)/
-        #FIXME improve this
-        encoding_index, lang, raw_tag = raw_value.unpack("ca3a*")
-        if encoding_index == 1
-=begin
-          comment = Mp3Info::EncodingHelper.decode_utf16(raw_tag)
-          e = comment.encoding
-          out = comment.force_encoding("BINARY").split("\x00\x00").last.force_encoding(e)
-          p out
-=end
-          comment = Mp3Info::EncodingHelper.decode_utf16(raw_tag)
-          split_val = RUBY_1_8 ? "\x00\x00" : "\x00".encode(comment.encoding).force_encoding('ASCII-8BIT')
-          out = raw_tag.split(split_val).last rescue ""
+      begin
+        if name =~ /^(COM|USLT)/
+          encoding_index, lang, raw_tag = raw_value.unpack("ca3a*")
+          if raw_tag == "\x00"
+            return nil
+          else
+            if encoding_index == 1
+              split_str = /\x00\x00\x00?/
+            else
+              split_str = "\x00"
+            end
+            head, tail = raw_tag.split(split_str)
+            if head == "\xFF\xFE".force_encoding('binary')
+              rgx = Regexp.new("^\xFF\xFE\x00\x00".force_encoding("BINARY"))
+              out = raw_tag.sub(rgx, '')
+            elsif tail
+              out = tail
+            elsif head
+              out = head
+            else
+              warn("warning: cannot decode tag #{name} with raw value #{raw_value.inspect}")
+              return nil
+            end
+          end
+          puts "COM tag found. encoding: #{encoding_index} lang: #{lang} str: #{out.inspect}" if $DEBUG
         else
-          comment, out = raw_tag.split("\x00", 2)
+          encoding_index = raw_value.getbyte(0) # language encoding (see TEXT_ENCODINGS constant)
+          out = raw_value[1..-1]
         end
-        puts "COM tag found. encoding: #{encoding_index} lang: #{lang} str: #{out.inspect}" if $DEBUG
-      else
-        encoding_index = raw_value.getbyte(0) # language encoding (see TEXT_ENCODINGS constant)
-        out = raw_value[1..-1]
-      end
-      # we need to convert the string in order to match
-      # the requested encoding
-      if encoding_index && TEXT_ENCODINGS[encoding_index] && out
-        if RUBY_1_8
-          out = Mp3Info::EncodingHelper.convert_to(out, TEXT_ENCODINGS[encoding_index], "utf-8")
-        else
+        # we need to convert the string in order to match
+        # the requested encoding
+        if TEXT_ENCODINGS[encoding_index]
           if encoding_index == 1
             out = Mp3Info::EncodingHelper.decode_utf16(out)
           else
             out.force_encoding(TEXT_ENCODINGS[encoding_index])
           end
-          if out
-            out.encode!("utf-8")
-          end
+          out.encode!("utf-8")
         end
-      end
 
-      if out
         # remove padding zeros for textual tags
-        if RUBY_1_8
-          r = /\0*$/
-        else
-          r = Regexp.new("\x00*$".encode(out.encoding))
-        end
-        out.sub!(r, '') 
-      end
+        r = Regexp.new("\x00*$".encode(out.encoding))
+        out.sub!(r, '')
 
-      return out
+        return out
+      rescue => e
+        warn "warning: cannot decode tag #{name} with raw value #{raw_value.inspect}: #{e}"
+        return nil
+      end
     else
       return raw_value
     end
@@ -518,7 +508,7 @@ class ID3v2 < DelegateClass(Hash)
         @io.seek(-4, IO::SEEK_CUR)    # 1. find a padding zero,
 	seek_to_v2_end
         break
-      else               
+      else
 	if @version_maj == 4
 	  size = @io.get_syncsafe
 	else
@@ -530,7 +520,7 @@ class ID3v2 < DelegateClass(Hash)
       end
       break if @io.pos >= @tag_length # 2. reach length from header
     end
-  end    
+  end
 
   ### reads id3 ver 2.2.x frames and adds the contents to @tag2 hash
   ### NOTE: the id3v2 header does not take padding zero's into consideration
@@ -547,8 +537,8 @@ class ID3v2 < DelegateClass(Hash)
         break if @io.pos >= @tag_length
       end
     end
-  end    
-  
+  end
+
   ### Add data to tag2["name"]
   ### read lang_encoding, decode data if unicode and
   ### create an array if the key already exists in the tag
@@ -558,11 +548,11 @@ class ID3v2 < DelegateClass(Hash)
     if size > 50_000_000
       raise ID3v2Error, "tag size is > 50_000_000"
     end
-      
+
     data_io = @io.read(size)
     data = decode_tag(name, data_io)
     if data && !data.empty?
-      if self.keys.include?(name) 
+      if self.keys.include?(name)
         if self[name].is_a?(Array)
           unless self[name].include?(data)
             self[name] << data
@@ -571,7 +561,7 @@ class ID3v2 < DelegateClass(Hash)
           self[name] = [ self[name], data ]
         end
       else
-        self[name] = data 
+        self[name] = data
       end
 
       if name == "TPOS" && data =~ /(\d+)\s*\/\s*(\d+)/
@@ -582,7 +572,7 @@ class ID3v2 < DelegateClass(Hash)
 
     puts "self[#{name.inspect}] = #{self[name].inspect}" if $DEBUG
   end
-  
+
   ### runs thru @file one char at a time looking for best guess of first MPEG
   ###  frame, which should be first 0xff byte after id3v2 padding zero's
   def seek_to_v2_end
@@ -591,12 +581,12 @@ class ID3v2 < DelegateClass(Hash)
     end
     @io.seek(-1, IO::SEEK_CUR)
   end
-  
+
   ### convert an 32 integer to a syncsafe string
   def to_syncsafe(num)
     ( (num<<3) & 0x7f000000 )  + ( (num<<2) & 0x7f0000 ) + ( (num<<1) & 0x7f00 ) + ( num & 0x7f )
   end
-  
+
   ### this is especially useful for printing out APIC data because
   ### only the header of the APIC tag is of interest
   def pretty_header(str, chars=128)
@@ -604,4 +594,3 @@ class ID3v2 < DelegateClass(Hash)
   end
 
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mp3info
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Guillaume Pierronnet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.15'
 description: ruby-mp3info read low-level informations and manipulate tags on mp3 files.
 email:
 - guillaume.pierronnet@gmail.com
@@ -48,7 +48,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
-- ".gemtest"
 - History.txt
 - Manifest.txt
 - README.md
@@ -80,9 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ruby-mp3info read low-level informations and manipulate tags on mp3 files.
-test_files:
-- test/test_ruby-mp3info.rb
+test_files: []