sensible-cinema 0.18.2 → 0.18.3

data/README

@@ -158,6 +158,8 @@ If it says "audio problem try pcm" then you can add
 "audio_codec" => "lavc"
 to your EDL and try again.
 
+Also if your DVD playback has no audio, try the "lavc" setting, above.  And report it (see feedback).
+
 == Feedback ==
 
 Feedback, including feature requests, comments, etc. welcome.

data/Rakefile

@@ -63,8 +63,11 @@ task 'bundle_dependencies' => 'gemspec' do
    dependencies = spec.runtime_dependencies
    dependencies = (dependencies + get_transitive_dependencies(dependencies)).uniq
    Gem.loaded_specs.select{|name, spec| name == 'os'}
-   Dir['vendor/cache/**/*'].each{|f|
-     FileUtils.rm_rf f unless f =~ /jruby.*jar/ # that one takes too long to download...
+   Dir['vendor/cache/*'].each{|f|
+    unless f =~ /jruby.*jar/ # that one takes too long to download...
+      FileUtils.rm_rf f
+      raise 'unable to delete ' + f if File.exist?(f)
+    end
    }
    FileUtils.mkdir_p 'vendor/cache'
    Dir.chdir 'vendor/cache' do

data/TODO

@@ -4,30 +4,18 @@
 
   simplify/de-bugify
   
-    that button shows up? (issue 10)
-    
-    EDL for blender movie...
-    re-run latest preview -> auto play in smplayer
-    move that one button *out* ...
     only pick a drive once per session
     only pick output filename once per session...
+      does this allow me to kill that other button?
+        if not: re-run latest preview -> auto play in smplayer
     kill mencoder instances.
   
-calculating disk's unique id...
-F:\, Roger's Wedding, a2e3ece630251e4a785218ce71a20ce1
-got fatal exception
-D:\dev\sensible-cinema-never-commit-from-here\zamples\edit_decision_lists\dvds/pack_wedding_2007-03-03.txt:12: syntax error, unexpected tSTRING_BEG
-
-"disk_unique_id" => "a2e3ece630251e4a785218ce71a20ce1",
-^
-D:\dev\sensible-cinema-never-commit-from-here\zamples\edit_decision_lists\dvds/pack_wedding_2007-03-03.txt:1:in `parse_string'
-  during "initial create rip" can watch it (unedited) while it's still ripping (mplayer)
-  
   assert that at least one drive has a DVD in it...maybe loop refuse with message until this?
-  disallow choosing empty drive? fail cleaner? (issue 11)
 
 == slightly lower than that, somewhat ordered ==
 
+  disallow choosing empty drive? fail cleaner? (issue 11)
+  make them acknowledge "just because it lacks profanity...does not immediately make it an inspiring experience."
   compare computer DVD timings with physical player...
   
   mpeg is lossy (at least my current one pass one is)
@@ -44,11 +32,13 @@ D:\dev\sensible-cinema-never-commit-from-here\zamples\edit_decision_lists\dvds/p
   play a bigger noise when totally done...(dvd flick'ish...)
   note that this can corrupt your soul!
     don't watch it if it's dark! come on!
+    dove.org, your kids will find the originals!
   does ffdshow let WMP playback the audio on those files?
 
 == DVD backlog (unordered, some very low prio, basically never do) ==
 
-  fix some specz
+  @mplayer you *die* with edl's on many DVD's...
+  with "preview segment" can't you preview it once it has passed that segment?
   can pull from imdb at package time [?]
   delete fulli file
     except if it's a specific scene run...
@@ -68,6 +58,7 @@ D:\dev\sensible-cinema-never-commit-from-here\zamples\edit_decision_lists\dvds/p
     advertise in christian places
     alternative.to
     blogs that have ever mentioned clearplay :P
+    free google adwords (?)
   LLC before ever pay anyone, if I ever do
   @DVD flick: support multi-track audio/subtitles (if they're already in the streams...)
   note the mplayer/smplayer as a player fast forward feature...
@@ -77,7 +68,6 @@ D:\dev\sensible-cinema-never-commit-from-here\zamples\edit_decision_lists\dvds/p
       provide link for cheap DVD decoder if absent [ffdshow?] :)
     "round conservatively, write no file" playback
       mplayer batch (playlist?)
-    can generate mplayer EDL's and play them...hmm...smplayer them?
     "round conservatively, yes write file"
       then I guess they could play it back immediately...?
     get half-way through (rip, start writing edited copy), then start playing back as writing edited full copy
@@ -125,6 +115,9 @@ D:\dev\sensible-cinema-never-commit-from-here\zamples\edit_decision_lists\dvds/p
 @VLC: hard crash when ripping that one DVD...long one, about the constitution...
 in general, fine tune burning with various things...
 
+
+@rspec: it appears to *undo* my stub's after the test, so background threads choke (take out after...)
+
 make sure can work with very large DVD's...
   can use a fast temp drive, save through it to another :P
     (when they have two...)
@@ -147,6 +140,9 @@ Note to people: clean your disks!
 
 @mencoder: cannot rip from dvd with -ovc copy -oac copy (tearing)
 
+@ffmpeg: rip to fulli mpeg -> ffmpeg -ovc copy -oac copy out.mpg -> no audio!
+   and to .avi sometimes works, sometimes it results in static!
+
 burnable to DVD/CD/multi DVD automagically... (auto-burn insert your new disk!)
     can *re-use* original navigation stuffs, less the profanity (is that possible? VobBlanker help, perhaps?)
   can lop off sections to save space (?)

data/VERSION

@@ -1 +1 @@
-0.18.2
+0.18.3

data/bin/sensible-cinema

@@ -78,7 +78,7 @@ module SensibleSwing
     def initialize
       super "Sensible-Cinema"
       version = File.read(File.dirname(__FILE__) + "/../VERSION")
-      p version
+      puts "v. " + version.strip
       if !(Storage['main_license_accepted'] == version)
         show_blocking_license_accept_dialog 'Sensible Cinema', 'gplv3', 'http://www.gnu.org/licenses/gpl.html'
         show_blocking_license_accept_dialog 'Sensible Cinema', 'LICENSE file', File.expand_path(File.dirname(__FILE__) + "/../LICENSE.TXT"), 'LICENSE file', 'I acknowledge that I have read the LICENSE file.'
@@ -105,26 +105,24 @@ module SensibleSwing
         do_copy_dvd_to_hard_drive false
       }
       
-      @edl = new_jbutton( "Watch from DVD edited", false )
-      @edl.on_clicked {
+      @mplayer_edl = new_jbutton( "Watch DVD on computer edited realtime", false )
+      @mplayer_edl.on_clicked {
         drive, dvd_volume_name, md5sum, edl_path, descriptors = choose_dvd_and_edl_for_it
         temp_dir = Dir.tmpdir
         temp_file = temp_dir + '/mplayer.temp.edl'
         edl_contents = MplayerEdl.convert_to_edl descriptors
         File.write(temp_file, edl_contents)
-        title = descriptors["dvd_title_track"] || "1"
-        # oh the insanity...
+        title_track = get_title_track(descriptors)
+        # oh the insanity of the console UI...LODO more user friendly player
         popup = NonBlockingDialog.new("Running mplayer.  To control it, use space for pause.\n
         Also right and left arrows to seek, F key for full screen,
         q to quit.")
         # LODO dry up mplayer opts...
-        # LODO more user friendly re-player...
-        command =  "mplayer dvdnav://#{title} -nocache -alang en -sid 1000 -edl #{File.expand_path temp_file} -dvd-device #{drive}"
-        p command
-        system_non_blocking command
+        command =  "mplayer dvdnav://#{title_track} -nocache -alang en -sid 1000 -edl #{File.expand_path temp_file} -dvd-device #{drive}"
+        Thread.new { system_blocking command; popup.dispose }
       }
 
-      @watch_unedited = new_jbutton("Watch the current DVD unedited (from hard drive)", true)
+      @watch_unedited = new_jbutton("Watch a DVD unedited (while grabbing to hard drive)", true)
       @watch_unedited.on_clicked {
         path = RubyWhich.new.which('smplayer')
         path2 = RubyWhich.new.which('mplayer')
@@ -144,21 +142,13 @@ module SensibleSwing
             on_success.call
           else
             Thread.new { 
-              sleep 5; on_success.call # start it anyway :) 
+              sleep 5; on_success.call # start it anyway, a bit delayed to let it start spooling to disk... 
             }
             #@after_success_once = on_success # shenanigans to be able to let that thread run...
           end
         end
       }
 
-      @open_list = new_jbutton("Open/Edit a pre-existing DVD Edit List", true)
-      @open_list.on_clicked {
-        dialog = FileDialog.new(self, "Pick file to edit")
-        dialog.set_directory EDL_DIR
-        filename = dialog.go
-        open_file_to_edit_it filename if filename
-      }
-
       @preview_section = new_jbutton( "Preview a certain time frame (edited)", true )
       @preview_section.on_clicked {
         success_no_run, wrote_to_here_fulli = do_copy_dvd_to_hard_drive true
@@ -172,12 +162,20 @@ module SensibleSwing
         end
       }
 
-      @rerun_preview = new_jbutton( "Re-run most recently watched preview time", true )
+      @rerun_preview = new_jbutton( "Re-run most recently watched preview time frame", true )
       @rerun_preview.on_clicked {
         repeat_last_copy_dvd_to_hard_drive
       }
 
-      @create_new_edl_for_current_dvd = new_jbutton("Create new Edit Decision List for current DVD", true)
+      @open_list = new_jbutton("Open/Edit a pre-existing DVD Edit List", true)
+      @open_list.on_clicked {
+        dialog = FileDialog.new(self, "Pick file to edit")
+        dialog.set_directory EDL_DIR
+        filename = dialog.go
+        open_file_to_edit_it filename if filename
+      }
+
+      @create_new_edl_for_current_dvd = new_jbutton("Create new Edit Decision List for a DVD", true)
       @create_new_edl_for_current_dvd.on_clicked do
         drive, volume, md5 = choose_dvd_drive
         name = get_user_input("Enter DVD name for #{volume}")
@@ -193,11 +191,12 @@ module SensibleSwing
   "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
 ],
 
-"name" => "#{name}"
+"name" => "#{name}",
 "disk_unique_id" => "#{md5}",
 
-# "dvd_title_track" => "1", # most DVD's use title 1. Yours might not.  If it doesn't record the right length track, see http://betterlogic.com/roger/2010/11/how-to-use-vlc-to-tell-how-many-titles-and-chapters-and-which-is-the-main/
+# "dvd_title_track" => "1", # most DVD's use title 1. Yours might not.  If it plays anything except the main title, see http://goo.gl/QHLIF
 # "not edited out stuff" => "",
+# "closing thoughts" => "still a fairly dark movie",
 
 EOL
         filename = EDL_DIR + "\\" + name.gsub(' ', '_') + '.txt'
@@ -207,7 +206,7 @@ EOL
 
       end
 
-      @display_unique = new_jbutton( "Calculate current DVD's unique ID", true ).on_clicked {
+      @display_unique = new_jbutton( "Display a DVD's unique ID", true ).on_clicked {
         drive, volume, md5 = choose_dvd_drive
         # display it, allow them to copy and paste it out
         get_user_input("#{drive} #{volume} for your copying+pasting pleasure (highlight, then ctrl+c to copy)        \n
@@ -305,7 +304,11 @@ EOL
     def single_edit_list_matches_dvd md5
       return unless md5 # ignore nil searches, where it wasn't set in the .txt file
       matching =  Dir[EDL_DIR + '/*.txt'].select{|file|
-        EdlParser.parse_file(file)["disk_unique_id"] == md5
+        begin
+          parse_edl(file)["disk_unique_id"] == md5
+        rescue SyntaxError
+         # ignore
+        end
       }
       if matching.length == 1
         file = matching[0]
@@ -335,6 +338,10 @@ EOL
       start_time = JOptionPane.showInputDialog(message, default)
     end
     
+    def parse_edl path
+      EdlParser.parse_file path
+    end
+    
     def choose_dvd_and_edl_for_it
       drive, dvd_volume_name, md5sum = choose_dvd_drive
       puts "#{drive}, #{dvd_volume_name}, #{md5sum}"
@@ -346,14 +353,26 @@ EOL
         edit_list_path = fc.go
       end
       raise 'cancelled' unless edit_list_path
-      descriptors = EdlParser.parse_file edit_list_path
+      descriptors = nil
+      while(!descriptors)
+        begin
+          descriptors = parse_edl edit_list_path
+        rescue SyntaxError => e
+          puts e
+          show_blocking_message_dialog("syntax error: " + edit_list_path + " " + e)
+        end
+      end
       return drive, dvd_volume_name, md5sum, edit_list_path, descriptors
     end
+    
+    def get_title_track descriptors
+      descriptors["dvd_title_track"] || "1"
+    end
 
-    def do_copy_dvd_to_hard_drive should_prompt_for_start_and_end_times, want_full_list = false
+    def do_copy_dvd_to_hard_drive should_prompt_for_start_and_end_times, want_fulli_name = false
       drive, dvd_volume_name, md5sum, edit_list_path, descriptors = choose_dvd_and_edl_for_it
       
-      dvd_title = descriptors['title'] || dvd_volume_name
+      dvd_title = descriptors['name'] || dvd_volume_name
 
       fc = new_filechooser
 
@@ -362,13 +381,13 @@ EOL
       if should_prompt_for_start_and_end_times
         show_blocking_message_dialog("Ok, let's preview just a portion of it. \nNote that you'll want to preview a section that wholly includes an edit decision in it\n For example, if it mutes from second 1 to second 10, you'll want to play from 00:00 to 00:12 or what not.\nAlso note that the first time you preview a section of a video, it will take like 20 minutes as it sets up the video for previewing.\nSubsequent previews will be faster, though, as long as you use the same filename.", "Preview")
         start_time = get_user_input("At what point in the video would you like to start your preview? (like 01:00 for starting at 1 minute)", Storage['start_time'])
-        Storage['start_time'] = start_time if start_time
         end_time = get_user_input("At what point in the video would you like to finish your preview? (like 02:00 for ending at the 2 minute mark)", Storage['end_time'])
-        Storage['end_time'] = end_time if end_time
         unless start_time and end_time
           JOptionPane.showMessageDialog(nil, " Please choose start and end", "Failed", JOptionPane::ERROR_MESSAGE)
           return
         end
+        Storage['start_time'] = start_time
+        Storage['end_time'] = end_time
       end
 
       fc.set_title "Pick where to save #{dvd_title} edited to"
@@ -380,19 +399,20 @@ EOL
       a = File.open(File.dirname(save_to) + "/test_file_to_see_if_we_have_permission_to_write_to_this_folder", "w")
       a.close
       File.delete a.path
-      dvd_title_track = descriptors["dvd_title_track"] || "1"
-      # how does save_to map to fulli?
+      
       fulli = MencoderWrapper.calculate_final_filename save_to
-      if want_full_list
-        # make it create a dummy response file for us :)
-        start_time = "00:00"
-        end_time = "00:01"
+      if want_fulli_name
         if File.exist? fulli + ".done"
           # just return the full path early...
           return [true, fulli]
         end
+        # make it create a dummy response file for us :)
+        start_time = "00:00"
+        end_time = "00:01"
       end
-      generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track, should_prompt_for_start_and_end_times
+      
+      dvd_title_track = get_title_track(descriptors)
+      generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track
       [false, fulli] # false means it's running in a background thread :P
     end
 
@@ -400,13 +420,13 @@ EOL
       DriveInfo.get_drive_with_most_space_with_slash
     end
     
-    def get_mencoder_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track, should_prompt_for_start_and_end_times
+    def get_mencoder_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track
       MencoderWrapper.get_bat_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track
     end
 
-    def generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track, should_prompt_for_start_and_end_times
-      Storage['last_params'] = [save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track, should_prompt_for_start_and_end_times]
-      commands = get_mencoder_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track, should_prompt_for_start_and_end_times
+    def generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track
+      Storage['last_params'] = [save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track]
+      commands = get_mencoder_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track
       temp_dir = Dir.tmpdir
       temp_file = temp_dir + '/vlc.temp.bat'
       File.write(temp_file, commands)
@@ -467,7 +487,7 @@ EOL
     # returns e:\, volume, md5sum
     def choose_dvd_drive
       opticals = DriveInfo.get_dvd_drives_as_win32ole
-      names = opticals.map{|d| d.Name + "\\" + " (" +  (d.VolumeName || 'Insert DVD to use') + ")"}
+      names = opticals.map{|d| d.Name + "\\" + " (" +  (d.VolumeName || 'Insert DVD and re-select') + ")"}
 
       if opticals.length != 1
         dialog = GetDisk.new(self, names)

data/lib/edl_parser.rb

@@ -60,7 +60,7 @@ class EdlParser
     # two digits, then whatever else you see, that's not a digit...
     out = from_this.shift(2)
     out.each{|d|
-      raise 'non timestamp? ' + d unless d =~ TimeStamp
+      raise SyntaxError.new('non timestamp? ' + d) unless d =~ TimeStamp
     }
     while(from_this[0] && from_this[0] !~ TimeStamp)
      out << from_this.shift

data/sensible-cinema.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.18.2"
+  s.version = "0.18.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
-  s.date = %q{2010-12-13}
+  s.date = %q{2010-12-17}
   s.email = %q{rogerdpack@gmail.com}
   s.executables = ["sensible-cinema", "sensible-cinema-cli"]
   s.extensions = ["ext/mkrf_conf.rb"]
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/sensible-cinema",
     "bin/sensible-cinema-cli",
-    "create new sensible cinema decision list files.bat",
+    "create or edit sensible cinema decision list files.bat",
     "experimental_readme.txt",
     "ext/mkrf_conf.rb",
     "gplv3.txt",
@@ -127,6 +127,7 @@ Gem::Specification.new do |s|
     "zamples/edit_decision_lists/category descriptions.txt",
     "zamples/edit_decision_lists/dvds/COOL_RUNNINGS.txt",
     "zamples/edit_decision_lists/dvds/Harry Potter 2.txt",
+    "zamples/edit_decision_lists/dvds/big_buck_bunny_dvd.txt",
     "zamples/edit_decision_lists/dvds/bob the builder pets in a pickle.txt",
     "zamples/edit_decision_lists/dvds/bobs_big_plan.txt",
     "zamples/edit_decision_lists/dvds/happiest baby on the block.txt",

data/spec/edl_parser.spec.rb

@@ -56,7 +56,7 @@ describe EdlParser do
   end
   
   it "should raise if the first two aren't digits" do
-    proc { EdlParser.extract_entry!(["a"])}.should raise_exception
+    proc { EdlParser.extract_entry!(["a"])}.should raise_exception(SyntaxError) 
   end
   
   it "should detect timestamps well" do

data/spec/mencoder_wrapper.spec.rb

@@ -99,15 +99,17 @@ describe MencoderWrapper do
   end
   
   it "should have what looks like a working ffmpeg style split commands" do
-    # ffmpeg -i from_here.avi   -vcodec copy -acodec copy -ss 1:00 -t 1:00 out.avi
-    @out.should match(/ffmpeg -i to_here.*vcodec copy -acodec ac3 .*-ss .* -t /)
-    @out.should_not match(/acodec copy.*vol 0/)
+   @out.should match(/ffmpeg -i to_here.fulli_unedited.tmp.mpg -vcodec copy -acodec .*-ss.*-t/)
+   # phreaky audio [at least necessary for the big bunny fella...]
+   # @out.should match(/-acodec ac3 -ar 48000 -ac 2/)
+   # lodo investigate
   end
   
   it "should accomodate for mutes the ffmpeg way" do
     # mutes by silencing...seems reasonable, based on the Family Law fella
     @out.should match(/ -vcodec copy -acodec ac3 -vol 0 /)
     @out.should_not match(/-vcodec copy.*-target ntsc-dvd/)
+    @out.should_not match(/acodec copy.*vol 0/)
   end
   
   it "should use avi extension" do

data/spec/sensible_cinema_gui.spec.rb

@@ -32,7 +32,32 @@ module SensibleSwing
     it "should not auto-select if you pass it nil" do
       MainWindow.new.single_edit_list_matches_dvd(nil).should be nil
     end
-
+    
+    it "should not die if you choose a poorly formed edl" do
+      time_through = 0
+      @subject.stub!(:single_edit_list_matches_dvd) {
+        'fake filename doesnt even matter because we fake the parsing of it later'
+      }
+      
+      @subject.stub!(:parse_edl) {
+        if time_through == 0
+          time_through += 1
+          eval("a-----") # throws Syntax Error first time
+        else
+          "stuff"
+        end
+      }
+      @subject.choose_dvd_and_edl_for_it
+      @show_blocking_message_dialog_last_args.should_not be nil
+    end
+    
+    it "should not select a file if poorly formed" do
+      @subject.stub!(:parse_edl) {
+        eval("a----")
+      }
+      @subject.single_edit_list_matches_dvd 'fake md5'
+    end
+    
     it "should prompt if two EDL's match a DVD title" do
       old_edl = MainWindow::EDL_DIR
       begin
@@ -64,7 +89,7 @@ module SensibleSwing
         ["mock_dvd_drive", "Volume", "19d121ae8dc40cdd70b57ab7e8c74f76"] # happiest baby on the block
       }
       @subject.stub!(:get_mencoder_commands) { |*args|
-        args[-5].should match(/abc/)
+        args[-4].should match(/abc/)
         @args = args
         'sleep 0.1'
       }
@@ -74,7 +99,9 @@ module SensibleSwing
       @subject.stub!(:get_drive_with_most_space_with_slash) {
         "e:\\"
       }
-      @subject.stub!(:show_blocking_message_dialog) {}
+      @subject.stub!(:show_blocking_message_dialog) { |*args|
+        @show_blocking_message_dialog_last_args = args
+      }
       @subject.stub!(:get_user_input) {'01:00'}
       @subject.stub!(:system_non_blocking) { |command|
         @command = command
@@ -82,6 +109,10 @@ module SensibleSwing
       }
       @subject.stub!(:open_file_to_edit_it) {}
     end
+    
+    after do
+      @subject.background_thread.join if @subject.background_thread
+    end
 
     class FakeFileChooser
       def set_title x
@@ -93,12 +124,22 @@ module SensibleSwing
       end
     end
     
+    # name like :@rerun_previous
+    def click_button(name)
+      @subject.instance_variable_get(name).simulate_click
+    end
+
     it "should be able to do a normal copy to hard drive, edited" do
+      @subject.system_non_blocking "ls"
       @subject.do_copy_dvd_to_hard_drive(false).should == [false, "abc.fulli_unedited.tmp.mpg"]
       File.exist?('test_file_to_see_if_we_have_permission_to_write_to_this_folder').should be false
     end
     
-    it "should have a good default title of 1"
+    it "should have a good default title of 1" do
+     @subject.get_title_track({}).should == "1"
+     descriptors = {"dvd_title_track" => "3"}
+     @subject.get_title_track(descriptors).should == "3"
+    end
     
     it "should call through to explorer for the full thing" do
       @subject.do_copy_dvd_to_hard_drive(false)
@@ -117,16 +158,16 @@ module SensibleSwing
     it "should call explorer for the we can't reach this path of opening a partial without telling it what to do with it" do
      @subject.do_copy_dvd_to_hard_drive(true).should == [false, "abc.fulli_unedited.tmp.mpg"]
      @subject.background_thread.join
-     @args[-2].should == 1
-     @args[-3].should == "01:00"
+     @args[-1].should == 1
+     @args[-2].should == "01:00"
      @command.should match /explorer/
      @command.should_not match /fulli/
     end
 
     def prompt_for_start_and_end_times
       @subject.instance_variable_get(:@preview_section).simulate_click
-      @args[-2].should == 1
-      @args[-3].should == "01:00"
+      @args[-1].should == 1
+      @args[-2].should == "01:00"
       @subject.background_thread.join
       @command.should match /smplayer/
     end
@@ -135,15 +176,16 @@ module SensibleSwing
       prompt_for_start_and_end_times
     end
     
-    it "should be able to reprompt for start and end times automagically" do
+    it "should be able to rerun the latest start and end times with the rerun button" do
       prompt_for_start_and_end_times
       old_args = @args
+      old_args.should_not == nil
       @args = nil
-      @subject.repeat_last_copy_dvd_to_hard_drive.join
+      click_button(:@rerun_preview).join
       @args.should == old_args
+      @command.should match(/smplayer/)
     end
     
-    
     it "if the .done file exists, it should directly call smplayer" do
       FileUtils.touch "abc.fulli_unedited.tmp.mpg.done"
       @subject.instance_variable_get(:@watch_unedited).simulate_click
@@ -152,10 +194,10 @@ module SensibleSwing
     end
     
     it "if the .done file does not exist, it should call smplayer ja" do
-      @subject.stub!(:sleep) {} # speed this up...
+      @subject.stub!(:sleep) {} # speed this test up...
       @subject.instance_variable_get(:@watch_unedited).simulate_click.join
       @subject.after_success_once.should == nil
-      @command.should_not == nil # scary timing spec
+      @command.should_not == nil # scary timing spec!
     end
     
     it "should create a new file for ya" do
@@ -166,7 +208,6 @@ module SensibleSwing
       begin
         File.exist?( out ).should be_true
         content = File.read(out)
-        p content
         content.should_not include("\"title\"")
         content.should include("disk_unique_id")
         content.should include("dvd_title_track")
@@ -179,12 +220,10 @@ module SensibleSwing
       @subject.instance_variable_get(:@display_unique).simulate_click.should == "01:00"
     end
     
-    it "should create an edl" do
-      @subject.instance_variable_get(:@edl).simulate_click
-      
+    it "should create an edl and pass it through to mplayer" do
+      @subject.instance_variable_get(:@mplayer_edl).simulate_click
       @command.should match(/mplayer.*-edl/)
       @command.should match(/-dvd-device /)
-      p @command
     end
     
   end

data/zamples/edit_decision_lists/dvds/big_buck_bunny_dvd.txt

@@ -0,0 +1,19 @@
+# big buck bunny DVD EDL
+
+"mutes" => [
+  #
+],
+
+"blank_outs" => [
+  "00:00:00.0" , "00:00:33.5", "skip intro",
+  "01:23" , "01:25", "don't kill the nice butterfly!",
+  "03:15.5" , "03:29", "don't kill the nice butterfly 2!",
+  "9:53", "9:58", "pooping"
+],
+
+"audio_codec" => "lavc", # weird compatibility issues...
+"name" => "Big Buck Bunny DVD",
+"disk_unique_id" => "ef3d471d35022da32d444e7897e0c87c",
+"url" => "http://www.bigbuckbunny.org/",
+"dvd_title_track" => "2",
+"closing thoughts" => "feels more adult than a kids movie, but probably ok edited"

data/zamples/edit_decision_lists/example_edit_decision_list.txt

@@ -23,7 +23,7 @@
 "blank_outs" => [
   # this first one blanks (by overlaying *over* the video, a black window)
   # from one hour one minute to one hour two minutes, like:
-  "01:01:00" , "01:02:00", "nudity", "Kate Winslet's...",
+  "01:01:00" , "01:02:00", "nudity", "...",
   # you can also always optionally use decimals, like 3 minutes 3 seconds and a half to 3 minutes 4 seconds and a half (one second blank out):
   "00:03:03.5", "00:03:04.5",
 ],

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 18
-    - 2
-  version: 0.18.2
+    - 3
+  version: 0.18.3
 platform: ruby
 authors: 
   - Roger Pack
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 -07:00
+date: 2010-12-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -168,7 +168,7 @@ files:
   - VERSION
   - bin/sensible-cinema
   - bin/sensible-cinema-cli
-  - create new sensible cinema decision list files.bat
+  - create or edit sensible cinema decision list files.bat
   - experimental_readme.txt
   - ext/mkrf_conf.rb
   - gplv3.txt
@@ -265,6 +265,7 @@ files:
   - zamples/edit_decision_lists/category descriptions.txt
   - zamples/edit_decision_lists/dvds/COOL_RUNNINGS.txt
   - zamples/edit_decision_lists/dvds/Harry Potter 2.txt
+  - zamples/edit_decision_lists/dvds/big_buck_bunny_dvd.txt
   - zamples/edit_decision_lists/dvds/bob the builder pets in a pickle.txt
   - zamples/edit_decision_lists/dvds/bobs_big_plan.txt
   - zamples/edit_decision_lists/dvds/happiest baby on the block.txt