ruby-mp3info 0.6.8 → 0.6.9

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.6.9 / 2008-09-16
+
+* now correctly remove trailing whitespaces form tag1 values
+* bugfix #21687 included: 'tweaked the MP3 frame synch code to parse certain mp3 files'
+
 === 0.6.8 / 2008-08-20
 
 * support for MPEG 2.5 (thanks to Oleguer Huguet Ibars)

data/lib/mp3info.rb

@@ -1,5 +1,5 @@
 # coding:utf-8
-# $Id: mp3info.rb 94 2008-08-19 13:34:18Z moumar $
+# $Id: mp3info.rb 98 2008-09-16 11:07:31Z moumar $
 # License:: Ruby
 # Author:: Guillaume Pierronnet (mailto:moumar_AT__rubyforge_DOT_org)
 # Website:: http://ruby-mp3info.rubyforge.org/
@@ -18,7 +18,7 @@ end
 
 class Mp3Info
 
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = {
@@ -333,16 +333,18 @@ class Mp3Info
 
   def get_frames_infos(head)
     # be sure we are in sync
-    if (head & 0xffe00000 != 0xffe00000)    || # 11 bit MPEG frame sync
-       (head & 0x00060000 == 0x00060000)    || #  2 bit layer type
-       (head & 0x0000f000 == 0x0000f000)    || #  4 bit bitrate
-       (head & 0x0000f000 == 0x00000000)    || #        free format bitstream
-       (head & 0x00000c00 == 0x00000c00)    || #  2 bit frequency
-       (head & 0xffff0000 == 0xfffe0000) 
+    if ((head & 0xffe00000) != 0xffe00000)    || # 11 bit MPEG frame sync
+       ((head & 0x00060000) == 0x00060000)    || #  2 bit layer type
+       ((head & 0x0000f000) == 0x0000f000)    || #  4 bit bitrate
+       ((head & 0x0000f000) == 0x00000000)    || #        free format bitstream
+       ((head & 0x00000c00) == 0x00000c00)    || #  2 bit frequency
+       ((head & 0xffff0000) == 0xfffe0000) 
       raise Mp3InfoInternalError 
     end
     mpeg_version = [2.5, nil, 2, 1][bits(head, 20,19)]
+    
     layer = LAYER[bits(head, 18,17)]
+    raise Mp3InfoInternalError if layer == nil || mpeg_version == nil
     { :layer => layer,
       :bitrate => BITRATE[mpeg_version][layer-1][bits(head, 15,12)-1],
       :samplerate => SAMPLERATE[mpeg_version][bits(head, 11,10)],
@@ -548,9 +550,9 @@ private
   ### assumes @file is pointing to char after "TAG" id
   def gettag1
     @tag1_parsed = true
-    @tag1["title"] = @file.read(30).sub(/\0*$/, '')
-    @tag1["artist"] = @file.read(30).sub(/\0*$/, '')
-    @tag1["album"] = @file.read(30).sub(/\0*$/, '')
+    @tag1["title"] = @file.read(30).unpack("A*").first
+    @tag1["artist"] = @file.read(30).unpack("A*").first
+    @tag1["album"] = @file.read(30).unpack("A*").first
     year_t = @file.read(4).to_i
     @tag1["year"] = year_t unless year_t == 0
     comments = @file.read(30)
@@ -558,7 +560,7 @@ private
       @tag1["tracknum"] = comments.getbyte(-1).to_i
       comments.chop! #remove the last char
     end
-    @tag1["comments"] = comments.sub(/\0*$/, '')
+    @tag1["comments"] = comments.unpack("A*").first
     @tag1["genre"] = @file.getbyte
     @tag1["genre_s"] = GENRES[@tag1["genre"]] || ""
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mp3info
 version: !ruby/object:Gem::Version 
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors: 
 - Guillaume Pierronnet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-20 00:00:00 +02:00
+date: 2008-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency