speak_slow 0.0.2 → 0.0.3

data/lib/speak_slow.rb

@@ -111,20 +111,23 @@ module SpeakSlow
     #     `mv #{temp_filepath} #{out_filepath}`
     #   end      
     # end
-    
+     
     def apply_sox_to_wav(in_filepath, out_filepath)
       puts "Applying SoX functions to WAV (this might take a few minutes or more)"
       # silence = "silence 0 1 0.3 -32d"
       # silence = "silence 1 0.005 -32d 1 0.3 -32d"
       silence = "silence 1 0.01 1% 1 0.3 1%"
-      if @speed and @speed != 1
+      if @speed and @speed != 1 and @silence and @silence != 0 #speed and silence
         speed = "tempo -s #{@speed}"
         pad = "pad 0 #{@silence.to_f * @speed}"
         `#{@sox} #{in_filepath} -p #{silence} #{pad} : restart | #{@sox} - -p | #{@sox} - #{out_filepath} #{speed}`
-      elsif @silence and @silence != 0
+      elsif @speed and @speed != 1 #only speed
+        speed = "tempo -s #{@speed}"
+        `#{@sox} #{in_filepath} #{out_filepath} #{speed}`
+      elsif @silence and @silence != 0 #only silence
         pad = "pad 0 #{@silence.to_f}"
         `#{@sox} #{in_filepath} -p #{silence} #{pad} : restart | #{@sox} - #{out_filepath} `
-      else
+      else #nothing changed
         `cp #{in_filepath} #{out_filepath}`
       end
     end

data/lib/speak_slow.rb.orig

