id3tag 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 011333bf23567c8f51e7229c2c821acda9666e31c40d5b39a93ad2c5a226134d
-  data.tar.gz: 077f4efc53c1fca9760a893b1b70bf94a157ce1b20e6079d5be743e9576abbaf
+  metadata.gz: 071d390948742ea6e37aabbe14326029cf1f61e7e783a282df493ff82d444d05
+  data.tar.gz: 74e9674570cb0eecfef7d47f8307f30bdaf9ecbf07563b6e8755009519af53c1
 SHA512:
-  metadata.gz: 5b8d016a28c5e7e1b1438b64db2e615071bb107ee4b163b8d96002d11081e45dc47d2119d2aad30d66eb9c06d6649a61f951c271766ce17513aefa7c136e60cd
-  data.tar.gz: 5551c6c5bf45487f82489781dc6ff287bcbb73a248e95a81a1f8886bcdf8c51bf71fe6ee6fb870639508fa77c834a4e26736293a7c6c0cd1aa7386cc64342f2e
+  metadata.gz: 22f0aac5137628fcc381f88307d449a3d0870ba8a9fe2ce8acf4101ab367674afbdf3133b5d200669c71c33f2cee86cb7b8dd002b631ca34f9dca894c014f75b
+  data.tar.gz: 350be9a1f12bb7098f99a7924bd247e5a41a5f3f42e0a2684f7bb9e2a0342c1ce381b764325197435bb07cbe5c8362de3b3ba6f31b37a0b7a6f61d7f835b13d9

data/lib/id3tag/frames/v2/chapter_frame.rb

@@ -0,0 +1,48 @@
+module ID3Tag
+  module Frames
+    module V2
+      class ChapterFrame < BasicFrame
+        def element_id
+          unpacked[:element_id]
+        end
+
+        def start_time
+          unpacked[:start_time]
+        end
+
+        def end_time
+          unpacked[:end_time]
+        end
+
+        def start_offset
+          unpacked[:start_offset]
+        end
+
+        def end_offset
+          unpacked[:end_offset]
+        end
+
+        def subframes
+          unpacked[:subframes]
+        end
+
+        alias_method :inspectable_content, :element_id
+
+        private
+
+        def unpacked
+          return @unpacked if defined?(@unpacked)
+          @unpacked = {}
+          raw_content_io.rewind
+          @unpacked[:element_id] = IOUtil.read_until_terminator(raw_content_io, 1)
+          @unpacked[:start_time] = raw_content_io.read(4).unpack1("N")
+          @unpacked[:end_time] = raw_content_io.read(4).unpack1("N")
+          @unpacked[:start_offset] = raw_content_io.read(4).unpack1("N")
+          @unpacked[:end_offset] = raw_content_io.read(4).unpack1("N")
+          @unpacked[:subframes] = ID3V2FrameParser.new(raw_content_io.read, @major_version_number).frames
+          @unpacked
+        end
+      end
+    end
+  end
+end

data/lib/id3tag/frames/v2/frame_fabricator.rb

@@ -24,6 +24,10 @@ module  ID3Tag
             UserTextFrame
           when /^T/
             TextFrame
+          when /^WXXX$/
+            UserUrlFrame
+          when /^W/
+            UrlFrame
           when /^(COM|COMM)$/
             CommentsFrame
           when /^(ULT|USLT)$/
@@ -36,6 +40,10 @@ module  ID3Tag
             PictureFrame
           when /^PRIV$/
             PrivateFrame
+          when /^CHAP$/
+            ChapterFrame
+          when /^CTOC$/
+            TableOfContentsFrame
           else
             BasicFrame
           end

data/lib/id3tag/frames/v2/picture_frame.rb

@@ -11,7 +11,7 @@ module  ID3Tag
           0x03 => :cover_front, # Cover (front)
           0x04 => :cover_back, # Cover (back)
           0x05 => :leaflet_page, # Leaflet page
-          0x06 => :media, # Media (e.g. lable side of CD)
+          0x06 => :media, # Media (e.g. label side of CD)
           0x07 => :lead_artist, # Lead artist/lead performer/soloist
           0x08 => :artist, # Artist/performer
           0x09 => :conductor, # Conductor

data/lib/id3tag/frames/v2/table_of_contents_frame.rb

