youpy-scissor 0.0.2 → 0.0.3

data/README.rdoc

@@ -30,7 +30,7 @@ utility to chop mp3 files
 	 ((foo.slice(10, 1) + bar.slice(2, 3)) * 4).to_file('slicefoobarloop.mp3')
 
 	 # split
-	 (Scissor.new('sequence.mp3') / 16).to_file('split.mp3')
+	 (Scissor.new('sequence.mp3') / 16).first.to_file('split.mp3')
 
 == Copyright
 

data/Rakefile

@@ -17,7 +17,7 @@ DESCRIPTION       = "utility to chop mp3 files"
 RUBYFORGE_PROJECT = "scissor"
 HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES         = %w(  )
-VERS              = "0.0.2"
+VERS              = "0.0.3"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']

data/lib/scissor.rb

@@ -6,13 +6,12 @@ include FileUtils
 class Scissor
   class Error < StandardError; end
   class CommandNotFound < Error; end
+  class FileExists < Error; end
+  class EmptyFragment < Error; end
 
   attr_reader :fragments
 
   def initialize(filename = nil)
-    which('ffmpeg')
-    which('mp3wrap')
-
     @fragments = []
 
     if filename
@@ -96,13 +95,32 @@ class Scissor
     results = []
 
     count.times do |i|
-      results << slice(i, splitted_duration)
+      results << slice(i * splitted_duration, splitted_duration)
     end
 
     results
   end
 
-  def to_file(filename)
+  def to_file(filename, options = {})
+    if @fragments.empty?
+      raise EmptyFragment
+    end
+
+    which('ffmpeg')
+    which('mp3wrap')
+
+    options = {
+      :overwrite => false
+    }.merge(options)
+
+    if File.exists?(filename)
+      if options[:overwrite]
+        File.unlink(filename)
+      else
+        raise FileExists
+      end
+    end
+
     outfiles = []
     tmpdir = '/tmp/scissor-' + $$.to_s
     mkdir tmpdir
@@ -112,16 +130,25 @@ class Scissor
       outfile = tmpdir + '/' + index.to_s + '.mp3'
       outfiles << outfile
       cmd = "ffmpeg -i \"#{fragment.filename}\" -ss #{fragment.start} -t #{fragment.duration} #{outfile}"
+      puts cmd
       system cmd
     end
 
-    # concat mp3 files
-    cmd = "mp3wrap \"#{filename}\" #{outfiles.join(' ')}"
-    system cmd
+    if outfiles.size == 1
+      mv outfiles.first, filename
+    else
+      # concat mp3 files
+      outfile = tmpdir + '/concat.mp3'
+      cmd = "mp3wrap \"#{outfile}\" #{outfiles.join(' ')}"
+      puts cmd
+      system cmd
 
-    # fix duration and rename
-    cmd = "ffmpeg -i \"#{filename.sub(/\.mp3$/, '_MP3WRAP.mp3')}\" -acodec copy \"#{filename}\""
-    system cmd
+      # fix duration and rename
+      infile = tmpdir + '/concat_MP3WRAP.mp3'
+      cmd = "ffmpeg -i \"#{infile}\" -acodec copy \"#{filename}\""
+      puts cmd
+      system cmd
+    end
 
     rm_rf tmpdir
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: youpy-scissor
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - youpy