mp3file 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe6010e6463c0bfe01c34dcc53081a9cd3ff0dd7
-  data.tar.gz: 88bcc7293fd8702980fb2344ef8d6e50457e7441
+  metadata.gz: 0bfcaa237ab4362c6e5ff6267f84c6becd95aab3
+  data.tar.gz: 3d86a90044fbf1ed37cf558a660e464993f71ec8
 SHA512:
-  metadata.gz: b37617a0dabcc81bd28b4b1ee5c09bd472270792737fdc5298d20970063236a4afc635344a69730665085d518c0d8d42cfaefb211eb1dc73a20a5395301e1447
-  data.tar.gz: 76330c2fc6d7654a634732f88652d46309dbefd5a92ad354e7dcc9dc9595e4017d6f014314852d754fbcf28b321577184e173205f90ec7e77fbac1f94aec443d
+  metadata.gz: 13e2cf72a0f6db63c9676d3a78eeed4345bd01e9cfb7487d1b24a864cf9ff35c9a4c945bf3890c97c269efb13ef0125177ee89902d2b5f8eb94f5c798faf36c2
+  data.tar.gz: e483622cdc9d209500c82809fb619f19e8ef0caa454c3ff209923d66438568b173c0d39cbe67c2852d16650f2b690b7b23b0c5b61a7e1d81c95bd4190fe1b16a

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*
 *.gem
 .bundle
 .DS_Store
+/Gemfile.lock

data/bin/mp3info

@@ -3,21 +3,33 @@
 $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mp3file'
 
+def humanize(num, places = 2)
+  if num.is_a?(Float)
+    parts = ("%.#{places}f" % [ num ]).split(".")
+  else
+    parts = num.to_s.to_str.split(".")
+  end
+
+  parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,")
+  parts.join(".")
+end
+alias :h :humanize
+
 ARGV.each do |file|
   begin
-    mp3 = Mp3file::MP3File.new(file)
+    mp3 = Mp3file::MP3File.new(file, scan_all_headers: true)
 
     puts("File: #{mp3.file.path}")
-    puts("    Size: #{mp3.file_size} bytes Audio_size: #{mp3.audio_size} bytes")
+    puts("    Size: #{h(mp3.file_size)} bytes Audio_size: #{h(mp3.audio_size)} bytes")
     puts("    #{mp3.mpeg_version} #{mp3.layer}")
-    puts("    Bitrate: #{mp3.bitrate} kbps Samplerate: #{mp3.samplerate} Hz Mode: #{mp3.mode}")
-    puts("    Duration: #{mp3.length} s")
-    puts("    Frames: #{mp3.num_frames} Samples: #{mp3.total_samples}")
+    puts("    Bitrate: #{h(mp3.bitrate)} kbits/sec (vbr? #{mp3.vbr?.to_s}) Samplerate: #{mp3.samplerate} Hz Mode: #{mp3.mode}")
+    puts("    Duration: #{h(mp3.length)} s")
+    puts("    Frames: #{h(mp3.num_frames)} Samples: #{h(mp3.total_samples)}")
 
     header = mp3.first_header
-    puts("    First MPEG frame at #{mp3.first_header_offset} bytes:")
+    puts("    First MPEG frame at #{h(mp3.first_header_offset)} bytes:")
     puts("        #{header.version} #{header.layer}")
-    puts("        Bitrate: #{header.bitrate} bps Samplerate: #{header.samplerate} Hz")
+    puts("        Bitrate: #{header.bitrate} bps Samplerate: #{h(header.samplerate)} Hz")
     puts("        Mode: #{header.mode} Mode Extension: #{header.mode_extension} Emphasis: #{header.emphasis}")
     puts("        CRC: #{header.has_crc} Padding: #{header.has_padding}")
     puts("        Copyright: #{header.copyright} Original: #{header.original}")
@@ -26,7 +38,7 @@ ARGV.each do |file|
     if mp3.xing_header
       xing = mp3.xing_header
       puts("    Xing header:")
-      puts("        Frames: #{xing.frames} Bytes: #{xing.bytes} Quality: #{xing.quality} TOC: #{xing.toc ? 'present' : 'not present'}")
+      puts("        Frames: #{h(xing.frames)} Bytes: #{h(xing.bytes)} Quality: #{xing.quality} TOC: #{xing.toc ? 'present' : 'not present'}")
     end
 
     if mp3.vbri_header
