flac2mp3 0.2.4 → 0.2.5

data/History.txt

@@ -1,3 +1,13 @@
+== 0.2.5 2008-05-12
+
+* 1 bug fix:
+  * Composer now actually carried over from FLAC to MP# tags, not just thought to be.
+  
+* 3 enhancements:
+  * Compilation flag carried over.
+  * Track total carried over in addition to track number.
+  * Disc total and disc number carried over.
+
 == 0.2.4 2008-04-28
 
 * 1 bug fix:

data/lib/flac2mp3.rb

@@ -26,11 +26,15 @@ module Flac2mp3
         :artist      => :artist,
         :bpm         => :TBPM,
         :description => :comments,
-        :composer    => :composer,
+        :composer    => :TCOM,
         :date        => :year,
         :genre       => :genre_s,
         :title       => :title,
-        :tracknumber => :tracknum
+        :tracknumber => :TRCK,
+        :tracktotal  => :TRCK,
+        :discnumber  => :TPOS,
+        :disctotal   => :TPOS,
+        :compilation => :TCMP
       }
     end
     
@@ -48,19 +52,48 @@ module Flac2mp3
     def mp3data(filename, tags)
       raise TypeError, "Tags must be a hash" unless tags.is_a?(Hash)
       Mp3Info.open(filename) do |mp3|
-        tags.each do |key, value|
-          next unless mp3tag = tag_mapping[key]
-          tag = mp3.tag
-          tag = mp3.tag2 if key == :bpm
-          tag.send("#{mp3tag}=", value)
+        convert_tags(tags).each do |mp3tag, data|
+          tag = mp3.send(data[:target])
+          tag.send("#{mp3tag}=", data[:value])
         end
       end
     end
     
+    
     private
     
     def string_fields
       [:title, :description]
     end
+    
+    def tag2_fields
+      [:bpm, :composer, :compilation, :tracktotal, :tracknumber, :disctotal, :discnumber]
+    end
+    
+    def tag_formats
+      {
+        :TRCK => ':tracknumber/:tracktotal',
+        :TPOS => ':discnumber/:disctotal'
+      }
+    end
+    
+    def convert_tags(tags)
+      mp3_tags = {}
+      
+      tags.each do |key, value|
+        next unless mp3tag = tag_mapping[key]
+        
+        if format = tag_formats[mp3tag]
+          value = format.gsub(/:(\w+)/) do 
+            field = $1
+            tags[field.to_sym]
+          end
+        end
+        
+        target = tag2_fields.include?(key) ? :tag2 : :tag
+        mp3_tags[mp3tag] = { :target => target, :value => value }
+      end
+      mp3_tags
+    end
   end
 end

data/lib/flac2mp3/version.rb

@@ -2,7 +2,7 @@ module Flac2mp3 #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/flac2mp3_spec.rb

@@ -142,8 +142,8 @@ describe Flac2mp3, 'providing a mapping of tags' do
     Flac2mp3.tag_mapping[:description].should == :comments
   end
   
-  it "should map 'composer' to 'composer'" do
-    Flac2mp3.tag_mapping[:composer].should == :composer
+  it "should map 'composer' to 'TCOM'" do
+    Flac2mp3.tag_mapping[:composer].should == :TCOM
   end
   
   it "should map 'date' to 'year'" do
@@ -158,8 +158,24 @@ describe Flac2mp3, 'providing a mapping of tags' do
     Flac2mp3.tag_mapping[:title].should == :title
   end
   
-  it "should map 'tracknumber' to 'tracknum'" do
-    Flac2mp3.tag_mapping[:tracknumber].should == :tracknum
+  it "should map 'tracknumber' to 'TRCK'" do
+    Flac2mp3.tag_mapping[:tracknumber].should == :TRCK
+  end
+  
+  it "should map 'tracktotal' to 'TRCK'" do
+    Flac2mp3.tag_mapping[:tracktotal].should == :TRCK
+  end
+  
+  it "should map 'discnumber' to 'TPOS'" do
+    Flac2mp3.tag_mapping[:discnumber].should == :TPOS
+  end
+  
+  it "should map 'disctotal' to 'TPOS'" do
+    Flac2mp3.tag_mapping[:disctotal].should == :TPOS
+  end
+  
+  it "should map 'compilation' to 'TCMP'" do
+    Flac2mp3.tag_mapping[:compilation].should == :TCMP
   end
 end
 
@@ -258,7 +274,7 @@ describe Flac2mp3, 'when getting FLAC tag data' do
     data[:description].should == '1938'
   end
   
-  it 'should leave numeric titles as strings even if the title key is not a simple downcased symbol' do
+  it 'should leave numeric descriptions as strings even if the description key is not a simple downcased symbol' do
     @tags['DESCRIPTION'] = '1938'
     
     data = Flac2mp3.flacdata(@filename)
@@ -324,7 +340,6 @@ describe Flac2mp3, 'when setting MP3 tag data' do
     
     @mp3tags.expects(:comments=).never
     @mp3tags.expects(:year=).never
-    @mp3tags.expects(:tracknum=).never
     
     Flac2mp3.mp3data(@filename, @tags)
   end
@@ -346,4 +361,38 @@ describe Flac2mp3, 'when setting MP3 tag data' do
     
     Flac2mp3.mp3data(@filename, @tags)
   end
+  
+  it 'should use tag2 for composer' do
+    @tags[:composer] = 'Il Maestro'
+    
+    @mp3tags2.expects(:TCOM=).with(@tags[:composer])
+    
+    Flac2mp3.mp3data(@filename, @tags)
+  end
+  
+  it 'should use tag2 for compilation' do
+    @tags[:compilation] = '1'
+    
+    @mp3tags2.expects(:TCMP=).with(@tags[:compilation])
+    
+    Flac2mp3.mp3data(@filename, @tags)
+  end
+  
+  it 'should set tag2 track to be a combination of tracknumber and tracktotal' do
+    @tags[:tracknumber] = 4
+    @tags[:tracktotal]  = 15
+    
+    @mp3tags2.expects(:TRCK=).with('4/15')
+    
+    Flac2mp3.mp3data(@filename, @tags)
+  end
+  
+  it "should set tag2 'pos' to be a combination of discnumber and disctotal" do
+    @tags[:discnumber] = 1
+    @tags[:disctotal]  = 2
+    
+    @mp3tags2.expects(:TPOS=).with('1/2')
+    
+    Flac2mp3.mp3data(@filename, @tags)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flac2mp3
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Yossef Mendelssohn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-28 00:00:00 -05:00
+date: 2008-05-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency