X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=superrip.rb;h=9c5caec3d9469845e14f5378107c6a5cc7878a68;hb=49eda4c2fc082d2912c1adcfa0e06c9e3dbe550e;hp=0b1ef6fe3b5b626b7ce5d4528b57eda8fc0126b6;hpb=25d81bfb0e6b35a7019f0825d879a8d265f87dbf;p=cmccabe-bin

diff --git a/superrip.rb b/superrip.rb
index 0b1ef6f..9c5caec 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,34 +34,44 @@ end
 
 def get_number_of_tracks_on_cd
   look_for_tracks = false
-  IO.popen("cdda2wav -v summary -J dev=#{$cd_dev}", "r") do |io|
-    line = io.read.chomp
-    if (line =~ /^AUDIOtrack/) then
-      look_for_tracks = true
-    elsif (look_for_tracks == true) then
-      look_for_tracks = false
-      line =~ /[ \t]*1-([1234567890][1234567890]*)[^1234567890]/ \
-        or raise "couldn't understand cdda2wav output!"
-      return $1.to_i
+  IO.popen("cdda2wav -v summary -J dev=#{$cd_dev} 2>&1", "r") do |io|
+    io.readlines.each do |line|
+      line.chomp!
+      if (line =~ /^AUDIOtrack/) then
+        look_for_tracks = true
+      elsif (look_for_tracks == true) then
+        look_for_tracks = false
+        line =~ /[ \t]*1-([1234567890][1234567890]*)[^1234567890]/ \
+          or raise "couldn't understand cdda2wav output!"
+        return $1.to_i
+      end
     end
   end
   raise "couldn't find what we were looking for in cdda2wav output!"
 end
 
-def audiorip(track, number)
+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)
+  my_system("flac -f '#{track.wav_file_name}' \
+--output-name='#{track.flac_file_name}' &>/dev/null")
+  begin
+    my_system("flac --test '#{track.flac_file_name}' &>/dev/null")
+  rescue
+    raise "failed to encode #{track.flac_file_name}"
+  end
+  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
 
 #-----------------------------------------------------------------
@@ -82,12 +92,12 @@ class MyOptions
         opts.dry_run = true
         $fu_args = { :verbose => true, :noop => true }
       end
-      myparser.on("--tracklist", "-t",
+      myparser.on("--tracklist [FILE]", "-t",
             "Provide a list of tracks to use.") do |file|
         opts.manifest_file = file
         opts.partial = false
       end
-      myparser.on("--partial-tracklist", "-T",
+      myparser.on("--partial-tracklist [FILE]", "-T",
             "Provide a partial list of tracks to use.") do |file|
         opts.manifest_file = file
         opts.partial = true
@@ -101,7 +111,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" 
@@ -115,42 +126,59 @@ 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
+    "track(\"#{@name}\")"
   end
 end
 
 class Manifest
   def initialize(filename)
-    @tracks = Hash.new
-    eval(filename)
-    @tracks.each do |key, val|
-      @tracks[key] = Track.new(val)
+    @t = Hash.new
+    eval(File.new(filename).read)
+    @t.each do |key, val|
+      @t[key] = Track.new(val)
     end
+    # TODO: implement some shortcuts that make manifests easier to type.
+    # Probably avoiding the necessity to continue typing the album name if it is the same as the
+    # previous track's name would make things a lot easier without complicating everything too much.
   end
 
   def validate(num_tracks)
-    if (@tracks.empty?) then
+    if (@t.empty?) then
       raise "you must define some tracks"
     end
-    @tracks.each { |t| t.validate }
+    @t.each { |t| t.validate }
     if (not $opts.partial) then
       (1..num_tracks).each do |t|
-        if not @tracks[t].defined?
+        if not @t[t].defined?
           raise "don't know what to do with track #{t}"
         end
       end
     end
+    # TODO: make sure that tracks inside albums are in order
+    # i.e. we don't map track 2 to a name that sorts to before track 1
   end
 
   def rip(num_tracks)
-    (1..num_tracks).each do |t|
-      next unless @tracks.defined?(t)
-      audiorip(t)
+    (1..num_tracks).each do |tnum|
+      next unless @t.has_key?(tnum)
+      audiorip(tnum, @t[tnum])
+    end
+  end
+
+  def inspect
+    ret = ""
+    @t.keys.sort.each do |key|
+      ret = "#{ret}#{key}:'#{@t[key].inspect()}'\n"
     end
+    return ret
   end
 end
 
@@ -173,7 +201,8 @@ die_unless_installed("cdparanoia")
 die_unless_installed("cdda2wav")
 
 manifest = Manifest.new($opts.manifest_file)
+puts manifest.inspect
 num_tracks = get_number_of_tracks_on_cd()
-puts "num_tracks = #{num_tracks}"
-#manifest.rip(num_tracks)
+puts "found #{num_tracks} tracks"
+manifest.rip(num_tracks)
 exit 0