@@ -47,13 +59,13 @@ ARGV.each do |file|
     if mp3.id3v2tag?
       tag = mp3.id3v2_tag
       puts("    ID3v2 tag:")
-      puts("        Size: #{tag.size} bytes")
+      puts("        Size: #{h(tag.size)} bytes")
       puts("        Version: #{tag.version.inspect}")
-      puts("        Unused byes: #{tag.unused_bytes.inspect}")
+      puts("        Unused byes: #{h(tag.unused_bytes)}")
       if !tag.frames.empty?
         puts("        Frames:")
         tag.frames.each do |frame|
-          puts("            ID: #{frame.frame_id.inspect} size: #{frame.frame_size}")
+          puts("            ID: #{frame.frame_id.inspect} size: #{h(frame.frame_size)}")
         end
       end
     end
@@ -63,11 +75,11 @@ ARGV.each do |file|
       puts("        Offset: #{offset} bytes")
       puts("        Size: #{tag2.size} bytes")
       puts("        Version: #{tag2.version.inspect}")
-      puts("        Unused byes: #{tag2.unused_bytes.inspect}")
+      puts("        Unused byes: #{h(tag2.unused_bytes)}")
       if !tag2.frames.empty?
         puts("        Frames:")
         tag2.frames.each do |frame|
-          puts("            ID: #{frame.frame_id.inspect} size: #{frame.frame_size}")
+          puts("            ID: #{frame.frame_id.inspect} size: #{h(frame.frame_size)}")
         end
       end
     end

data/lib/mp3file/id3v2/frame_header.rb

@@ -61,6 +61,7 @@ module Mp3file::ID3v2
         if @tag.version >= ID3V2_2_0 && @tag.version < ID3V2_3_0
           header = ID3v220FrameHeaderFormat.read(io)
           @header_size = 6
+          @frame_size = header.frame_size
         elsif @tag.version >= ID3V2_3_0 && @tag.version < ID3V2_4_0
           header = ID3v230FrameHeaderFormat.read(io)
           @header_size = 10
@@ -75,16 +76,17 @@ module Mp3file::ID3v2
           if header.has_group == 1
             @group = header.group_id
           end
+          @frame_size = header.frame_size
         elsif @tag.version >= ID3V2_4_0
           header = ID3v240FrameHeaderFormat.read(io)
           @header_size = 10
+          @frame_size = BitPaddedInt.unpad_number(header.frame_size)
         end
       rescue BinData::ValidityError => ve
         raise InvalidID3v2TagError, ve.message
       end
 
       @frame_id = header.frame_id
-      @frame_size = BitPaddedInt.unpad_number(header.frame_size)
       @size = @header_size + @frame_size
     end
   end

data/lib/mp3file/id3v2/tag.rb

@@ -25,11 +25,14 @@ module Mp3file::ID3v2
       data.force_encoding("ASCII-8BIT")
       offset = 0
 
-      frame_offset, frame = get_next_frame_header(data, offset)
-      while frame
-        @frames << frame
-        offset = frame_offset + frame.size
+      loop do
         frame_offset, frame = get_next_frame_header(data, offset)
+        if frame
+          @frames << frame
+          offset = frame_offset + frame.size
+        else
+          break
+        end
       end
     end
 

data/lib/mp3file/mp3_file.rb

@@ -11,9 +11,9 @@ module Mp3file
 
     attr_accessor(:id3v1_tag, :id3v2_tag, :extra_id3v2_tags)
 
-    def initialize(file_path)
+    def initialize(file_path, options = {})
       file_path = Pathname.new(file_path).expand_path if file_path.is_a?(String)
-      load_file(file_path)
+      load_file(file_path, options)
     end
 
     def vbr?
@@ -82,7 +82,9 @@ module Mp3file
       end
     end
 
-    def load_file(file_path)
+    def load_file(file_path, options = {})
+      scan_all_headers = %w{ t true 1 }.include?(options[:scan_all_headers].to_s)
+
       @file = file_path.open('rb')
       @file.seek(0, IO::SEEK_END)
       @file_size = @file.tell
@@ -150,8 +152,8 @@ module Mp3file
       if @id3v1_tag
         @audio_size -= 128
       end
-      if @id3v2_header
-        @audio_size -= (@id3v2_header.tag_size + 10)
+      if @id3v2_tag
+        @audio_size -= @id3v2_tag.size
       end
 
       # If it's VBR, there should be an Xing header after the