@@ -0,0 +1,171 @@
+require "speak_slow/version"
+require "rubygems"
+require "progressbar"
+
+SOX = "/usr/local/bin/sox"
+SOXI = "/usr/local/bin/soxi"
+
+module SpeakSlow
+  DATA_DIR = File.expand_path(File.dirname(__FILE__) + "/../data")
+  
+  class Converter
+    def initialize(in_filepath, out_filepath)
+      
+      @sox = check_command(SOX)
+      @soxi = check_command(SOXI)
+            
+      if /([^\/]+)\.([^\.]+)\z/ =~ in_filepath and File.exists?(in_filepath)
+        @in_filepath = in_filepath
+        @basename = File.basename(in_filepath, ".*")
+        @in_format = $2
+      else
+        puts "The filename does not exist or not have a valid format"
+        exit
+      end
+      
+      if /([^\/]+)\.([^\.]+)\z/ =~ out_filepath
+        @out_filepath = out_filepath
+        @out_format = $2
+        @outdir = File.dirname(out_filepath)        
+      else
+        puts "The filename does not have a valid format"
+        exit
+      end
+
+      unless File.exists?(@outdir) && File::ftype(@outdir) == "directory"
+        puts "The output directory does not exist"
+        exit
+      end
+            
+      unless ["wav", "mp3"].index @out_format
+        puts "The output format specified is not available"
+        exit
+      end
+    end
+    
+    def execute(speed = 1, silence = 0)
+      @silence = silence
+      @speed = speed
+      temp_wav_original = @outdir + "/" + @basename + "-temp-original.wav"
+      temp_wav_result = @outdir + "/" + @basename + "-temp-result.wav"
+      if @in_format != "wav" # @in_format == "mp3"
+        convert_to_wav(@in_filepath, temp_wav_original)
+      elsif @in_format == "wav"
+        `cp #{@in_filepath} #{temp_wav_original}`        
+      end
+      
+      apply_sox_to_wav(temp_wav_original, temp_wav_result)
+      # split_wav(temp_wav_original)
+      # merge_wav(temp_wav_result)
+      
+      if @out_format == "mp3"
+        convert_to_mp3(temp_wav_result, @out_filepath)
+        `rm #{temp_wav_original} #{temp_wav_result}`
+      elsif @out_format == "wav"
+        `mv #{temp_wav_result} #{@out_filepath}; rm #{temp_wav_original}`   
+      end
+    end
+    
+    # def split_wav(in_filepath)
+    #   puts "Splitting WAV to segments"
+    #   result = `#{@sox} #{in_filepath} #{@outdir}/split-.wav silence 0 1 0.3 -32d : newfile : restart`
+    # end
+    # 
+    # def merge_wav(out_filepath)
+    #   temp_filepath = @outdir + "/temp.wav"
+    #   files = []
+    #   Dir.foreach(@outdir) do |file|
+    #     next unless /^split\-\d+\.wav$/ =~ file
+    #     files << @outdir + "/" + file      
+    #   end
+    #   index = 0
+    #   puts "Merging segments back to one WAV file"
+    #   bar = ProgressBar.new(@basename, files.size)        
+    #   files.sort.each do |filepath|
+    #     length = `#{@soxi} -D #{filepath}`.to_f
+    #     num_seconds = @silence == "auto" ? length.to_i + 1 : @silence.to_i
+    #     index += 1      
+    #     bar.inc(1)
+    #     if index == 1
+    #       File.rename(filepath, out_filepath)
+    #       next
+    #     end
+    # 
+    #     if length == 0 or @silence.to_f == 0
+    #       `#{@sox} #{out_filepath} #{filepath} #{temp_filepath} ; mv #{temp_filepath} #{out_filepath} ; rm #{filepath}`          
+    #     else
+    #       if @silence == "auto"
+    #         silence_length =  length
+    #       elsif @speed and @speed != 1
+    #         silence_length = @silence.to_f / @speed * 1
+    #       else 
+    #         silence_length = @silence
+    #       end
+    #       `#{@sox} #{out_filepath} -p pad 0 #{silence_length} | #{@sox} - #{filepath} #{temp_filepath} ; mv #{temp_filepath} #{out_filepath} ; rm #{filepath}`
+    #     end
+    #   end
+    #   print "\n"
+    #   puts "Changing speed of the resulting WAV"
+    #   if @speed and @speed.to_f != 1.0
+    #     `#{@sox} #{out_filepath} #{temp_filepath} tempo -s #{@speed}`
+    #     `mv #{temp_filepath} #{out_filepath}`
+    #   end      
+    # end
+    
+    def apply_sox_to_wav(in_filepath, out_filepath)
+      puts "Applying SoX functions to WAV (this might take a few minutes or more)"
+      # silence = "silence 0 1 0.3 -32d"
+      # silence = "silence 1 0.005 -32d 1 0.3 -32d"
+      silence = "silence 1 0.01 1% 1 0.3 1%"
+      if @speed and @speed != 1 and @silence and @silence != 0 #speed and silence
+        speed = "tempo -s #{@speed}"
+        pad = "pad 0 #{@silence.to_f * @speed}"
+        `#{@sox} #{in_filepath} -p #{silence} #{pad} : restart | #{@sox} - -p | #{@sox} - #{out_filepath} #{speed}`
+<<<<<<< HEAD
+      elsif @speed and @speed != 1 #only speed
+        speed = "tempo -s #{@speed}"
+        `#{@sox} #{in_filepath} #{out_filepath} #{speed}`
+      elsif @silence and @silence != 0 #only silence
+        pad = "pad 0 #{@silence.to_f}"
+        `#{@sox} #{in_filepath} -p #{silence} #{pad} : restart | #{@sox} - #{out_filepath} `
+      else #nothing changed
+=======
+      elsif @silence and @silence != 0
+        pad = "pad 0 #{@silence.to_f}"
+        `#{@sox} #{in_filepath} -p #{silence} #{pad} : restart | #{@sox} - #{out_filepath} `
+      else
+>>>>>>> origin/master
+        `cp #{in_filepath} #{out_filepath}`
+      end
+    end
+
+    def convert_to_wav(in_filepath, out_filepath)
+      basename = File.basename(in_filepath )
+      puts "Converting to WAV: #{basename}"      
+      `#{@sox} #{in_filepath} #{out_filepath}`
+    end
+    
+    def convert_to_mp3(in_filepath, out_filepath)
+      basename = File.basename(out_filepath)
+      puts "Converting WAV to MP3: #{basename}"
+      `#{@sox} #{in_filepath} #{out_filepath}`
+    end
+    
+    def check_command(command)
+      basename = File.basename(command)
+      path = ""
+      print "Checking #{basename} command: "
+      if open("| which #{command} 2>/dev/null"){ |f| path = f.gets }
+        puts "detected at #{path}"
+        return path.strip
+      elsif open("| which #{basename} 2>/dev/null"){ |f| path = f.gets }
+        puts "detected at #{path}"
+        return path.strip
+      else
+        puts "not installed to the system"
+        exit
+      end
+    end
+        
+  end # of class
+end # of module

data/lib/speak_slow/version.rb

@@ -1,3 +1,3 @@
 module SpeakSlow
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/speak_slow/version.rb.orig

@@ -0,0 +1,7 @@
+module SpeakSlow
+<<<<<<< HEAD
+  VERSION = "0.0.3"
+=======
+  VERSION = "0.0.2"
+>>>>>>> origin/master
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: speak_slow
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -77,7 +77,9 @@ files:
 - data/MLK_Dream.mp3
 - data/MLK_Dream.wav
 - lib/speak_slow.rb
+- lib/speak_slow.rb.orig
 - lib/speak_slow/version.rb
+- lib/speak_slow/version.rb.orig
 - speak_slow.gemspec
 - test/speak_slow_test.rb
 homepage: http://github.com/yohasebe/speak_slow