youpy-scissor 0.0.10 → 0.0.11

data/README.rdoc

@@ -1,15 +1,28 @@
 = Scissor
 
 == Description
-utility to chop mp3 files
+
+utility to chop sound files
+
+supported file format:
+
+* mp3
+* wav
+
+== Installation
 
 == Requirements
 
 * {ruby-mp3info}[http://ruby-mp3info.rubyforge.org/]
-* {FFmpeg}[http://ffmpeg.mplayerhq.hu/]
-* {Ecasound}[http://www.eca.cx/ecasound/]
 
-== Installation
+	gem install ruby-mp3info
+
+* {RiffLib}[http://rubyforge.org/projects/riff/]
+
+	gem install riff
+
+* {FFmpeg}[http://ffmpeg.mplayerhq.hu/]
+* {Ecasound}[http://www.eca.cx/ecasound/] 2.5.0 or higher
 
 === Archive Installation
 
@@ -21,10 +34,12 @@ utility to chop mp3 files
 
 == Features/Problems
 
+* When you concatenate two or more files, format(sample rate, bit rate, ...) mismatch causes unexpected changes to output file.
+
 == Synopsis
 
 	 foo = Scissor.new('foo.mp3')
-	 bar = Scissor.new('bar.mp3')
+	 bar = Scissor.new('bar.wav')
 
 	 # concat
 	 (foo + bar).to_file('foobar.mp3')

data/Rakefile

@@ -13,11 +13,11 @@ include FileUtils
 NAME              = "scissor"
 AUTHOR            = "youpy"
 EMAIL             = "youpy@buycheapviagraonlinenow.com"
-DESCRIPTION       = "utility to chop mp3 files"
+DESCRIPTION       = "utility to chop sound files"
 RUBYFORGE_PROJECT = "scissor"
 HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES         = %w(  )
-VERS              = "0.0.10"
+VERS              = "0.0.11"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
@@ -58,6 +58,7 @@ spec = Gem::Specification.new do |s|
   s.test_files        = Dir["test/test_*.rb"]
 
   s.add_dependency('ruby-mp3info')
+  s.add_dependency('riff')
   #s.required_ruby_version = '>= 1.8.2'
 
   s.files = %w(README.rdoc ChangeLog Rakefile) +

data/lib/scissor.rb

@@ -1,6 +1,7 @@
 require 'mp3info'
 require 'digest/md5'
 require 'pathname'
+require 'riff/reader'
 
 class Scissor
   class Error < StandardError; end
@@ -19,7 +20,7 @@ class Scissor
       @fragments << Fragment.new(
         Pathname.new(filename),
         0,
-        Mp3Info.new(filename).length)
+        SoundFile.new(filename).length)
     end
   end
 
@@ -188,13 +189,13 @@ class Scissor
     tmpdir = Pathname.new('/tmp/scissor-' + $$.to_s)
     tmpdir.mkpath
     tmpfile = tmpdir + 'tmp.wav'
-    cmd = %w/ecasound/
+    cmd = %w/ecasound -q/
 
     begin
       @fragments.each_with_index do |fragment, index|
         if !index.zero? && (index % 80).zero?
           run_command(cmd.join(' '))
-          cmd = %w/ecasound/
+          cmd = %w/ecasound -q/
         end
 
         fragment_tmpfile =
@@ -245,6 +246,35 @@ class Scissor
     end
   end
 
+  class SoundFile
+    SUPPORTED_FORMAT = %w/mp3 wav/
+
+    class Error < StandardError; end
+    class UnknownFormat < Error; end
+
+    def initialize(filename)
+      @filename = Pathname.new(filename)
+      @ext = @filename.extname.sub(/^\./, '').downcase
+
+      unless SUPPORTED_FORMAT.include?(@ext)
+        raise UnknownFormat
+      end
+    end
+
+    def length
+      case @ext
+      when 'mp3'
+        Mp3Info.new(@filename).length
+      when 'wav'
+        riff = Riff::Reader.open(@filename ,"r")
+        data = riff.root_chunk['data']
+        fmt = riff.root_chunk['fmt ']
+
+        data.length / fmt.body.unpack('s2i2')[3].to_f
+      end
+    end
+  end
+
   class Fragment
     attr_reader :filename, :start, :duration
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: youpy-scissor
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - youpy
@@ -22,7 +22,17 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: utility to chop mp3 files
+- !ruby/object:Gem::Dependency 
+  name: riff
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: utility to chop sound files
 email: youpy@buycheapviagraonlinenow.com
 executables: []
 
@@ -73,6 +83,6 @@ rubyforge_project: scissor
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: utility to chop mp3 files
+summary: utility to chop sound files
 test_files: []