id3tag 0.14.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ee2f5e34526388ad61267ade1af0773b4bd85c723b252cc7848a4a692d99281
-  data.tar.gz: 984577caccfa629dc79ad4b0c49d52a2b7ce08598400084b199e2b4fc1909d8f
+  metadata.gz: 071d390948742ea6e37aabbe14326029cf1f61e7e783a282df493ff82d444d05
+  data.tar.gz: 74e9674570cb0eecfef7d47f8307f30bdaf9ecbf07563b6e8755009519af53c1
 SHA512:
-  metadata.gz: 22617752ac7e06ae319cf97d034c2d358b926252a76957e87899acdace5d130fd9051f43cf769e59e9a3c9d99c52bb417c475c24bcd1c7506a0196d1768d2fb6
-  data.tar.gz: 6eea548143a08b68522d860ed3f0c8da2ed64590dfd87c7a3a4c7b182799542dfc9396eb8c9578b5686659b5bc013f63eb12b04a928ef771dbf892188051e3ff
+  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/text_frame.rb

@@ -11,7 +11,15 @@ module  ID3Tag
         }
 
         def content
-          @content ||= StringUtil.cut_at_null_byte(encoded_content)
+          @content ||= if @major_version_number >= 4
+            StringUtil.chomp_null_byte(encoded_content)
+          else
+            StringUtil.cut_at_null_byte(encoded_content)
+          end
+        end
+
+        def contents
+          @contents ||= StringUtil.split_by_null_bytes(content)
         end
 
         def inspectable_content

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/string_util.rb

@@ -40,5 +40,13 @@ module ID3Tag
       end
       [before.pack(UTF_8_DIRECTIVE), after.pack(UTF_8_DIRECTIVE)]
     end
+
+    def self.split_by_null_bytes(string)
+      string.split(NULL_BYTE)
+    end
+
+    def self.chomp_null_byte(string)
+      string.chomp(NULL_BYTE)
+    end
   end
 end

data/lib/id3tag/unsynchronization.rb

@@ -10,7 +10,7 @@ module ID3Tag
         current_byte = input_bytes.next
         output_bytes << current_byte
         next_byte = input_bytes.peek
-        if (current_byte == 255) && (next_byte > 224)
+        if (current_byte == 255) && ((next_byte >= 224) || (next_byte == 0))
           output_bytes << 0
         end
       end
@@ -20,8 +20,8 @@ module ID3Tag
       prev_byte = nil
       loop do
         current_byte = input_bytes.next
-        next_byte = input_bytes.peek rescue 0
-        unless (prev_byte == 255) && (current_byte == 0) && (next_byte > 224)
+        next_byte = input_bytes.peek rescue nil
+        unless (prev_byte == 255) && (current_byte == 0) && (next_byte != nil) && ((next_byte >= 224) || (next_byte == 0))
           output_bytes << current_byte
         end
         prev_byte = current_byte

data/lib/id3tag/version.rb

@@ -1,3 +1,3 @@
 module ID3Tag
-  VERSION = "0.14.2"
+  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: 0.14.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Krists Ozols
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-07 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