audio_hero 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c2302def47bb3bce747a181e0caf71bd92530fd
-  data.tar.gz: 1fbee736d23e738c3af37de7a94e027ff6484ec2
+  metadata.gz: 8c70b8a3e6428d14a447828fce06ae77f5c8b890
+  data.tar.gz: c1c59b50519a00aec1336fbf45b4b7dc02d7c01c
 SHA512:
-  metadata.gz: fe98aaa5ee92c8ade032260220062b4522d53f60432220a78035584670df58f759db248fb454c24b360083ce5d7a2fc04df09f29a942e2572019a8ff867c6651
-  data.tar.gz: e07d8ea56a688022dcd3fe3a1900a71d647a52fc025c5211f3649a3cf325d04b1efe36bb1b28fdf2d6395e67147d0e23f659c5172384ed58b316f4ba24a51f96
+  metadata.gz: d1b8aa51c4dec053e0158fadee1525d08958fbf7350496f1ce49b06e1b636deaaa6595922224ecf54787ad6e209c407472d1b96ee9a93eef1093dd0f841f4311
+  data.tar.gz: fb5a777a713d610da244b54b976654a3f41c536b5c2fd75538c203156be1e9ab694021cfecdc9fcca92f8b193a1e8cd5998233a7525841d531881c9487221b37

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/README.md

