ruby-mp3info 0.6.9 → 0.6.10

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.6.10 / 2008-11-27
+
+* processing of tags (read and write) can be disabled with :parse_tags => false
+
 === 0.6.9 / 2008-09-16
 
 * now correctly remove trailing whitespaces form tag1 values

data/lib/mp3info.rb

@@ -18,7 +18,7 @@ end
 
 class Mp3Info
 
-  VERSION = "0.6.9"
+  VERSION = "0.6.10"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = {
@@ -189,12 +189,18 @@ class Mp3Info
     end
   end
 
-  # Instantiate Mp3Info object with name +filename+ and an
-  # options hash for ID3v2#new underlying object
-  def initialize(filename, id3v2_options = {})
+  # Instantiate Mp3Info object with name +filename+.
+  # options hash is used for ID3v2#new. 
+  # You can specify :parse_tags => false to disable the processing 
+  # of the tags (read and write).
+  def initialize(filename, options = {})
     warn("#{self.class}::new() does not take block; use #{self.class}::open() instead") if block_given?
     @filename = filename
-    @id3v2_options = id3v2_options
+    @tag_parsing_enabled = options.delete(:parse_tags)
+    if @tag_parsing_enabled == nil
+      @tag_parsing_enabled = true
+    end
+    @id3v2_options = options
     reload
   end
 
@@ -204,46 +210,44 @@ class Mp3Info
 
     @header = {}
     
-    @tag1 = {}
-    @tag1.extend(HashKeys)
-
-    @tag2 = ID3v2.new(@id3v2_options)
-
     @file = File.new(filename, "rb")
     @file.extend(Mp3FileMethods)
+    @tag1 = @tag = @tag1_orig = @tag_orig = {}
+    @tag1.extend(HashKeys)
+    @tag2 = ID3v2.new(@id3v2_options)
     
     begin
-      parse_tags
-      @tag1_orig = @tag1.dup
-
-      @tag = {}
+      if @tag_parsing_enabled
+        parse_tags
+        @tag1_orig = @tag1.dup
 
-      if hastag1?
-	@tag = @tag1.dup
-      end
+        if hastag1?
+          @tag = @tag1.dup
+        end
 
-      if hastag2?
-	@tag = {}
-        # creation of a sort of "universal" tag, regardless of the tag version
-        tag2_mapping = @tag2.version =~ /^2\.2/ ? TAG_MAPPING_2_2 : TAG_MAPPING_2_3
-	tag2_mapping.each do |key, tag2_name| 
-	  tag_value = (@tag2[tag2_name].is_a?(Array) ? @tag2[tag2_name].first : @tag2[tag2_name])
-	  next unless tag_value
-	  @tag[key] = tag_value.is_a?(Array) ? tag_value.first : tag_value
-
-	  if %w{year tracknum}.include?(key)
-	    @tag[key] = tag_value.to_i
-	  end
-          # this is a special case with id3v2.2, which uses
-          # old fashionned id3v1 genres
-          if tag2_name == "TCO" && tag_value =~ /^\((\d+)\)$/
-            @tag["genre_s"] = GENRES[$1.to_i]
+        if hastag2?
+          @tag = {}
+          # creation of a sort of "universal" tag, regardless of the tag version
+          tag2_mapping = @tag2.version =~ /^2\.2/ ? TAG_MAPPING_2_2 : TAG_MAPPING_2_3
+          tag2_mapping.each do |key, tag2_name| 
+            tag_value = (@tag2[tag2_name].is_a?(Array) ? @tag2[tag2_name].first : @tag2[tag2_name])
+            next unless tag_value
+            @tag[key] = tag_value.is_a?(Array) ? tag_value.first : tag_value
+
+            if %w{year tracknum}.include?(key)
+              @tag[key] = tag_value.to_i
+            end
+            # this is a special case with id3v2.2, which uses
+            # old fashionned id3v1 genres
+            if tag2_name == "TCO" && tag_value =~ /^\((\d+)\)$/
+              @tag["genre_s"] = GENRES[$1.to_i]
+            end
           end
-	end
-      end
+        end
 
-      @tag.extend(HashKeys)
-      @tag_orig = @tag.dup
+        @tag.extend(HashKeys)
+        @tag_orig = @tag.dup
+      end
 
 
       ### extracts MPEG info from MPEG header and stores it in the hash @mpeg
@@ -420,6 +424,9 @@ class Mp3Info
   # Flush pending modifications to tags and close the file
   def close
     puts "close" if $DEBUG
+    if !@tag_parsing_enabled
+      return 
+    end
     if @tag != @tag_orig
       puts "@tag has changed" if $DEBUG
 

data/lib/mp3info/id3v2.rb

@@ -103,6 +103,7 @@ class ID3v2 < DelegateClass(Hash)
   # for read and write tag2 values.
   attr_reader :options
   
+  # possible options are described above ('options' attribute)
   # you can access this object like an hash, with [] and []= methods
   # special cases are ["disc_number"] and ["disc_total"] mirroring TPOS attribute
   def initialize(options = {})

data/test/test_ruby-mp3info.rb

@@ -452,6 +452,22 @@ class Mp3InfoTest < Test::Unit::TestCase
     end
   end
 
+  def test_parse_tags_disabled
+    write_temp_file(DUMMY_TAG2)
+    Mp3Info.open(TEMP_FILE, :parse_tags => false) do |mp3|
+      assert mp3.tag.empty?
+      assert mp3.tag1.empty?
+      assert mp3.tag2.empty?
+      mp3.tag["artist"] = "some dummy tag"
+      mp3.tag2["TIT2"] = "title 2"
+      mp3.flush
+      # tag should not be written
+      assert mp3.tag.empty?
+      assert mp3.tag1.empty?
+      assert mp3.tag2.empty?
+    end
+  end
+
   def compute_audio_content_mp3_digest(mp3)
     pos, size = mp3.audio_content
     data = File.open(mp3.filename) do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mp3info
 version: !ruby/object:Gem::Version 
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors: 
 - Guillaume Pierronnet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-16 00:00:00 +02:00
+date: 2008-11-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency