wahwah 1.0.0 → 1.3.0

data/lib/wahwah/id3/v2.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'forwardable'
-
 module WahWah
   module ID3
     class V2 < Tag
@@ -14,47 +12,56 @@ module WahWah
       end
 
       private
-        def parse
-          @file_io.rewind
-          @header = V2Header.new(@file_io)
 
-          return unless valid?
+      def parse
+        @file_io.rewind
+        @header = V2Header.new(@file_io)
 
-          until end_of_tag? do
-            frame = ID3::Frame.new(@file_io, major_version)
-            next unless frame.valid?
+        return unless valid?
 
-            update_attribute(frame)
-          end
-        end
+        until end_of_tag?
+          frame = ID3::Frame.new(@file_io, major_version)
 
-        def update_attribute(frame)
-          name = frame.name
-          value = frame.value
-
-          case name
-          when :comment
-            # Because there may be more than one comment frame in each tag,
-            # so push it into a array.
-            @comments.push(value)
-          when :image
-            # Because there may be more than one image frame in each tag,
-            # so push it into a array.
-            @images.push(value)
-          when :track, :disc
-            # Track and disc value may be extended with a "/" character
-            # and a numeric string containing the total numer.
-            count, total_count = value.split('/', 2)
-            instance_variable_set("@#{name}", count)
-            instance_variable_set("@#{name}_total", total_count) unless total_count.nil?
-          else
-            instance_variable_set("@#{name}", value)
+          unless frame.valid?
+            frame.skip
+            next
           end
+
+          update_attribute(frame)
         end
+      end
+
+      def update_attribute(frame)
+        name = frame.name
 
-        def end_of_tag?
-          size <= @file_io.pos || file_size <= @file_io.pos
+        case name
+        when :comment
+          # Because there may be more than one comment frame in each tag,
+          # so push it into a array.
+          @comments.push(frame.value)
+        when :image
+          # Because there may be more than one image frame in each tag,
+          # so push it into a array.
+          @images_data.push(frame)
+          frame.skip
+        when :track, :disc
+          # Track and disc value may be extended with a "/" character
+          # and a numeric string containing the total numer.
+          count, total_count = frame.value.split("/", 2)
+          instance_variable_set("@#{name}", count)
+          instance_variable_set("@#{name}_total", total_count) unless total_count.nil?
+        else
+          instance_variable_set("@#{name}", frame.value)
         end
+      end
+
+      def end_of_tag?
+        size <= @file_io.pos || file_size <= @file_io.pos
+      end
+
+      def parse_image_data(image_frame)
+        image_frame.value
+      end
     end
   end
 end

data/lib/wahwah/id3/v2_header.rb

@@ -10,9 +10,9 @@ module WahWah
     # ID3v2 flags             %abc00000
     # ID3v2 size              4 * %0xxxxxxx
     class V2Header
-      TAG_ID = 'ID3'
+      TAG_ID = "ID3"
       HEADER_SIZE = 10
-      HEADER_FORMAT = 'A3CxB8B*'
+      HEADER_FORMAT = "A3CxB8B*"
 
       attr_reader :major_version, :size
 
@@ -34,7 +34,7 @@ module WahWah
           # Size of padding        $xx xx xx xx
 
           # Skip extended_header
-          extended_header_size = Helper.id3_size_caculate(file_io.read(4).unpack('B32').first)
+          extended_header_size = Helper.id3_size_caculate(file_io.read(4).unpack1("B32"))
           file_io.seek(extended_header_size - 4, IO::SEEK_CUR)
         end
       end
@@ -46,7 +46,7 @@ module WahWah
       # The second bit in flags byte indicates whether or not the header
       # is followed by an extended header.
       def has_extended_header?
-        @flags[1] == '1'
+        @flags[1] == "1"
       end
     end
   end

data/lib/wahwah/lazy_read.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module WahWah
+  module LazyRead
+    def self.prepended(base)
+      base.class_eval do
+        attr_reader :size
+      end
+    end
+
+    def initialize(file_io, *arg)
+      @file_io = file_io
+      super(*arg)
+      @position = @file_io.pos
+      @data = get_data if @file_io.is_a?(StringIO)
+    end
+
+    def data
+      if @file_io.closed? && @file_io.is_a?(File)
+        @file_io = File.open(@file_io.path)
+        @data = get_data
+        @file_io.close
+      end
+
+      @data ||= get_data
+    end
+
+    def skip
+      @file_io.seek(@position)
+      @file_io.seek(size, IO::SEEK_CUR)
+    end
+
+    private
+
+    def get_data
+      @file_io.seek(@position)
+      @file_io.read(size)
+    end
+  end
+end

