wahwah 1.5.1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ae84eaac046bfc70016dd80a23f1c246066d70264c064fd048127946a40bd51
-  data.tar.gz: bea598207d92e57cac06bfc948b1ea86a70b68b7ffd61c2231a5b2f75d193785
+  metadata.gz: d366d9e5b09b02f94de258c09e03b9d107dda83fe31052bf9b93696e669aac08
+  data.tar.gz: 5a6cc11a98174b658d2b35d3440940023e7aec4a2cb964636c58930d9690338a
 SHA512:
-  metadata.gz: cc3e3ad5fb44882840f7fe1d21d77aa722a0bc5b13ef41b1d8243f6dc24ec83ac83ce2765e5941f09e7e097b458810235f11235d6b9b997623b9910082d8e023
-  data.tar.gz: 4f5fd37cbe0eadfec74eae4b73952bd9fe03b5a8ce67569c4662f54e142a33a163c94722257b6d461286b537b7c59cd0c52b33728659f606d1a1219b10332e00
+  metadata.gz: 47ad25531fe9835c08f0db10ca919cb73f5688237d19586e7b4f0b7cfacd85c176d2e6555243a1ed566c092dcfea83f39fd9f5c9869240f9a0f3b4b2c056bd64
+  data.tar.gz: 8284a87d145252d60146f5bf2a2fa42c0201422b72ecc4755388a65ff6d2e890b2d029059d9c5d7199b9dd7f873309e38b0890faeae8a3910b960e38556f4c53

data/lib/wahwah/helper.rb

@@ -22,16 +22,63 @@ module WahWah
     end
 
     def self.split_with_terminator(string, terminator_size)
-      string.split(Regexp.new(('\x00' * terminator_size).b), 2)
+      terminator = ("\x00" * terminator_size).b
+
+      (0...string.size).step(terminator_size).each do |index|
+        if string[index...(index + terminator_size)] == terminator
+          return [string[0...index], string[index + terminator_size..]]
+        end
+      end
+
+      []
     end
 
-    def self.file_format(file_path)
-      File.extname(file_path).downcase.delete(".")
+    def self.file_format(io)
+      if io.respond_to?(:path) && io.path && !io.path.empty?
+        file_format = file_format_from_extension io.path
+        return file_format unless file_format.nil? || file_format.empty?
+      end
+
+      file_format_from_signature io
     end
 
     def self.byte_string_to_guid(byte_string)
       guid = byte_string.unpack("NnnA*").pack("VvvA*").unpack1("H*")
       [guid[0..7], guid[8..11], guid[12..15], guid[16..19], guid[20..]].join("-").upcase
     end
+
+    def self.file_format_from_extension(file_path)
+      File.extname(file_path).downcase[1..]
+    end
+
+    def self.file_format_from_signature(io)
+      io.rewind
+      signature = io.read(16)
+
+      # Source: https://en.wikipedia.org/wiki/List_of_file_signatures
+
+      # M4A is checked for first, since MP4 files start with a chunk size -
+      # and that chunk size may incidentally match another signature.
+      # No other formats would reasonably have "ftyp" as the next for bytes.
+      return "m4a" if signature[4...12] == "ftypM4A ".b
+      # Handled separately simply because it requires two checks.
+      return "wav" if signature.start_with?("RIFF".b) && signature[8...12] == "WAVE".b
+      magic_numbers = {
+        "fLaC".b => "flac",
+        "\xFF\xFB".b => "mp3",
+        "\xFF\xF3".b => "mp3",
+        "\xFF\xF2".b => "mp3",
+        "ID3".b => "mp3",
+        "OggS".b => "ogg",
+        "\x30\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C".b => "wma"
+      }
+      magic_numbers.each do |expected_signature, file_format|
+        return file_format if signature.start_with? expected_signature
+      end
+
+      nil
+    end
+
+    private_class_method :file_format_from_extension, :file_format_from_signature
   end
 end

data/lib/wahwah/id3/image_frame_body.rb

@@ -49,9 +49,9 @@ module WahWah
       # Picture data  <binary data>
       def parse
         frame_format = @version > 2 ? "CZ*Ca*" : "Ca3Ca*"
-        encoding_id, @mime_type, type_index, reset_content = @content.unpack(frame_format)
+        encoding_id, @mime_type, type_index, rest_content = @content.unpack(frame_format)
         encoding = ENCODING_MAPPING[encoding_id]
-        _description, data = Helper.split_with_terminator(reset_content, ENCODING_TERMINATOR_SIZE[encoding])
+        _description, data = Helper.split_with_terminator(rest_content, ENCODING_TERMINATOR_SIZE[encoding])
 
         @value = {data: data, mime_type: mime_type, type: TYPES[type_index]}
       end

data/lib/wahwah/id3/v2_header.rb

@@ -17,7 +17,7 @@ module WahWah
       attr_reader :major_version, :size
 
       def initialize(file_io)
-        header_content = file_io.read(HEADER_SIZE)
+        header_content = file_io.read(HEADER_SIZE) || ""
         @id, @major_version, @flags, size_bits = header_content.unpack(HEADER_FORMAT) if header_content.size >= HEADER_SIZE
 
         return unless valid?

data/lib/wahwah/mp3_tag.rb

@@ -50,11 +50,20 @@ module WahWah
     end
 
     def parse_id3_tag
-      id3_v1_tag = ID3::V1.new(@file_io.dup)
-      id3_v2_tag = ID3::V2.new(@file_io.dup)
-
-      return id3_v2_tag if id3_v2_tag.valid?
-      id3_v1_tag if id3_v1_tag.valid?
+      @file_io.rewind
+      signature = @file_io.read(6)
+
+      if signature.start_with?("ID3".b)
+        id3_v2_tag = ID3::V2.new(@file_io)
+        id3_v2_tag if id3_v2_tag.valid?
+      elsif ["\xFF\xFB".b, "\xFF\xF3".b, "\xFF\xF2".b].include? signature[...2]
+        # It's important to only initialize an ID3v1 object as the last option,
+        # as it requires reading to the end of the file. If the file is a
+        # streaming download (using, for example, Down), that requires
+        # downloading the whole file, which is not the case with ID3v2.
+        id3_v1_tag = ID3::V1.new(@file_io.dup)
+        id3_v1_tag if id3_v1_tag.valid?
+      end
     end
 
     def parse_duration

data/lib/wahwah/ogg_tag.rb

@@ -17,6 +17,20 @@ module WahWah
       :sample_rate,
       :lyrics
 
+    # Oggs require reading to the end of the file in order to calculate their
+    # duration (as it's not stored in any header or metadata). Thus, if the
+    # IO like object supplied to WahWah is a streaming download, getting the
+    # duration would download the entire audio file, which may not be
+    # desirable. Making it lazy in this manner allows the user to avoid that.
+    def duration
+      @duration ||= parse_duration
+    end
+
+    # Requires duration to calculate, so lazy as well.
+    def bitrate
+      @bitrate ||= parse_bitrate
+    end
+
     private
 
     def packets
@@ -41,8 +55,6 @@ module WahWah
         Ogg::FlacTag.new(identification_packet, comment_packet)
       end
 
-      @duration = parse_duration
-      @bitrate = parse_bitrate
       @bit_depth = parse_bit_depth
     end
 

data/lib/wahwah/riff/chunk.rb

@@ -37,7 +37,7 @@ module WahWah
       end
 
       def valid?
-        !@id.empty? && !@size.nil? && @size > 0
+        @id && !@id.empty? && !@size.nil? && @size > 0
       end
 
       private

data/lib/wahwah/tag.rb

@@ -3,7 +3,7 @@
 module WahWah
   class Tag
     INTEGER_ATTRIBUTES = %i[disc disc_total track track_total]
-    INSPECT_ATTRIBUTES = %i[title artist album albumartist composer track track_total genre year disc disc_total duration bitrate sample_rate bit_depth]
+    INSPECT_ATTRIBUTES = %i[title artist album albumartist composer track track_total genre year disc disc_total]
 
     attr_reader(
       :title,
@@ -26,14 +26,9 @@ module WahWah
       :file_size
     )
 
-    def initialize(file)
-      if file.is_a?(IO) || file.is_a?(StringIO)
-        @file_size = file.size
-        @file_io = file
-      else
-        @file_size = File.size(file)
-        @file_io = File.open(file)
-      end
+    def initialize(io)
+      @file_size = io.size
+      @file_io = io
 
       @comments = []
       @images_data = []
@@ -44,8 +39,6 @@ module WahWah
         value = instance_variable_get("@#{attr_name}")&.to_i
         instance_variable_set("@#{attr_name}", value)
       end
-    ensure
-      @file_io.close
     end
 
     def inspect
@@ -58,7 +51,7 @@ module WahWah
     def images
       return @images_data if @images_data.empty?
 
-      @images_data.map do |data|
+      @images ||= @images_data.map do |data|
         parse_image_data(data)
       end
     end

data/lib/wahwah/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WahWah
-  VERSION = "1.5.1"
+  VERSION = "1.6.1"
 end

data/lib/wahwah.rb

@@ -60,23 +60,36 @@ module WahWah
     Mp4Tag: ["m4a"]
   }.freeze
 
-  def self.open(file_path)
-    file_path = file_path.to_path if file_path.respond_to? :to_path
-    file_path = file_path.to_str
+  def self.open(path_or_io)
+    with_io path_or_io do |io|
+      file_format = Helper.file_format io
 
-    file_format = Helper.file_format(file_path)
+      raise WahWahArgumentError, "No supported format found" unless support_formats.include? file_format
 
-    raise WahWahArgumentError, "File is not exists" unless File.exist? file_path
-    raise WahWahArgumentError, "File is unreadable" unless File.readable? file_path
-    raise WahWahArgumentError, "File is empty" unless File.size(file_path) > 0
-    raise WahWahArgumentError, "No supported format found" unless support_formats.include? file_format
-
-    FORMATE_MAPPING.each do |tag, formats|
-      break const_get(tag).new(file_path) if formats.include?(file_format)
+      FORMATE_MAPPING.each do |tag, formats|
+        break const_get(tag).new(io) if formats.include?(file_format)
+      end
     end
   end
 
   def self.support_formats
     FORMATE_MAPPING.values.flatten
   end
+
+  def self.with_io(path_or_io, &block)
+    path_or_io = Pathname.new path_or_io if path_or_io.respond_to? :to_str
+
+    if path_or_io.is_a? Pathname
+      raise WahWahArgumentError, "File does not exist" unless File.exist? path_or_io
+      raise WahWahArgumentError, "File is unreadable" unless File.readable? path_or_io
+      raise WahWahArgumentError, "File is empty" unless File.size(path_or_io) > 0
+
+      path_or_io.open(&block)
+    else
+
+      block.call path_or_io
+    end
+  end
+
+  private_class_method :with_io
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wahwah
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.1
 platform: ruby
 authors:
 - aidewoode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2024-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Audio metadata reader ruby gem