r2mp3 0.0.1 → 0.1.1

data/README

@@ -5,8 +5,21 @@ R2mp3 library:
 
 Requirement:
  lame_adapter (sudo gem install lame_adapter)
- mplayer (sudo apt-get install mplayer)
+ mplayer+lame (sudo apt-get install mplayer lame)
 
 
+Change log:
+15/10/2007  Pre-Alpha
+            - Should support simple convert to mp3
+            
+29/10/2007  Version 0.1.1
+            - Add bitrate setting
+            - Add mode setting
+            - Remove bitrate setting bug
+            - Change example
+            - Support MP3 to MP3
+            - MP3 inspector added based-on mp3-info
+                       
+
 
 

data/example/cli_converter.rb

@@ -2,10 +2,16 @@
 require 'rubygems'
 require 'r2mp3'
 options = Options.new(ARGV)
-Converter.new(:convert=>:wma,:file=>options[:file]){|f| f.to_mp3 } unless options[:wma].nil? or options[:file].nil?
-Converter.new(:convert=>:wma,:dir=>options[:dir]){|d| d.to_mp3 } unless options[:wma].nil? or options[:dir].nil?
-Converter.new(:convert=>:aac,:file=>options[:file]){|f| f.to_mp3 } unless options[:aac].nil? or options[:file].nil?
-Converter.new(:convert=>:aac,:dir=>options[:dir]){|d| d.to_mp3 } unless options[:aac].nil? or options[:dir].nil?
-Converter.new(:convert=>:ra,:file=>options[:file]){|f| f.to_mp3 } unless options[:ra].nil? or options[:file].nil?
-Converter.new(:convert=>:ra,:dir=>options[:dir]){|d| d.to_mp3 } unless options[:ra].nil? or options[:dir].nil?
+
+options[:bitrate] ||= 64
+
+Converter.new(:convert=>:wma,:file=>options[:file],:bitrate => options[:bitrate]){|f| f.to_mp3 } unless options[:wma].nil? or options[:file].nil?
+Converter.new(:convert=>:wma,:dir=>options[:dir],:bitrate => options[:bitrate]){|d| d.to_mp3 } unless options[:wma].nil? or options[:dir].nil?
+Converter.new(:convert=>:aac,:file=>options[:file],:bitrate => options[:bitrate]){|f| f.to_mp3 } unless options[:aac].nil? or options[:file].nil?
+Converter.new(:convert=>:aac,:dir=>options[:dir],:bitrate => options[:bitrate]){|d| d.to_mp3 } unless options[:aac].nil? or options[:dir].nil?
+Converter.new(:convert=>:ra,:file=>options[:file],:bitrate => options[:bitrate]){|f| f.to_mp3 } unless options[:ra].nil? or options[:file].nil?
+Converter.new(:convert=>:ra,:dir=>options[:dir],:bitrate => options[:bitrate]){|d| d.to_mp3 } unless options[:ra].nil? or options[:dir].nil?
+Converter.new(:convert=>:ra,:file=>options[:file],:bitrate => options[:bitrate]){|f| f.to_mp3 } unless options[:mp3].nil? or options[:file].nil?
+Converter.new(:convert=>:ra,:dir=>options[:dir],:bitrate => options[:bitrate]){|d| d.to_mp3 } unless options[:mp3].nil? or options[:dir].nil?
+
 

data/example/example1.rb

@@ -1,18 +1,22 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require 'r2mp3.rb'
+#require 'rubygems'
+require '../lib/r2mp3.rb'
 
-wma_file = "wma_example.wma"
+wma_file = "example1.wma"
 wma_dir = "wma_dir"
 aac_file = "aac_example.m4a"
 aac_dir = "aac_dir"
 rm_file = "rm_example.rm"
 rm_dir = "rm_dir"
 
-Converter.new(:convert=>:wma,:file=>wma_file){|f| f.to_mp3 } unless options[:wma].nil? or options[:file].nil?
-Converter.new(:convert=>:wma,:dir=>wma_dir){|d| d.to_mp3 } unless options[:wma].nil? or options[:dir].nil?
-Converter.new(:convert=>:aac,:file=>aac_file){|f| f.to_mp3 } unless options[:aac].nil? or options[:file].nil?
-Converter.new(:convert=>:aac,:dir=>aac_dir){|d| d.to_mp3 } unless options[:aac].nil? or options[:dir].nil?
-Converter.new(:convert=>:ra,:file=>ra_file){|f| f.to_mp3 } unless options[:ra].nil? or options[:file].nil?
-Converter.new(:convert=>:ra,:dir=>ra_dir){|d| d.to_mp3 } unless options[:ra].nil? or options[:dir].nil?
+Converter.new(:convert=>:wma,:file=>wma_file) do |f| 
+     f.bitrate 128
+     f.to_mp3 
+end
+
+ Converter.new(:convert=>:wma,:dir=>wma_dir) do |d|
+      d.bitrate 128
+      d.to_mp3
+ end
+
 

data/example/example2.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+#require 'rubygems'
+require '../lib/r2mp3.rb'
+
+mp3_file = "example.mp3"
+mp3_dir = "mp3_dir"
+
+Converter.new(:convert=>:mp3,:file=>mp3_file) do |f| 
+     f.bitrate 160
+     f.to_mp3 
+end
+
+ Converter.new(:convert=>:mp3,:dir=>mp3_dir) do |d|
+      d.bitrate 160
+      d.to_mp3
+ end
+
+

data/inspector/mp3inspector.rb

@@ -0,0 +1,90 @@
+#!/usr/bin/env ruby
+#This script used for inspect the mp3 file
+require 'rubygems'
+require "base64"
+require 'mp3info'
+TEMP_FILE = File.join(File.dirname($0),"file.mp3")
+
+class Mp3Tool
+        def self.setup
+        @valid_mp3 = Base64.decode64 <<EOF
+//uQZAAAAAAAaQYAAAAAAA0gwAAAAAABpBwAAAAAADSDgAAATEFNRTMuOTNV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVTEFNRTMuOTNVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVV//uSZL6P8AAAaQAAAAAAAA0gAAAAAAABpAAAAAAAADSA
+AAAAVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVUxBTUUzLjkzVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVf/7kmT/j/AAAGkAAAAAAAANIAAA
+AAAAAaQAAAAAAAA0gAAAAFVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVM
+QU1FMy45M1VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVX/+5Jk/4/w
+AABpAAAAAAAADSAAAAAAAAGkAAAAAAAANIAAAABVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVTEFNRTMuOTNVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVV//uSZP+P8AAAaQAAAAAAAA0gAAAAAAABpAAAAAAAADSAAAAAVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVQ==
+EOF
+    @tag = {
+      "title" => "title",
+      "artist" => "artist",
+      "album" => "album",
+      "year" => 1921,
+      "comments" => "comments",
+      "genre" => 0,
+      "genre_s" => "Blues",
+      "tracknum" => 36
+    }
+    File.open(TEMP_FILE, "w") { |f| f.write(@valid_mp3) }
+  end
+  
+	def self.inspect
+	        Mp3Info.open(TEMP_FILE) do |info|
+	            puts "Inspecting...#{TEMP_FILE}"
+	            puts "======Summary============"
+                    puts "MPEG #{info.mpeg_version}"  
+                    puts "Layer #{info.layer}" 
+                    puts "VBR? #{info.vbr}" 
+                    puts "Bitrate #{info.bitrate} kbps"
+                    puts "Mode: #{info.channel_mode}"
+                    puts "Sample rate #{info.samplerate} Hz"
+                    puts "Error protection? #{info.error_protection}"
+                    puts "Length #{info.length}"
+                end
+		
+	end
+end
+
+Mp3Tool.setup
+Mp3Tool.inspect

data/lib/r2mp3.rb

@@ -1,3 +1,7 @@
+# R2mp3 Library
+# Exclusive to you by
+# Warachet Samtalee (zdk@codegent.com)
+
 require 'rubygems'
 require 'optparse'
 require 'optparse/time'
@@ -21,12 +25,18 @@ class Options < Hash
            opts.on('-r','--ra-to-mp3','convert .rm to mp3')do
              self[:ra] = true
            end
+           opts.on('-m','--mp3-to-mp3','convert mp3 to mp3')do
+             self[:mp3] = true
+           end
            opts.on('-f','--file [filename]','file') do |f|
              self[:file] = f
            end
            opts.on('-d','--dir [directoryname]','directory') do |d|
              self[:dir] = d
            end