data/lib/wahwah/mp3/mpeg_frame_header.rb

@@ -46,41 +46,41 @@ module WahWah
       HEADER_SIZE = 4
 
       FRAME_BITRATE_INDEX = {
-        'MPEG1 layer1' => [0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0],
-        'MPEG1 layer2' => [0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 0],
-        'MPEG1 layer3' => [0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 0],
+        "MPEG1 layer1" => [0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0],
+        "MPEG1 layer2" => [0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 0],
+        "MPEG1 layer3" => [0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 0],
 
-        'MPEG2 layer1' => [0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, 0],
-        'MPEG2 layer2' => [0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0],
-        'MPEG2 layer3' => [0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0],
+        "MPEG2 layer1" => [0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, 0],
+        "MPEG2 layer2" => [0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0],
+        "MPEG2 layer3" => [0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0],
 
-        'MPEG2.5 layer1' => [0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, 0],
-        'MPEG2.5 layer2' => [0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0],
-        'MPEG2.5 layer3' => [0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0]
+        "MPEG2.5 layer1" => [0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, 0],
+        "MPEG2.5 layer2" => [0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0],
+        "MPEG2.5 layer3" => [0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0]
       }
 
-      VERSIONS_INDEX = ['MPEG2.5', nil, 'MPEG2', 'MPEG1']
-      LAYER_INDEX = [nil, 'layer3', 'layer2', 'layer1']
-      CHANNEL_MODE_INDEX = ['Stereo', 'Joint Stereo', 'Dual Channel', 'Single Channel']
+      VERSIONS_INDEX = ["MPEG2.5", nil, "MPEG2", "MPEG1"]
+      LAYER_INDEX = [nil, "layer3", "layer2", "layer1"]
+      CHANNEL_MODE_INDEX = ["Stereo", "Joint Stereo", "Dual Channel", "Single Channel"]
 
       SAMPLE_RATE_INDEX = {
-        'MPEG1' => [44100, 48000, 32000],
-        'MPEG2' => [22050, 24000, 16000],
-        'MPEG2.5' => [11025, 12000, 8000]
+        "MPEG1" => [44100, 48000, 32000],
+        "MPEG2" => [22050, 24000, 16000],
+        "MPEG2.5" => [11025, 12000, 8000]
       }
 
       SAMPLES_PER_FRAME_INDEX = {
-        'MPEG1 layer1' => 384,
-        'MPEG1 layer2' => 1152,
-        'MPEG1 layer3' => 1152,
+        "MPEG1 layer1" => 384,
+        "MPEG1 layer2" => 1152,
+        "MPEG1 layer3" => 1152,
 
-        'MPEG2 layer1' => 384,
-        'MPEG2 layer2' => 1152,
-        'MPEG2 layer3' => 576,
+        "MPEG2 layer1" => 384,
+        "MPEG2 layer2" => 1152,
+        "MPEG2 layer3" => 576,
 
-        'MPEG2.5 layer1' => 384,
-        'MPEG2.5 layer2' => 1152,
-        'MPEG2.5 layer3' => 576
+        "MPEG2.5 layer1" => 384,
+        "MPEG2.5 layer2" => 1152,
+        "MPEG2.5 layer3" => 576
       }
 
       attr_reader :version, :layer, :frame_bitrate, :channel_mode, :sample_rate
@@ -95,13 +95,14 @@ module WahWah
           break if file_io.eof?
 
           header = file_io.read(HEADER_SIZE)
-          sync_bits = header.unpack('B11').first
+          sync_bits = header.unpack1("B11")
 
-          if sync_bits == "#{'1' * 11}".b
-            @header = header.unpack('B*').first
+          if sync_bits == ("1" * 11).b
+            @header = header.unpack1("B*")
             @position = offset
 
-            parse; break
+            parse
+            break
           end
 
           offset += 1
@@ -127,15 +128,16 @@ module WahWah
       end
 
       private
-        def parse
-          return unless valid?
-
-          @version = VERSIONS_INDEX[@header[11..12].to_i(2)]
-          @layer = LAYER_INDEX[@header[13..14].to_i(2)]
-          @frame_bitrate = FRAME_BITRATE_INDEX[kind]&.fetch(@header[16..19].to_i(2))
-          @channel_mode = CHANNEL_MODE_INDEX[@header[24..25].to_i(2)]
-          @sample_rate = SAMPLE_RATE_INDEX[@version]&.fetch(@header[20..21].to_i(2))
-        end
+
+      def parse
+        return unless valid?
+
+        @version = VERSIONS_INDEX[@header[11..12].to_i(2)]
+        @layer = LAYER_INDEX[@header[13..14].to_i(2)]
+        @frame_bitrate = FRAME_BITRATE_INDEX[kind]&.fetch(@header[16..19].to_i(2))
+        @channel_mode = CHANNEL_MODE_INDEX[@header[24..25].to_i(2)]
+        @sample_rate = SAMPLE_RATE_INDEX[@version]&.fetch(@header[20..21].to_i(2))
+      end
     end
   end
 end

data/lib/wahwah/mp3/vbri_header.rb

@@ -30,7 +30,7 @@ module WahWah
     #                       you can calculate the length of this field.
     class VbriHeader
       HEADER_SIZE = 32
-      HEADER_FORMAT = 'A4x6NN'
+      HEADER_FORMAT = "A4x6NN"
 
       attr_reader :frames_count, :bytes_count
 
@@ -40,7 +40,7 @@ module WahWah
       end
 
       def valid?
-        @id == 'VBRI'
+        @id == "VBRI"
       end
     end
   end

data/lib/wahwah/mp3/xing_header.rb

@@ -30,15 +30,15 @@ module WahWah
       def initialize(file_io, offset = 0)
         file_io.seek(offset)
 
-        @id, @flags = file_io.read(8)&.unpack('A4N')
+        @id, @flags = file_io.read(8)&.unpack("A4N")
         return unless valid?
 
-        @frames_count = @flags & 1 == 1 ? file_io.read(4).unpack('N').first : 0
-        @bytes_count = @flags & 2 == 2 ? file_io.read(4).unpack('N').first : 0
+        @frames_count = @flags & 1 == 1 ? file_io.read(4).unpack1("N") : 0
+        @bytes_count = @flags & 2 == 2 ? file_io.read(4).unpack1("N") : 0
       end
 
       def valid?
-        %w(Xing Info).include? @id
+        %w[Xing Info].include? @id
       end
     end
   end

data/lib/wahwah/mp3_tag.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'forwardable'
-
 module WahWah
   class Mp3Tag < Tag
     extend TagDelegate
@@ -40,71 +38,74 @@ module WahWah
     end
 
     def is_vbr?
-      xing_header.valid? || vbri_header.valid?
+      mpeg_frame_header.valid? && (xing_header.valid? || vbri_header.valid?)
     end
 
     private
-      def parse
-        @id3_tag = parse_id3_tag
-        parse_duration if mpeg_frame_header.valid?
-      end
 
-      def parse_id3_tag
-        id3_v1_tag = ID3::V1.new(@file_io)
-        id3_v2_tag = ID3::V2.new(@file_io)
+    def parse
+      @id3_tag = parse_id3_tag
+      parse_duration if mpeg_frame_header.valid?
+    end
 
-        return id3_v2_tag if id3_v2_tag.valid?
-        id3_v1_tag if id3_v1_tag.valid?
-      end
+    def parse_id3_tag
+      id3_v1_tag = ID3::V1.new(@file_io.dup)
+      id3_v2_tag = ID3::V2.new(@file_io.dup)
 
-      def parse_duration
-        if is_vbr?
-          @duration = (frames_count * (mpeg_frame_header.samples_per_frame / sample_rate.to_f)).round
-          @bitrate = bytes_count * 8 / @duration / 1000 unless @duration.zero?
-        else
-          @bitrate = mpeg_frame_header.frame_bitrate
-          @duration = (file_size - (@id3_tag&.size || 0)) * 8 / (@bitrate * 1000) unless @bitrate.zero?
-        end
-      end
+      return id3_v2_tag if id3_v2_tag.valid?
+      id3_v1_tag if id3_v1_tag.valid?
+    end
 
-      def mpeg_frame_header
-        # Because id3v2 tag on the file header so skip id3v2 tag
-        @mpeg_frame_header ||= Mp3::MpegFrameHeader.new(@file_io, id3v2? ? @id3_tag&.size : 0)
+    def parse_duration
+      if is_vbr?
+        @duration = frames_count * (mpeg_frame_header.samples_per_frame / sample_rate.to_f)
+        @bitrate = (bytes_count * 8 / @duration / 1000).round unless @duration.zero?
+      else
+        @bitrate = mpeg_frame_header.frame_bitrate
+        @duration = (file_size - (@id3_tag&.size || 0)) * 8 / (@bitrate * 1000).to_f unless @bitrate.zero?
       end
+    end
 
-      def xing_header
-        @xing_header ||= Mp3::XingHeader.new(@file_io, xing_header_offset)
-      end
+    def mpeg_frame_header
+      # Because id3v2 tag on the file header so skip id3v2 tag
+      @mpeg_frame_header ||= Mp3::MpegFrameHeader.new(@file_io, id3v2? ? @id3_tag&.size : 0)
+    end
 
-      def vbri_header
-        @vbri_header ||= Mp3::VbriHeader.new(@file_io, vbri_header_offset)
-      end
+    def xing_header
+      @xing_header ||= Mp3::XingHeader.new(@file_io, xing_header_offset)
+    end
 
-      def xing_header_offset
-        mpeg_frame_header_position = mpeg_frame_header.position
-        mpeg_frame_header_size = Mp3::MpegFrameHeader::HEADER_SIZE
-        mpeg_frame_side_info_size = mpeg_version == 'MPEG1' ?
-          (channel_mode == 'Single Channel' ? 17 : 32) :
-          (channel_mode == 'Single Channel' ? 9 : 17)
+    def vbri_header
+      @vbri_header ||= Mp3::VbriHeader.new(@file_io, vbri_header_offset)
+    end
 
-        mpeg_frame_header_position + mpeg_frame_header_size + mpeg_frame_side_info_size
+    def xing_header_offset
+      mpeg_frame_header_position = mpeg_frame_header.position
+      mpeg_frame_header_size = Mp3::MpegFrameHeader::HEADER_SIZE
+      mpeg_frame_side_info_size = if mpeg_version == "MPEG1"
+        channel_mode == "Single Channel" ? 17 : 32
+      else
+        channel_mode == "Single Channel" ? 9 : 17
       end
 
-      def vbri_header_offset
-        mpeg_frame_header_position = mpeg_frame_header.position
-        mpeg_frame_header_size = Mp3::MpegFrameHeader::HEADER_SIZE
+      mpeg_frame_header_position + mpeg_frame_header_size + mpeg_frame_side_info_size
+    end
 
-        mpeg_frame_header_position + mpeg_frame_header_size + 32
-      end
+    def vbri_header_offset
+      mpeg_frame_header_position = mpeg_frame_header.position
+      mpeg_frame_header_size = Mp3::MpegFrameHeader::HEADER_SIZE
 
-      def frames_count
-        return xing_header.frames_count if xing_header.valid?
-        vbri_header.frames_count if vbri_header.valid?
-      end
+      mpeg_frame_header_position + mpeg_frame_header_size + 32
+    end
 
-      def bytes_count
-        return xing_header.bytes_count if xing_header.valid?
-        vbri_header.bytes_count if vbri_header.valid?
-      end
+    def frames_count
+      return xing_header.frames_count if xing_header.valid?
+      vbri_header.frames_count if vbri_header.valid?
+    end
+
+    def bytes_count
+      return xing_header.bytes_count if xing_header.valid?
+      vbri_header.bytes_count if vbri_header.valid?
+    end
   end
 end

data/lib/wahwah/mp4/atom.rb

@@ -3,13 +3,15 @@
 module WahWah
   module Mp4
     class Atom
-      VERSIONED_ATOMS = %w(meta stsd)
-      FLAGGED_ATOMS = %w(stsd)
+      prepend LazyRead
+
+      VERSIONED_ATOMS = %w[meta stsd]
+      FLAGGED_ATOMS = %w[stsd]
       HEADER_SIZE = 8
       HEADER_SIZE_FIELD_SIZE = 4
       EXTENDED_HEADER_SIZE = 8
 
