X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=superrip.rb;h=e7acb5e8001e806e21c041a4f21a06ad3295c16a;hb=b4fb215cf428f1fd85c15d29c5d3b6cfcca2e039;hp=b6c56174ba279d276736ffb0ea4bb82df5d3bef1;hpb=32830ca1bcd155b9458d30f67e2bc4b5d9324e45;p=cmccabe-bin

diff --git a/superrip.rb b/superrip.rb
index b6c5617..e7acb5e 100755
--- a/superrip.rb
+++ b/superrip.rb
@@ -16,7 +16,6 @@ require 'ostruct'
 #-----------------------------------------------------------------
 # constants
 #-----------------------------------------------------------------
-$cd_dev = "/dev/cdrom"
 $children = Hash.new
 
 #-----------------------------------------------------------------
@@ -36,7 +35,7 @@ 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.popen("cdda2wav -v summary -J dev=#{$opts.cd_dev} 2>&1", "r") do |io|
     io.readlines.each do |line|
       line.chomp!
       lines << line
@@ -57,24 +56,24 @@ end
 # 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)
+  FileUtils.mkdir_p(track.flac_dir, verbose: true, noop: !$opts.dry_run)
   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)
+  FileUtils.mkdir_p(track.mp3_dir, verbose: true, noop: !$opts.dry_run)
   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)
+  FileUtils.rm_f(track.wav_file_name, verbose: true, noop: !$opts.dry_run)
 end
 
 def audiorip(tnum, track)
   begin
-    my_system("nice -1 cdparanoia -w -d #{$cd_dev} #{tnum}")
+    my_system("nice -1 cdparanoia -w -d #{$opts.cd_dev} #{tnum}")
   rescue
     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)
+  FileUtils.mv("cdda.wav", track.wav_file_name, verbose: true, noop: !$opts.dry_run)
 
   # If there are too many processes, wait for one of them to terminate
   if ($children.keys.length > $opts.max_children) then
@@ -108,16 +107,19 @@ class MyOptions
     opts = OpenStruct.new
     opts.dry_run = false
     opts.max_children = 4
-    $fu_args = { :verbose => true }
+    opts.cd_dev = "/dev/cdrom"
 
     # Fill in opts values
     parser = OptionParser.new do |myparser|
       myparser.banner = "Usage: #{ File.basename($0) } [opts]"
       myparser.separator("Specific options:")
+      myparser.on("--dev [DEV]", "-D",
+                  "choose the cdrom device file to use") do |dev|
+        opts.cd_dev = dev
+      end
       myparser.on("--dry-run", "-d",
             "Show what would be done, without doing it.") do |a|
         opts.dry_run = true
-        $fu_args = { :verbose => true, :noop => true }
       end
       myparser.on("--tracklist [FILE]", "-t",
             "Provide a list of tracks to use.") do |file|
@@ -189,7 +191,13 @@ class Manifest
     if (@t.empty?) then
       raise "you must define some tracks"
     end
-    if (not $opts.partial) then
+    if ($opts.partial) then
+      highest_track = @t.keys.sort[-1]
+      if (num_tracks < highest_track) then
+        raise "can't rip track #{highest_track}, because there are \
+only #{num_tracks} tracks"
+      end
+    else
       (1..num_tracks).each do |tnum|
         if not @t.has_key?(tnum)
           raise "don't know what to do with track #{tnum}"