+           opts.on('-b','--bitrate [kbps]','bitrate') do |b|
+             self[:bitrate] = b.to_i
+           end
            opts.on_tail('-h','--help','help') do
              puts opts
              exit
@@ -51,6 +61,7 @@ end
 class Mplayer
    # Can be used to dump any audio file to wav   
    def self.dump_to_wav(input, output, opts={})
+     puts "dump to wav"
      begin
       platform = `uname -a`
       binary = "#{%r{Linux} =~ platform}".empty?? "/Applications/mplayer":"mplayer"
@@ -72,6 +83,20 @@ class Mplayer
 end
 
 class Convert
+
+   def self.mp3_to_wav(input, output=nil, opts={})
+       puts "mp3 to wav"
+       conversion(:mp3, :wav, input, output, opts) do | input, output, opts |
+         Mplayer.dump_to_wav(input, output, opts)
+       end
+   end
+    
+   def self.mp3_to_mp3(input, output=nil, opts={})
+       puts "mp3 to mp3"
+       output ||= input.gsub(/\.rm$/,".mp3")
+       mp3_to_wav(input, 'temp.wav', opts) and wav_to_mp3('temp.wav', output, opts.merge({:delete_input=>true}))
+   end
+   
    def self.ra_to_wav(input, output=nil, opts={})
        conversion(:rm, :wav, input, output, opts) do | input, output, opts |
          Mplayer.dump_to_wav(input, output, opts)
@@ -94,7 +119,8 @@ class Convert
        aac_to_wav(input, 'temp.wav', opts) and wav_to_mp3('temp.wav', output, opts.merge({:delete_input=>true}))
    end
 
-   def self.wma_to_mp3(input, output=nil, opts={})
+   def self.wma_to_mp3(input, output=nil, opts = {})
+       p opts
        output ||= input.gsub(/\.wma$/,".mp3")
        wma_to_wav(input, 'temp.wav', opts) and wav_to_mp3('temp.wav', output, opts.merge({:delete_input=>true}))
    end
@@ -106,13 +132,17 @@ class Convert
    end
     
    def self.wav_to_mp3(input, output=nil, opts={})
+       puts "wav to mp3"
        conversion(:wav, :mp3, input, output, opts) do | input, output, opts |
           opts[:mode] ||= :stereo 
+          opts[:bitrate] ||= 64
+          puts "bitrate = #{opts[:bitrate]}"
           lame = LameAdapter.new
           lame.input_file input
           lame.output_file output
           lame.mode opts[:mode]
-         lame.convert!
+          lame.bitrate opts[:bitrate]
+          lame.convert!
        end
    end
     
@@ -128,82 +158,116 @@ class Convert
        success and File.exists? output_file
    end
     
-   def self.wma_dir_to_mp3(dirname)
+   def self.wma_dir_to_mp3(dirname, opts = {})
        Dir["#{dirname}/*.wma"].each do |name|
            if !name[/[\s]+/].nil? then
            new_name = name.gsub(" ","_").downcase
            FileUtils.mv "#{name}", "#{new_name}", :force => true  # no error
            name = new_name
            end
-         wma_to_mp3(name)
+         wma_to_mp3(name, nil, opts)
        end
     end
     
-   def self.wma_file_to_mp3(filename)
-       wma_to_mp3(filename)
+   def self.wma_file_to_mp3(filename, opts = {})
+       wma_to_mp3(filename, nil, opts)
    end
     
-   def self.aac_dir_to_mp3(dirname)
+   def self.aac_dir_to_mp3(dirname, opts = {})
        Dir["#{dirname}/*.m4a"].each do |name|
           if !name[/[\s]+/].nil? then
            new_name = name.gsub(" ","_").downcase
            FileUtils.mv "#{name}", "#{new_name}", :force => true  # no error
            name = new_name
           end
-         aac_to_mp3(name)
+         aac_to_mp3(name, nil, opts)
        end
    end
     
-   def self.aac_file_to_mp3(filename)
-       aac_to_mp3(filename)
+   def self.aac_file_to_mp3(filename, opts = {})
+       aac_to_mp3(filename, nil, opts)
    end
     
-   def self.ra_dir_to_mp3(dirname)
+   def self.ra_dir_to_mp3(dirname, opts = {})
        Dir["#{dirname}/*.rm"].each do |name|
          if !name[/[\s]+/].nil? then
          new_name = name.gsub(" ","_").downcase
          FileUtils.mv "#{name}", "#{new_name}", :force => true  # no error
          name = new_name
          end
-         ra_to_mp3(name)
+         ra_to_mp3(name, nil, opts)
+       end
+   end
+    
+   def self.ra_file_to_mp3(filename, opts = {})
+       ra_to_mp3(filename, nil, opts)
+   end
+   
+   def self.mp3_dir_to_mp3(dirname, opts = {})
+       Dir["#{dirname}/*.mp3"].each do |name|
+         if !name[/[\s]+/].nil? then
+         new_name = name.gsub(" ","_").downcase
+         FileUtils.mv "#{name}", "#{new_name}", :force => true  # no error
+         name = new_name
+         end
+         mp3_to_mp3(name, nil, opts)
        end
    end
     
-   def self.ra_file_to_mp3(filename)
-       ra_to_mp3(filename)
+   def self.mp3_file_to_mp3(filename, opts = {})
+       mp3_to_mp3(filename, nil, opts)
    end
+   
 end
 
 
 class Hash 
+      
    def to_mp3
      case $opts[:convert]
      when :wma
           unless $opts[:dir].nil? then 
               puts "convert all wma files in #{self[:dir]}"
-              Convert.wma_dir_to_mp3(self[:dir])
+              Convert.wma_dir_to_mp3(self[:dir], self)
           else
               puts "(wma) convert #{self[:file]} to mp3"
-              Convert.wma_file_to_mp3(self[:file])
+              Convert.wma_file_to_mp3(self[:file], self)
            end
      when :aac
            unless $opts[:dir].nil? then
               puts "convert all aac files in #{self[:dir]}"
-              Convert.aac_dir_to_mp3(self[:dir])
+              Convert.aac_dir_to_mp3(self[:dir], self)
            else
               puts "(aac) convert #{self[:file]} to mp3"
-              Convert.aac_file_to_mp3(self[:file])
+              Convert.aac_file_to_mp3(self[:file], self)
            end
      when :ra
            unless $opts[:dir].nil? then
               puts "convert all ra files in #{self[:dir]}"
-              Convert.ra_dir_to_mp3(self[:dir])
+              Convert.ra_dir_to_mp3(self[:dir], self)
            else
               puts "(ra) convert #{self[:file]} to mp3"
-              Convert.ra_file_to_mp3(self[:file])
+              Convert.ra_file_to_mp3(self[:file], self)
+           end
+     when :mp3
+           unless $opts[:dir].nil? then
+              puts "convert all mp3 files in #{self[:dir]}"
+              Convert.mp3_dir_to_mp3(self[:dir], self)
+           else
+              puts "(mp3) convert #{self[:file]} to mp3"
+              Convert.mp3_file_to_mp3(self[:file], self)
            end
      end
    end
+   
+   def bitrate kbps
+       self[:bitrate] = kbps
+   end
+   
+   def mode m
+       self[:mode] = m
+   end
+   
 end
 
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: r2mp3
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-10-16 00:00:00 +07:00
+  version: 0.1.1
+date: 2007-10-29 00:00:00 +07:00
 summary: A library for converting any audio to MP3 (MPEG-1 Layer3)
 require_paths: 
 - lib
@@ -32,10 +32,23 @@ files:
 - README
 - lib/r2mp3.rb
 - example/rm_dir
+- example/example1.wma
+- example/mp3_dir
+- example/example.mp3
 - example/wma_dir
 - example/aac_dir
 - example/example1.rb
+- example/example2.rb
 - example/cli_converter.rb
+- example/mp3_dir/example2.mp3
+- example/mp3_dir/example3.mp3
+- example/mp3_dir/example1.mp3
+- example/mp3_dir/example4.mp3
+- example/wma_dir/example1.wma
+- example/wma_dir/example3.wma
+- example/wma_dir/example4.wma
+- example/wma_dir/example2.wma
+- inspector/mp3inspector.rb
 test_files: []
 
 rdoc_options: []