-      attr_reader :size, :type
+      attr_reader :type
 
       def self.find(file_io, *atom_path)
         file_io.rewind
@@ -20,14 +22,15 @@ module WahWah
           atom = new(file_io)
 
           next unless atom.valid?
-          file_io.seek(atom.size, IO::SEEK_CUR); next unless atom.type == atom_type
+          file_io.seek(atom.size, IO::SEEK_CUR)
+          next unless atom.type == atom_type
 
           return atom if atom_path.empty?
           return atom.find(*atom_path)
         end
 
         # Return empty atom if can not found
-        new(StringIO.new(''))
+        new(StringIO.new(""))
       end
 
       # An atom header consists of the following fields:
@@ -39,25 +42,18 @@ module WahWah
       # Type:
       # A 32-bit integer that contains the type of the atom.
       # This can often be usefully treated as a four-character field with a mnemonic value .
-      def initialize(file_io)
-        @size, @type = file_io.read(HEADER_SIZE)&.unpack('Na4')
+      def initialize
+        @size, @type = @file_io.read(HEADER_SIZE)&.unpack("Na4")
         return unless valid?
 
         # If the size field of an atom is set to 1, the type field is followed by a 64-bit extended size field,
         # which contains the actual size of the atom as a 64-bit unsigned integer.
-        @size = file_io.read(EXTENDED_HEADER_SIZE).unpack('Q>').first - EXTENDED_HEADER_SIZE if @size == 1
+        @size = @file_io.read(EXTENDED_HEADER_SIZE).unpack1("Q>") - EXTENDED_HEADER_SIZE if @size == 1
 
         # If the size field of an atom is set to 0, which is allowed only for a top-level atom,
         # designates the last atom in the file and indicates that the atom extends to the end of the file.
-        @size = file_io.size if @size == 0
-        @size = @size - HEADER_SIZE
-        @file_io = file_io
-        @position = file_io.pos
-      end
-
-      def data
-        @file_io.seek(@position)
-        @file_io.read(size)
+        @size = @file_io.size if @size == 0
+        @size -= HEADER_SIZE
       end
 
       def valid?
@@ -68,38 +64,38 @@ module WahWah
         child_atom_index = data.index(atom_path.first)
 
         # Return empty atom if can not found
-        return self.class.new(StringIO.new('')) if child_atom_index.nil?
+        return self.class.new(StringIO.new("")) if child_atom_index.nil?
 
         # Because before atom type field there are 4 bytes of size field,
         # So the child_atom_index should reduce 4.
-        self.class.find(StringIO.new(data[child_atom_index - HEADER_SIZE_FIELD_SIZE..-1]), *atom_path)
+        self.class.find(StringIO.new(data[child_atom_index - HEADER_SIZE_FIELD_SIZE..]), *atom_path)
       end
 
-
       def children
         @children ||= parse_children_atoms
       end
 
       private
-        def parse_children_atoms
-          children_atoms = []
-          atoms_data = data
 
-          # Some atoms data contain extra content before child atom data.
-          # So reduce those extra content to get child atom data.
-          atoms_data = atoms_data[4..-1] if VERSIONED_ATOMS.include? type # Skip 4 bytes for version
-          atoms_data = atoms_data[4..-1] if FLAGGED_ATOMS.include? type # Skip 4 bytes for flag
-          atoms_data_io = StringIO.new(atoms_data)
+      def parse_children_atoms
+        children_atoms = []
+        atoms_data = data
 
-          until atoms_data_io.eof?
-            atom = self.class.new(atoms_data_io)
-            children_atoms.push(atom)
+        # Some atoms data contain extra content before child atom data.
+        # So reduce those extra content to get child atom data.
+        atoms_data = atoms_data[4..] if VERSIONED_ATOMS.include? type # Skip 4 bytes for version
+        atoms_data = atoms_data[4..] if FLAGGED_ATOMS.include? type # Skip 4 bytes for flag
+        atoms_data_io = StringIO.new(atoms_data)
 
-            atoms_data_io.seek(atom.size, IO::SEEK_CUR)
-          end
+        until atoms_data_io.eof?
+          atom = self.class.new(atoms_data_io)
+          children_atoms.push(atom)
 
-          children_atoms
+          atom.skip
         end
+
+        children_atoms
+      end
     end
   end
 end