@@ -0,0 +1,59 @@
+module ID3Tag
+  module Frames
+    module V2
+      class TableOfContentsFrame < BasicFrame
+        FLAG_A_TOP_LEVEL_BIT = "00000001".to_i(2)
+        FLAG_B_ORDERED_BIT = "00000010".to_i(2)
+
+        def element_id
+          unpacked[:element_id]
+        end
+
+        def top_level?
+          unpacked[:flags] & FLAG_A_TOP_LEVEL_BIT > 0
+        end
+
+        def ordered?
+          unpacked[:flags] & FLAG_B_ORDERED_BIT > 0
+        end
+
+        def entry_count
+          unpacked[:entry_count]
+        end
+
+        def child_element_ids
+          unpacked[:child_element_ids]
+        end
+
+        alias_method :content, :child_element_ids
+        alias_method :inspectable_content, :content
+
+        def subframes
+          unpacked[:subframes]
+        end
+
+        private
+
+        def unpacked
+          return @unpacked if defined?(@unpacked)
+          @unpacked = {}
+          raw_content_io.rewind
+          @unpacked[:element_id] = IOUtil.read_until_terminator(raw_content_io, 1)
+          @unpacked[:flags] = raw_content_io.read(1).unpack1("C")
+          @unpacked[:entry_count] = raw_content_io.read(1).unpack1("C")
+
+          @unpacked[:child_element_ids] = []
+          current_entry = 0
+          while current_entry < @unpacked[:entry_count]
+            @unpacked[:child_element_ids].push(IOUtil.read_until_terminator(raw_content_io, 1))
+            current_entry += 1
+          end
+
+          @unpacked[:subframes] = ID3V2FrameParser.new(raw_content_io.read, @major_version_number).frames
+
+          @unpacked
+        end
+      end
+    end
+  end
+end

data/lib/id3tag/frames/v2/url_frame.rb

@@ -0,0 +1,14 @@
+module ID3Tag
+  module Frames
+    module V2
+      class UrlFrame < BasicFrame
+        def url
+          @url ||= StringUtil.cut_at_null_byte(usable_content)
+        end
+
+        alias_method :content, :url
+        alias_method :inspectable_content, :content
+      end
+    end
+  end
+end

data/lib/id3tag/frames/v2/user_url_frame.rb

@@ -0,0 +1,24 @@
+module ID3Tag
+  module Frames
+    module V2
+      class UserUrlFrame < TextFrame
+        def description
+          @description ||= parts.first
+        end
+
+        def url
+          @url ||= parts.last
+        end
+
+        alias_method :content, :url
+        alias_method :inspectable_content, :content
+
+        private
+
+        def parts
+          @parts ||= encoded_content.split(StringUtil::NULL_BYTE, 2)
+        end
+      end
+    end
+  end
+end

data/lib/id3tag/version.rb

@@ -1,3 +1,3 @@
 module ID3Tag
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/id3tag.rb

@@ -23,6 +23,8 @@ require "id3tag/frames/v1/track_nr_frame"
 require "id3tag/frames/v2/basic_frame"
 require "id3tag/frames/v2/text_frame"
 require "id3tag/frames/v2/user_text_frame"
+require "id3tag/frames/v2/url_frame"
+require "id3tag/frames/v2/user_url_frame"
 require "id3tag/frames/v2/involved_people_list_frame"
 require "id3tag/frames/v2/unique_file_id_frame"
 require "id3tag/frames/v2/private_frame"
@@ -30,6 +32,8 @@ require "id3tag/frames/v2/comments_frame"
 require "id3tag/frames/v2/unsychronized_transcription_frame"
 require "id3tag/frames/v2/picture_frame"
 require "id3tag/frames/v2/genre_frame"
+require "id3tag/frames/v2/chapter_frame"
+require "id3tag/frames/v2/table_of_contents_frame"
 require "id3tag/frames/v2/genre_frame/genre_parser"
 require "id3tag/frames/v2/genre_frame/genre_parser_pre_24"
 require "id3tag/frames/v2/genre_frame/genre_parser_24"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: id3tag
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Krists Ozols
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-23 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,6 +131,7 @@ files:
 - lib/id3tag/frames/v1/text_frame.rb
 - lib/id3tag/frames/v1/track_nr_frame.rb
 - lib/id3tag/frames/v2/basic_frame.rb
+- lib/id3tag/frames/v2/chapter_frame.rb
 - lib/id3tag/frames/v2/comments_frame.rb
 - lib/id3tag/frames/v2/frame_fabricator.rb
 - lib/id3tag/frames/v2/frame_flags.rb
@@ -141,10 +142,13 @@ files:
 - lib/id3tag/frames/v2/involved_people_list_frame.rb
 - lib/id3tag/frames/v2/picture_frame.rb
 - lib/id3tag/frames/v2/private_frame.rb
+- lib/id3tag/frames/v2/table_of_contents_frame.rb
 - lib/id3tag/frames/v2/text_frame.rb
 - lib/id3tag/frames/v2/unique_file_id_frame.rb
 - lib/id3tag/frames/v2/unsychronized_transcription_frame.rb
+- lib/id3tag/frames/v2/url_frame.rb
 - lib/id3tag/frames/v2/user_text_frame.rb
+- lib/id3tag/frames/v2/user_url_frame.rb
 - lib/id3tag/id3_v1_frame_parser.rb
 - lib/id3tag/id3_v2_frame_parser.rb
 - lib/id3tag/id3_v2_tag_header.rb
@@ -175,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Native Ruby ID3 tag reader that aims for 100% coverage of ID3v2.x and ID3v1.x