@@ -164,22 +166,43 @@ module Mp3file
         @file.seek(@first_header_offset + 4, IO::SEEK_CUR)
       end
 
-      if @xing_header
-        @vbr = true
-        # Do the VBR length calculation.  What to do if we don't have
-        # both of these pieces of information?
-        if @xing_header.frames && @xing_header.bytes
-          @num_frames = @xing_header.frames
-          @total_samples = @xing_header.frames * @first_header.samples
-          @length = total_samples.to_f / @samplerate.to_f
-          @bitrate = ((@xing_header.bytes.to_f / @length.to_f) * 8 / 1000).to_i
+      if scan_all_headers
+        # Loop through all the frame headers, to check for VBR / CBR (as
+        # a Xing header can show up in either case).
+        frame_headers = [ @first_header ]
+        last_header_offset = @first_header_offset
+        loop do
+          file.seek(last_header_offset + frame_headers.last.frame_size)
+          last_header_offset, header = get_next_header(file)
+          if header.nil?
+            break
+          else
+            frame_headers << header
+          end
+        end
+
+        uniq_brs = frame_headers.map { |h| h.bitrate }.uniq
+        @vbr = uniq_brs.size > 1
+        if uniq_brs.size == 1
+          @bitrate = uniq_brs.first / 1000
         end
+      else
+        # Use the Xing header to make the VBR / CBR call. Assume that
+        # Xing headers, when present in a CBR file, are called "Info".
+        @vbr = @xing_header.nil? || @xing_header.name == "Xing"
+      end
+
+      if @xing_header && @xing_header.frames && @xing_header.bytes
+        # Use the Xing header to calculate the duration (and overall bitrate).
+        @num_frames = @xing_header.frames
+        @total_samples = @xing_header.frames * @first_header.samples
+        @length = total_samples.to_f / @samplerate.to_f
+        @bitrate = ((@xing_header.bytes.to_f / @length.to_f) * 8 / 1000)
       else
         # Do the CBR length calculation.
-        @vbr = false
         @num_frames = @audio_size / @first_header.frame_size
         @total_samples = @num_frames * @first_header.samples
-        @length = @total_samples / @samplerate
+        @length = @total_samples.to_f / @samplerate.to_f
       end
 
       @file.close
@@ -206,6 +229,8 @@ module Mp3file
             file.seek(header_offset, IO::SEEK_SET)
             retry
           end
+        rescue EOFError
+          break
         end
 
         # byte = file.readbyte
@@ -226,6 +251,10 @@ module Mp3file
         # end
       end
 
+      # if initial_header_offset != header_offset
+      #   puts "Had to skip past #{header_offset - initial_header_offset} to find the next header."
+      # end
+
       [ header_offset, header ]
     end
   end

data/lib/mp3file/version.rb

@@ -1,3 +1,3 @@
 module Mp3file
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/lib/mp3file/xing_header.rb

@@ -2,7 +2,7 @@ module Mp3file
   class InvalidXingHeaderError < Mp3fileError; end
 
   class XingHeader
-    attr_reader(:frames, :bytes, :toc, :quality)
+    attr_reader(:name, :frames, :bytes, :toc, :quality)
 
     class XingHeaderFormat < BinData::Record
       string(:vbr_id, :length => 4, :check_value => lambda { value == 'Xing' || value == 'Info' })
@@ -30,6 +30,7 @@ module Mp3file
         raise InvalidXingHeaderError, ve.message
       end
 
+      @name = head.vbr_id
       @frames = head.frames if head.frames_present == 1
       @bytes = head.bytes if head.bytes_present == 1
       @toc = head.toc.dup if head.toc_present == 1

data/mp3file.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rspec')
   s.add_development_dependency('rake')
+  s.add_development_dependency('pry')
+
   s.add_dependency('bindata', '~> 1.5.0')
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mp3file
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Watts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bindata
   requirement: !ruby/object:Gem::Requirement
@@ -65,7 +79,6 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/mp3info

data/Gemfile.lock

@@ -1,29 +0,0 @@
-PATH
-  remote: .
-  specs:
-    mp3file (1.0.3)
-      bindata (~> 1.5.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    bindata (1.5.1)
-    diff-lcs (1.1.2)
-    rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-
-PLATFORMS
-  ruby
-  x86-mingw32
-
-DEPENDENCIES
-  mp3file!
-  rake
-  rspec