@@ -39,6 +39,11 @@ new_file = AudioHero::Sox.new(file).convert({output_options: "-c 1", output_form
 # Optional: Close the file after you are done for garbage collection.
 new_file.close!
 
+# AudioHero can also take a direct filepath string as input
+
+file_path = open("url/or/path/to/audio/file").path # "/path/to/tempfile"
+new_file = AudioHero::Sox.new(file_path).convert({output_options: "-c 1", output_format: "mp3", channel: "left"})
+
 # With no options hash it will runs this command by default: `sox -t input.mp3 -c 1 -b 16 -r 16k out.wav`
 AudioHero::Sox.new(file).convert
 ```

data/lib/audio_hero/version.rb

@@ -1,3 +1,3 @@
 module AudioHero
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/audio_hero.rb

@@ -14,7 +14,7 @@ module AudioHero
 
     def initialize(file, options={})
       @file = file
-      @basename = File.basename(@file.path)
+      @basename = get_basename(file)
     end
 
     # Usage: file = AudioHero::Sox.new(file).convert({output_options: "-c 1 -b 16 -r 16k", output_format: "mp3", channel: "left"}); file.close
@@ -31,7 +31,7 @@ module AudioHero
       else
         channel = nil
       end
-      src = @file
+
       # Default conversion to wav
       dst = Tempfile.new(["out", ".#{output_format}"])
       begin
@@ -42,11 +42,11 @@ module AudioHero
         parameters << ":dest"
         parameters << channel if channel
         parameters = parameters.flatten.compact.join(" ").strip.squeeze(" ")
-        success = Cocaine::CommandLine.new("sox", parameters).run(:source => File.expand_path(src.path), :dest => File.expand_path(dst.path))
+        success = Cocaine::CommandLine.new("sox", parameters).run(:source => get_path(@file), :dest => get_path(dst))
       rescue => e
         raise AudioHeroError, "There was an error converting #{@basename} to #{output_format}"
       end
-      src.close! if options[:gc] == "true"
+      garbage_collect(@file) if options[:gc] == "true"
       dst
     end
 
@@ -56,11 +56,8 @@ module AudioHero
       silence_level = options[:silence_level] || "0.03"
       effect = "silence 1 #{silence_duration} #{silence_level}% -1 #{silence_duration} #{silence_level}%"
       input_format = options[:input_format] ? options[:input_format] : "mp3"
-      output_format = options[:output_format] ? options[:output_format] : "wav"
+      output_format = options[:output_format] ? options[:output_format] : "wav" # Default to wav
 
-      # Default to wav
-      src = @file
-      # Default conversion to wav
       dst = Tempfile.new(["out", ".#{output_format}"])
       begin
         parameters = []
@@ -69,11 +66,11 @@ module AudioHero
         parameters << ":dest"
         parameters << effect
         parameters = parameters.flatten.compact.join(" ").strip.squeeze(" ")
-        success = Cocaine::CommandLine.new("sox", parameters).run(:source => File.expand_path(src.path), :dest => File.expand_path(dst.path))
+        success = Cocaine::CommandLine.new("sox", parameters).run(:source => get_path(@file), :dest => get_path(dst))
       rescue => e
         raise AudioHeroError, "There was an error converting #{@basename} to #{output_format}"
       end
-      src.close! if options[:gc] == "true"
+      garbage_collect(@file) if options[:gc] == "true"
       dst
     end
 
@@ -89,15 +86,11 @@ module AudioHero
       input_format = options[:input_format] ? options[:input_format] : "mp3"
       output_format = options[:output_format]
       output_filename = options[:output_filename] || "out"
-      # file2 = options[:file2]
       # Default to wav
       dir = Dir.mktmpdir
       format = output_format ? ".#{output_format}" : ".wav"
       dst = "#{dir}/#{output_filename}#{format}"
 
-      src = @file
-      # src2 = file2 if file2
-
       begin
         parameters = []
         parameters << "-t #{input_format}"
@@ -105,23 +98,17 @@ module AudioHero
         parameters << ":dest"
         parameters << effect
         parameters = parameters.flatten.compact.join(" ").strip.squeeze(" ")
-        success = Cocaine::CommandLine.new("sox", parameters).run(:source => File.expand_path(src.path), :dest => dst)
-        # success = Cocaine::CommandLine.new("sox", parameters).run(:source => File.expand_path(src2.path), :dest => dst) if src2
+        success = Cocaine::CommandLine.new("sox", parameters).run(:source => get_path(@file), :dest => dst)
       rescue => e
         raise AudioHeroError, "There was an error splitting #{@basename}"
       end
-      
-      if options[:gc] == "true"
-        src.close! 
-        # src2.close! if src2
-      end 
+      garbage_collect(@file) if options[:gc] == "true"
 
       Dir["#{dir}/**/*#{format}"]
     end
 
     def stats(options={})
       input_format = options[:input_format] ? options[:input_format] : "mp3"
-      src = @file
       begin
         parameters = []
         parameters << "-t #{input_format}"
@@ -129,28 +116,27 @@ module AudioHero
         parameters << "-n stats"
         parameters << "2>&1" # redirect stderr to stdout
         parameters = parameters.flatten.compact.join(" ").strip.squeeze(" ")
-        success = Cocaine::CommandLine.new("sox", parameters).run(:source => File.expand_path(src.path))
+        success = Cocaine::CommandLine.new("sox", parameters).run(:source => get_path(@file))
       rescue => e
         raise AudioHeroError, "These was an issue getting stats from #{@basename}"
       end
-      src.close! if options[:gc] == "true"
+      garbage_collect(@file) if options[:gc] == "true"
       parse_stats(success)
     end
 
     # Requires custom version of yaafe
     def extract_features(options={})
-      src = @file
       rate = options[:sample_rate] || "8000"
       begin
         parameters = []
         parameters << "-r #{rate}"
         parameters << ":source"
         parameters = parameters.flatten.compact.join(" ").strip.squeeze(" ")
-        success = Cocaine::CommandLine.new("yaafehero", parameters).run(:source => File.expand_path(src.path))
+        success = Cocaine::CommandLine.new("yaafehero", parameters).run(:source => get_path(@file))
       rescue => e
         raise AudioHeroError, "These was an issue getting stats from #{@basename}"
       end
-      src.close! if options[:gc] == "true"
+      garbage_collect(@file) if options[:gc] == "true"
       MessagePack.unpack(success)
     end
 
@@ -160,7 +146,6 @@ module AudioHero
       output_options = options[:output_options]
       effect = options[:effect]
       output_format = options[:output_format] ? options[:output_format] : "wav"
-      src = @file
 
       # Default to wav
       dst = Tempfile.new(["out", ".#{output_format}"])
@@ -174,17 +159,56 @@ module AudioHero
         parameters << effect if effect
         parameters = parameters.flatten.compact.join(" ").strip.squeeze(" ")
         sox = Cocaine::CommandLine.new("sox", parameters)
-        command = sox.command(source: File.expand_path(src.path), dest: File.expand_path(dst.path))
-        success = sox.run(source: File.expand_path(src.path), dest: File.expand_path(dst.path))
+        command = sox.command(:source => get_path(@file), :dest => get_path(dst))
+        success = sox.run(:source => get_path(@file), :dest => get_path(dst))
       rescue => e
         raise AudioHeroError, "There was an error excuting command: #{command}"
       end
-      src.close! if options[:gc] == "true"
+      garbage_collect(@file) if options[:gc] == "true"
       dst
     end
 
     private
 
+    def get_basename(file)
+      case file
+      when String
+        File.basename(file)
+      when Tempfile
+        File.basename(file.path)
+      when File
+        File.basename(file.path)
+      else
+        raise AudioHeroError, "Unknown input file type #{file.class}"
+      end
+    end
+
+    def get_path(file)
+      case file
+      when String
+        File.expand_path(file)
+      when Tempfile
+        File.expand_path(file.path)
+      when File
+        File.expand_path(file.path)
+      else
+        raise AudioHeroError, "Unknown input file type #{file.class}"
+      end
+    end
+
+    def garbage_collect(file)
+      case file
+      when String
+        File.delete(file)
+      when Tempfile
+        file.close!
+      when File
+        File.delete(file.path)
+      else
+        raise AudioHeroError, "Unknown input file type #{file.class}"
+      end
+    end
+
     def parse_stats(stats)
       hash = Hash.new { |h, k| h[k] = {} }
       if stats.include? "Left"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_hero
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - litenup
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-23 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,11 +95,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- audio_hero-0.1.0.gem
-- audio_hero-0.1.1.gem
-- audio_hero-0.1.2.gem
-- audio_hero-0.1.3.gem
-- audio_hero-0.1.4.gem
 - audio_hero.gemspec
 - bin/console
 - bin/setup