mp3file 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdcc2442876710b6da53f59179d328091eced9a5
-  data.tar.gz: af34504fee2f1e9ace71b702b17dc8e2074d8055
+  metadata.gz: da11954d17d2192242abc2017940101590ad797b
+  data.tar.gz: 0018b0f2fabb9aa7582722aaf3c8a1985a004479
 SHA512:
-  metadata.gz: c51ba93dcbd12cf6565a038be1ba2925717446d53e99bb4615083bb414e50d3fbd1925dbe2ab4e35d4acbd7d99ffc229e7beed2dc11eb10001c5c3e5c37361fd
-  data.tar.gz: d4c6da6e050d7899d62a0a6db55f577c8f5f0b0b0bae236a3669d7673cc226e639b7dd7d52e0806f4b20ea347f4a0df5fab349a48c86ea9351c76a24cd249b9e
+  metadata.gz: a0e6fe9ae807f7981faf6332de40a7791666823bd9d55e94ebf2dbf89e16b3cb60dcefb46d603fe17b81fac974247887b379b4972ad8c76683f00c3c6a766246
+  data.tar.gz: f9e290a4928af6d4de7c68e82aa16913513745cc11c4157549289b3534b9b89e5737447d267abee81aacdeb0d3883a27eb5c3ec166f458d2a1cc603f5392d8e1

data/lib/mp3file/mp3_file.rb

@@ -116,6 +116,10 @@ module Mp3file
         @file.seek(@id3v2_tag.size, IO::SEEK_SET)
       end
 
+      # Count how many bytes we had to skip while searching for a
+      # frame.
+      @skipped_bytes = 0
+
       # Some files have more than one ID3v2 tag. If we can't find an
       # MP3 header in the next 4k, try reading another ID3v2 tag and
       # repeat.
@@ -124,20 +128,28 @@ module Mp3file
         # Try to find the first MP3 header.
         @first_header_offset, @first_header = get_next_header(@file)
       rescue InvalidMP3FileError
-        end_of_tags = @id3v2_tag.size + @extra_id3v2_tags.map(&:last).map(&:size).reduce(:+).to_i
-        @file.seek(end_of_tags, IO::SEEK_SET)
+        if @id3v2_tag
+          end_of_tags = @id3v2_tag.size + @extra_id3v2_tags.map(&:last).map(&:size).reduce(:+).to_i
+          @file.seek(end_of_tags, IO::SEEK_SET)
 
-        tag = nil
-        begin
-          tag = ID3v2::Tag.new(@file)
-        rescue ID3v2::InvalidID3v2TagError
           tag = nil
-          @file.seek(end_of_tags, IO::SEEK_SET)
-        end
+          begin
+            tag = ID3v2::Tag.new(@file)
+          rescue ID3v2::InvalidID3v2TagError
+            tag = nil
+            @file.seek(end_of_tags, IO::SEEK_SET)
+          end
 
-        if tag
-          @extra_id3v2_tags << [ end_of_tags, tag ]
-          retry
+          if tag
+            @extra_id3v2_tags << [ end_of_tags, tag ]
+
+            # Start the counter of skipped bytes over again, since we're
+            # starting the search for the first header over again.
+            @skipped_bytes = 0
+            retry
+          else
+            raise
+          end
         else
           raise
         end
@@ -251,8 +263,13 @@ module Mp3file
         # end
       end
 
+      @skipped_bytes += header_offset - initial_header_offset
+      if @skipped_bytes > 2048
+        raise InvalidMP3FileError, "Had to skip > 2048 bytes in between headers."
+      end
+
       # if initial_header_offset != header_offset
-      #   puts "Had to skip past #{header_offset - initial_header_offset} to find the next header."
+      #   puts "Had to skip past #{header_offset - initial_header_offset} to find the next header. header_offset = #{header_offset} header = #{header.inspect}"
       # end
 
       [ header_offset, header ]

data/lib/mp3file/version.rb

@@ -1,3 +1,3 @@
 module Mp3file
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mp3file
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Andrew Watts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec