wahwah 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac83f92fa8a66210ab41b57ab7ccac87f7653573860286a5986ffc17132a57eb
-  data.tar.gz: d197f0523c55af55ef826237b227e21d450b13937585eaa456e18360ae1983e6
+  metadata.gz: 02bf7083fb530d058140db0b5f5e18cf2710ba7a6ba7fed2d2978c2109764ab2
+  data.tar.gz: dc9a32191879dfda4ea08477579ec4c631be6f0829d25ad066623232cd926a15
 SHA512:
-  metadata.gz: d9e893bb99650e639f26546705d0d46bdba50da7377bd11f221247adc1069e97738ad2a4ed134fa078682ccf51cc13a37bf1bb2bebee3891e26de662e0f887cc
-  data.tar.gz: 1bf025ffb3ef82c4870477402befafaedb5c1c654726ba77f61c88d7ef8d6516f6d56c79cf54fc45f319a56d97402f0061d8c5c0e20e3e274afc8d40080e4522
+  metadata.gz: 59b2cd82d8d52b273bb2abfa4085a083716fb9cb701102c0103e6ccf2a08b3909253c8bda2ffe2d423bed43a056a8aab1bd7d3c172468c6f72fa7dafc4879b56
+  data.tar.gz: 578a61f74b3eea858ba31817d8d16e663b3e7680806886e2e44fc7b4c93b09b601a5559c07326f63cc0e43a6be2c1d362e6247297679e65578e301f0f7c591ee

data/lib/wahwah/asf_tag.rb

@@ -17,7 +17,8 @@ module WahWah
       "WM/Genre" => :genre,
       "WM/PartOfSet" => :disc,
       "WM/TrackNumber" => :track,
-      "WM/Year" => :year
+      "WM/Year" => :year,
+      "WM/Lyrics" => :lyrics
     }
 
     private

data/lib/wahwah/id3/frame.rb

@@ -18,6 +18,7 @@ module WahWah
         TP2: :albumartist,
         TCM: :composer,
         PIC: :image,
+        ULT: :lyrics,
 
         # ID3v2.3 and ID3v2.4 frame id
         COMM: :comment,
@@ -31,6 +32,7 @@ module WahWah
         TPE2: :albumartist,
         TCOM: :composer,
         APIC: :image,
+        USLT: :lyrics,
 
         # ID3v2.4 use TDRC replace TYER
         TDRC: :year
@@ -167,6 +169,8 @@ module WahWah
           GenreFrameBody
         when :image
           ImageFrameBody
+        when :lyrics
+          LyricsFrameBody
         else
           TextFrameBody
         end

data/lib/wahwah/id3/lyrics_frame_body.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module WahWah
+  module ID3
+    class LyricsFrameBody < CommentFrameBody
+    end
+  end
+end

data/lib/wahwah/mp3_tag.rb

@@ -23,7 +23,8 @@ module WahWah
       :year,
       :disc,
       :disc_total,
-      :images
+      :images,
+      :lyrics
 
     def id3v2?
       @id3_tag.instance_of? ID3::V2

data/lib/wahwah/mp4_tag.rb

@@ -10,6 +10,7 @@ module WahWah
       "\xA9day".b => :year,
       "\xA9gen".b => :genre,
       "\xA9nam".b => :title,
+      "\xA9lyr".b => :lyrics,
       "covr".b => :image,
       "disk".b => :disc,
       "trkn".b => :track,
@@ -125,9 +126,22 @@ module WahWah
 
       mp4a_atom = atom.find("mp4a")
       esds_atom = atom.find("esds")
+      alac_atom = atom.find("alac")
 
       @sample_rate = mp4a_atom.data.unpack1("x22I>") if mp4a_atom.valid?
       @bitrate = esds_atom.data.unpack1("x26I>") / 1000 if esds_atom.valid?
+
+      # see https://github.com/macosforge/alac/blob/master/ALACMagicCookieDescription.txt for more info.
+      if alac_atom.valid?
+        atom_data = StringIO.new(alac_atom.data)
+
+        atom_data.seek(45, IO::SEEK_CUR)
+        @bit_depth = atom_data.read(1).unpack1("C")
+
+        atom_data.seek(10, IO::SEEK_CUR)
+        @bitrate = (atom_data.read(4).unpack1("I>") / 1000.to_f).round
+        @sample_rate = atom_data.read(4).unpack1("I>")
+      end
     end
 
     def parse_image_data(image_data_atom)

data/lib/wahwah/ogg/vorbis_comment.rb

@@ -24,7 +24,8 @@ module WahWah
         "DATE" => :year,
         "GENRE" => :genre,
         "DISCNUMBER" => :disc,
-        "COMPOSER" => :composer
+        "COMPOSER" => :composer,
+        "LYRICS" => :lyrics
       }
 
       def parse_vorbis_comment(comment_content)

data/lib/wahwah/ogg_tag.rb

@@ -14,7 +14,8 @@ module WahWah
       :genre,
       :disc,
       :composer,
-      :sample_rate
+      :sample_rate,
+      :lyrics
 
     private
 

data/lib/wahwah/riff_tag.rb

@@ -109,17 +109,18 @@ module WahWah
       # And INFO chunk as a subchunk for LIST chunk.
       if chunk.type != "INFO"
         chunk.skip
-      else
-        until list_chunk_end_position <= @file_io.pos
-          info_chunk = Riff::Chunk.new(@file_io)
+        return
+      end
 
-          unless INFO_ID_MAPPING.key? info_chunk.id.to_sym
-            info_chunk.skip
-            next
-          end
+      until list_chunk_end_position <= @file_io.pos
+        info_chunk = Riff::Chunk.new(@file_io)
 
-          update_attribute(info_chunk)
+        unless INFO_ID_MAPPING.key? info_chunk.id.to_sym
+          info_chunk.skip
+          next
         end
+
+        update_attribute(info_chunk)
       end
     end
 

data/lib/wahwah/tag.rb

@@ -18,6 +18,7 @@ module WahWah
       :year,
       :disc,
       :disc_total,
+      :lyrics,
       :duration,
       :bitrate,
       :sample_rate,

data/lib/wahwah/version.rb

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

data/lib/wahwah.rb

@@ -20,6 +20,7 @@ require "wahwah/id3/text_frame_body"
 require "wahwah/id3/genre_frame_body"
 require "wahwah/id3/comment_frame_body"
 require "wahwah/id3/image_frame_body"
+require "wahwah/id3/lyrics_frame_body"
 
 require "wahwah/mp3/mpeg_frame_header"
 require "wahwah/mp3/xing_header"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wahwah
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - aidewoode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ files:
 - lib/wahwah/id3/frame_body.rb
 - lib/wahwah/id3/genre_frame_body.rb
 - lib/wahwah/id3/image_frame_body.rb
+- lib/wahwah/id3/lyrics_frame_body.rb
 - lib/wahwah/id3/text_frame_body.rb
 - lib/wahwah/id3/v1.rb
 - lib/wahwah/id3/v2.rb
@@ -167,14 +168,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Audio metadata reader ruby gem