X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=superrip.rb;h=d0696337ba45fa1fb3eb3aa11a1bb1dbed3b24fa;hb=1f0784d8a6ef4a9f6ac46d8b7903262f2fee6b75;hp=3826483042d060120025b38310450ae49c33b6be;hpb=b046723cf8f054d29927c9fe421d0cbaaaed44c8;p=cmccabe-bin

diff --git a/superrip.rb b/superrip.rb
index 3826483..d069633 100755
--- a/superrip.rb
+++ b/superrip.rb
@@ -23,7 +23,7 @@ $cd_dev = "/dev/cdrom"
 #-----------------------------------------------------------------
 def my_system(cmd)
   puts cmd
-  system(cmd) unless $opts.dry_run
+  system(cmd) unless $opts.dry_run == true
   ($?.exitstatus == 0) or raise "#{cmd} failed"
 end
 
@@ -34,9 +34,11 @@ end
 
 def get_number_of_tracks_on_cd
   look_for_tracks = false
+  lines = Array.new
   IO.popen("cdda2wav -v summary -J dev=#{$cd_dev} 2>&1", "r") do |io|
     io.readlines.each do |line|
       line.chomp!
+      lines << line
       if (line =~ /^AUDIOtrack/) then
         look_for_tracks = true
       elsif (look_for_tracks == true) then
@@ -47,23 +49,42 @@ def get_number_of_tracks_on_cd
       end
     end
   end
-  raise "couldn't find what we were looking for in cdda2wav output!"
+  raise "couldn't find what we were looking for in cdda2wav output! \
+output:#{lines.join('\n')}"
 end
 
-def audiorip(track, number)
+# Process the WAV file into an MP3 and FLAC file.
+# This is done in a background process.
+def process_wav(track)
+  FileUtils.mkdir_p(track.flac_dir, $fu_args)
+  my_system("flac -f '#{track.wav_file_name}' \
+--output-name='#{track.flac_file_name}' &>/dev/null")
+  my_system("flac --test '#{track.flac_file_name}' &>/dev/null")
+  FileUtils.mkdir_p(track.mp3_dir, $fu_args)
+  my_system("lame -q 1 -b 192 '#{track.wav_file_name}' \
+'#{track.mp3_file_name}' &>/dev/null")
+  FileUtils.rm_f(track.wav_file_name, $fu_args)
+end
+
+def audiorip(tnum, track)
   begin
-    my_system("nice -1 cdparanoia -w -d #{$cd_dev} #{number}")
+    my_system("nice -1 cdparanoia -w -d #{$cd_dev} #{tnum}")
   rescue
-    raise "failed to rip track #{number} (#{track.name})"
+    raise "failed to rip track #{tnum} (#{track.name})"
   end
   # cdparanoia always outputs to cdda.wav
   FileUtils.mv("cdda.wav", track.wav_file_name, $fu_args)
 
-  # TODO: spawn a thread to do this stuff in the background
-  FileUtils.mkdir_p(track.flac_dir, $fu_args)
-  my_system("flac -c #{track.wav_file_name} > #{track.flac_file_name}")
-  my_system("lame -q 1 -b 192 #{track.wav_file_name} > #{track.mp3_file_name}")
-  FileUtils.rm_f(track.wav_file, $fu_args)
+  # TODO: if there are more than N processes, wait for one of them to terminate
+  pid = Process.fork
+  if (pid == nil) then
+    begin
+      process_wav(track)
+      Kernel.exit(0)
+    rescue
+      Kernel.exit(1)
+    end
+  end
 end
 
 #-----------------------------------------------------------------
@@ -103,7 +124,8 @@ class MyOptions
 end
 
 class Track
-  attr_accessor :name, :flac_dir, :flac_file_name, :mp3_dir, :mp3_file_name
+  attr_accessor :name, :flac_dir, :flac_file_name, :mp3_dir, :mp3_file_name,
+    :wav_file_name
   def initialize(name)
     if name =~ /\[LL\]/ then
       raise "you can't include [LL] in a track name" 
@@ -117,15 +139,15 @@ class Track
     (name =~ /([^\/][^\/]*)\/([^\/]*[^\/])/) or \
       raise "track name must be of the form 'foo/bar'"
     @name = name
-    @flac_dir = "#{1} [LL]"
-    @flac_file_name = "#{@flac_dir}/#{2}.flac"
-    @mp3_dir = "#{1}"
-    @mp3_file_name = "#{@mp3_dir}/#{2}.mp3"
-    @wav_file_name = "#{1}__#{2}.wav"
+    @flac_dir = "#{$1} [LL]"
+    @flac_file_name = "#{@flac_dir}/#{$2}.flac"
+    @mp3_dir = "#{$1}"
+    @mp3_file_name = "#{@mp3_dir}/#{$2}.mp3"
+    @wav_file_name = "#{$1}__#{$2}.wav"
   end
 
   def inspect
-    "#{@name}"
+    "track(\"#{@name}\")"
   end
 end
 
@@ -158,9 +180,9 @@ class Manifest
   end
 
   def rip(num_tracks)
-    (1..num_tracks).each do |t|
-      next unless @t.defined?(t)
-      audiorip(t)
+    (1..num_tracks).each do |tnum|
+      next unless @t.has_key?(tnum)
+      audiorip(tnum, @t[tnum])
     end
   end
 
@@ -192,8 +214,8 @@ die_unless_installed("cdparanoia")
 die_unless_installed("cdda2wav")
 
 manifest = Manifest.new($opts.manifest_file)
-#puts manifest.inspect
+puts manifest.inspect
 num_tracks = get_number_of_tracks_on_cd()
 puts "found #{num_tracks} tracks"
-#manifest.rip(num_tracks)
+manifest.rip(num_tracks)
 exit 0