sensible-cinema 0.23.0 → 0.23.1

data/change_log_with_feature_list.txt

@@ -1,3 +1,8 @@
+== 0.23.1 ==
+
+It now *requires* outside files as file input, instead of just raw DVD's ever.
+Also fixed up some unit tests.
+
 == 0.23.0 ==
 
 OS X compatibility.  Though not heavily used it might work.

data/go.sh

@@ -1 +1 @@
-jruby bin/sensible-cinema $1 $2 $3 $4 $5 # --create-mode
+jruby bin/sensible-cinema $1 $2 $3 $4 $5 # --create-mode just realize that most buttons in create mode probably don't work yet in os x

data/how_to_get_files_from_dvd.txt

@@ -0,0 +1,24 @@
+Warning: before grabbing any video files from your DVD's,
+please consult the is_it_legal_to_copy_dvds.txt file to 
+check for legal ramifications.  Don't do anything illegal in
+your country.
+
+Basically, sensible cinema affords you 2 options.
+
+Either stick the DVD in then click the "realtime play" button.
+Or you can "grab" a video file off a DVD, 
+then Sensible Cinema will take it and slice and dice out the profanity et al, 
+creating for you an edited version of the video file (for an example,
+you could download the Big Buck Bunny DVD ISO, and try 
+it out on that [1]).
+
+Sensible Cinema only accepts raw "unencrypted" movie streams, 
+so you're going to have to get the movie file off the DVD somehow first.
+There are a few options.
+A couple of ways are to run something similar to that described here [2]
+(mplayer, or makemkv + tsmuxer)
+
+Good luck!
+
+[1] http://www.archive.org/details/BigBuckBunny
+[2] http://wiki.videolan.org/Rip_DVD#Related

data/is_it_legal_to_copy_dvds.txt

@@ -15,33 +15,33 @@ and relies on you to use something else for that, on your own.
 
 It is controversial to use open source software to play/rip commercial DVD's.
 There are a few conflicting views.
-Sensible-cinema doesn't actually do any decryption or decoding, nor has any knowledge of it.  
-It doesn't even have knowledge
-as to whether the DVD was originally encrypted or not, we chose a "you have to do the ripping through
-some other means" philosophy.  
-You can ask the authors of the ripping programs if it is legal.  Apparently
+Sensible-cinema doesn't actually do any decryption or decoding, nor has any knowledge of how it occurred
+originally.  
+It doesn't even have knowledge as to whether the DVD was originally encrypted or not, we choose a 
+"you have to do the ripping through some other means" philosophy, to avoid legal issues.
+You can ask the authors of the ripping programs you use if their software is legal.  Apparently
 libdvdcss (which the other programs that it calls out to use) has never been legally challenged in court (or so they say), 
 and uses a slightly different algorithm than those that have, so the jury's still out.  Possibly
-it has been challenged in French courts and found legal so it might vary from country to country [4].
+it has been challenged in French courts and found legal so it might vary from country to country, as well [4].
 
 Using sensible-cinema also might not be more unethical than ripping your DVD collection to your hard
-drive so you can "keep your DVD's all in one place" or what not (which might even be termed fair use), since it
+drive so you can "keep your DVD's all in one place" or what not (which might perhaps be termed fair use), since it
 basically only saves parts from the original concatenated.  Only original content is saved.  It just happens to be bits and
 pieces that don't have the profanity.
 Note also that fair use at times does allow one to "record" things for personal use/backup (for example off the TV).
-Note that sensible cinema does require the original DVD to be present when using it, also, to help enforce copy protection,
-at least for watching it/using from within sensible cinema.  Certainly do not rip DVD's you don't own.
+Note also that sensible cinema does require the original DVD to be present when using it, to help enforce legality,
+at least for watching it/using from within sensible cinema.  Certainly, do not rip DVD's you don't own.
 
 If general, if it's not legal in your country, then don't use it!
 You are responsible for your actions and use of the program.
 It is possible that the authors of sensible-cinema are not cupable of anything
 regarding its use themselves, since they re-distribute no edited media, 
-nor distribute cracking codes.  Check your country's rules first.  Be warned.
+nor distribute cracking codes.  Check your country's rules first.  You have been warned.
 
-Note: do not redistribute or re-sell edited DVD's, certainly that is illegal.  
+Note: do not redistribute or re-sell edited DVD's, certainly that is illegal in the US.
 We have learned from clean flicks that redistributing 
 (well at least renting/selling) edited commercial DVD's is illegal in the US.
-Please don't redistribute.  Consult your lawyer.
+Please don't redistribute.  Consult your lawyer if you have any questions/concerns.
 DO NOT MAKE ILLEGAL COPIES.
 USE AT YOUR OWN RISK.
 

data/lib/drive_info.rb

@@ -24,17 +24,18 @@ class DriveInfo
 
  def self.md5sum_disk(dir)
    if OS.mac?
-     output = `#{__DIR__}/../vendor/mac_dvdid/bin/dvdid #{dir}`
+     command = "#{__DIR__}/../vendor/mac_dvdid/bin/dvdid #{dir}"
    else
-     output = `#{__DIR__}/../vendor/dvdid.exe #{dir}`
+     command = "#{__DIR__}/../vendor/dvdid.exe #{dir}"
    end
-   puts 'dvdid command failed?' unless $?.exitstatus == 0 # hope this accomodates for it barfing...
+   output = `#{command}`
+   puts 'dvdid command failed?' + command unless $?.exitstatus == 0 # hope this accomodates for it barfing...
    output.strip
  end
 
  def self.get_dvd_drives_as_openstruct
    disks = get_all_drives_as_ostructs
-   disks.select{|d| d.Description =~ /CD-ROM/}
+   disks.select{|d| d.Description =~ /CD-ROM/ && File.exist?(d.Name + "/VIDEO_TS")}
  end
   
  def self.get_drive_with_most_space_with_slash
@@ -55,16 +56,19 @@ class DriveInfo
      d2.Description = parsed['OpticalDeviceType']
      d2.MountPoint = parsed['MountPoint']
      if d2.MountPoint == '/'
-       d2.MountPoint = File.expand_path '~' # better ?
+       d2.MountPoint = File.expand_path '~' # better ? I guess?
      end
      d2
     }
   else
     require 'ruby-wmi'
     disks = WMI::Win32_LogicalDisk.find(:all)
-    disks.map{|d| d2 = OpenStruct.new; d2.Description = d.Description; d2.VolumeName = d.VolumeName; d2.Name = d.Name; 
+    disks.map{|d| d2 = OpenStruct.new
+      d2.Description = d.Description
+      d2.VolumeName = d.VolumeName
+      d2.Name = d.Name
       d2.FreeSpace = d.FreeSpace.to_i
-      d2.MountPoint = d.Name[0..2]
+      d2.MountPoint = d.Name[0..2] # needed...
       d2
     } 
   end
@@ -73,6 +77,5 @@ class DriveInfo
 end
 
 if $0 == __FILE__
-  require 'pp'
   p DriveInfo.get_dvd_drives_as_openstruct
 end

data/lib/edl_parser.rb

@@ -15,7 +15,6 @@ This file is part of Sensible Cinema.
     You should have received a copy of the GNU General Public License
     along with Sensible Cinema.  If not, see <http://www.gnu.org/licenses/>.
 =end
-
 class EdlParser
 
   def self.parse_file filename, ignore_settings = false
@@ -59,9 +58,9 @@ class EdlParser
     out
   end
   
-  TimeStamp = /(^\d+:\d\d[\d:\.]*$|\d+)/
+  #TimeStamp = /(^\d+:\d\d[\d:\.]*$|\d+)/ # this one also allows for 4444 [?] and also weirdness like "don't kill the nice butterfly 2!" ...
+  TimeStamp = /^\d+:\d\d[\d:\.]*$/
   # starts with a digit, has at least one colon followed by two digits,then some combo of digits and colons and periods...
-  # or just like 5057 s
   
   def self.extract_entry! from_this
     return nil if from_this.length == 0
@@ -112,7 +111,6 @@ class EdlParser
     end
     mutes = incoming["mutes"] || {}
     blanks = incoming["blank_outs"] || {}
-    p 'incoming', incoming, splits
     mutes = mutes.map{|k, v| get_secs(k, v, -add_this_to_mutes_beginning, add_this_to_mutes_end, splits) + [:mute]}
     blanks = blanks.map{|k, v| get_secs(k, v, -add_this_to_mutes_beginning, add_this_to_mutes_end, splits) + [:blank]}
     combined = (mutes+blanks).sort
@@ -189,7 +187,7 @@ class EdlParser
   
 end
 
-# == 1.8.7 Symbol compat
+# == 1.8.7 1.9 Symbol compat
 
 class Symbol
   # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Symbol.html]
@@ -199,6 +197,9 @@ class Symbol
   end unless method_defined? :"<=>"
 end
 
-if RUBY_VERSION < '1.8.7'
-  raise 'needs ruby 1.8.7 at least'
-end
+if $0 == __FILE__
+  p 'syntax: filename'
+  require 'rubygems'
+  require 'sane'
+  p EdlParser.parse_file *ARGV
+end

data/lib/file_chooser.rb

@@ -17,10 +17,8 @@ This file is part of Sensible Cinema.
 =end
 require 'java'
 
-module FileChooser
+module FileChooser # used in the cli only...
 
-  # show a popup dialog prompting for them to select a file
-  # pretty ugly
   def choose_file(title, use_this_dir = nil)
   
     fc = java.awt.FileDialog.new(nil, title)

data/lib/mencoder_wrapper.rb

@@ -35,16 +35,16 @@ class MencoderWrapper
       #   "This will result in a slightly bigger file, but will not cause problems when demuxing or remuxing into other container formats." LODO no harddup ok ???
       # lodo: can I use ffmpeg to unmux-ify/GOP'ify perhaps?
       # LODO 24000/1001 ?
-      video_opts = "-vf scale=pullup,softskip,harddup -ovc lavc -lavcopts vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=1:vstrict=0:acodec=ac3:abitrate=192:autoaspect -ofps 30000/1001"
-      out += "mencoder \"#{this_file.gsub('"', '\\"')}\" -of mpeg -mpegopts format=dvd:tsaf -alang en -nocache -sid 1000 -oac #{audio_codec} #{video_opts} -o #{@big_temp} -dvd-device #{this_drive} && echo done_grabbing > #{@big_temp}.done\n"
+      video_opts = "-vf scale=720:480,pullup,softskip,harddup -ovc lavc -lavcopts vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=1:vstrict=0:acodec=ac3:abitrate=192:autoaspect -ofps 30000/1001"
+      out += "mencoder \"#{this_file.gsub('"', '\\"')}\" -of mpeg -mpegopts format=dvd:tsaf -alang en -nocache -sid 1000 -oac #{audio_codec} #{video_opts} -o #{@big_temp} -dvd-device #{this_file} && echo done_grabbing > #{@big_temp}.done\n"
     end
     
-    def calculate_final_filename to_here_final_file
+    def calculate_fulli_filename to_here_final_file
       @big_temp = to_here_final_file + ".fulli_unedited.tmp.mpg"
     end
     
     # called from the UI...
-    def get_bat_commands these_settings, this_drive, to_here_final_file, start_here = nil, end_here = nil, dvd_title_track = "1", delete_partials = false, require_deletion_entry = false
+    def get_bat_commands these_settings, this_from_file, to_here_final_file, start_here = nil, end_here = nil, dvd_title_track = "1", delete_partials = false, require_deletion_entry = false
       combined = EdlParser.convert_incoming_to_split_sectors these_settings
       @dvd_title_track = dvd_title_track
       assert dvd_title_track
@@ -59,8 +59,8 @@ class MencoderWrapper
       else
         previous_end = 0
       end
-      calculate_final_filename to_here_final_file
-      out = get_header this_drive, these_settings
+      calculate_fulli_filename to_here_final_file
+      out = get_header this_from_file, these_settings
       @idx = 0
       combined.each {|start, endy, type|
         if start > previous_end

data/lib/subtitle_profanity_finder.rb

@@ -141,10 +141,6 @@ module SubtitleProfanityFinder
           
           # sanitize
           for (prof2, (sanitized2, whole_word2)) in all_profanity_combinations
-            if sanitized_glop =~ prof2
-              require 'ruby-debug'
-              #debugger
-            end
             if sanitized_glop =~ prof2
               sanitized_glop.gsub!(prof2, sanitized2)
             end

data/lib/swing_helpers.rb

@@ -48,12 +48,22 @@ module SensibleSwing
      self
    end
   
-  def simulate_click
-    @block.call
-  end
+   def simulate_click
+     @block.call
+   end
+  
+   def tool_tip= text
+      if text
+       text = "<html>" + text + "</html>"
+       text = text.gsub("\n", "<br/>")
+     end
+     self.set_tool_tip_text text   
+   end
   
  end
 
+ ToolTipManager.sharedInstance().setDismissDelay(java.lang.Integer::MAX_VALUE) # don't timeout tooltips...
+
  class JFrame
    def close
      dispose # sigh
@@ -61,6 +71,8 @@ module SensibleSwing
   end
   
   class JFileChooser
+    # also set_current_directory et al...
+    
     # raises on failure...
     def go
       success = show_open_dialog nil
@@ -79,8 +91,10 @@ module SensibleSwing
       set_selected_file JFile.new(f)
     end
     alias setFile set_file
+    
   end
   
+  # awt...
   class FileDialog
     def go
       show
@@ -123,6 +137,3 @@ class String
   end
  end
 end
-
-# code examples
-# JOptionPane.showInputDialog(nil, "not implemented yet", "not implemented yet", JOptionPane::ERROR_MESSAGE)

data/sensible-cinema.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.23.0"
+  s.version = "0.23.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "goc.bat",
     "gplv3.txt",
     "how_to_create_your_own_delete_lists.txt",
+    "how_to_get_files_from_dvd.txt",
     "is_it_legal_to_copy_dvds.txt",
     "legal/md5s.txt",
     "legal/transcript_mute_vlc.txt",
@@ -46,7 +47,6 @@ Gem::Specification.new do |s|
     "lib/check_installed_mac.rb",
     "lib/count_down_timer_jruby_swing.rb",
     "lib/drive_info.rb",
-    "lib/edl_converter.rb",
     "lib/edl_parser.rb",
     "lib/fake_blanker.rb",
     "lib/file_chooser.rb",
@@ -114,12 +114,13 @@ Gem::Specification.new do |s|
     "vendor/readme.txt",
     "www/index.html",
     "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/bambi.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/cool runnings.txt",
+    "zamples/edit_decision_lists/dvds/edl_for_unit_tests.txt",
     "zamples/edit_decision_lists/dvds/example_delete_list.txt",
     "zamples/edit_decision_lists/dvds/happiest baby on the block.txt",
     "zamples/edit_decision_lists/dvds/how_to_train_your_dragon.txt",
@@ -139,7 +140,7 @@ Gem::Specification.new do |s|
     "zamples/edit_decision_lists/dvds/tron_legacy.txt",
     "zamples/edit_decision_lists/dvds/turn_around_alma_younger.txt",
     "zamples/edit_decision_lists/dvds/zz_example_delete_list_that_has_no_cuts_in_it.txt",
-    "zamples/edit_decision_lists/netflix/greatest_story_ever_told_netflix.txt",
+    "zamples/edit_decision_lists/netflix_instant/greatest_story_ever_told_netflix.txt",
     "zamples/edit_decision_lists/old_not_yet_updated/example_edit_decision_list.txt",
     "zamples/edit_decision_lists/old_not_yet_updated/youtube/gummy_bear_song_youtube.txt",
     "zamples/edit_decision_lists/youtube/demo_mutes.txt",
@@ -165,6 +166,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<os>, [">= 0.9.3"])
       s.add_runtime_dependency(%q<sane>, [">= 0.22.0"])
       s.add_runtime_dependency(%q<rdp-win32screenshot>, [">= 0.0.7.3"])
       s.add_runtime_dependency(%q<mini_magick>, [">= 3.1"])
@@ -182,6 +184,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
     else
+      s.add_dependency(%q<os>, [">= 0.9.3"])
       s.add_dependency(%q<sane>, [">= 0.22.0"])
       s.add_dependency(%q<rdp-win32screenshot>, [">= 0.0.7.3"])
       s.add_dependency(%q<mini_magick>, [">= 3.1"])
@@ -200,6 +203,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>, [">= 0"])
     end
   else
+    s.add_dependency(%q<os>, [">= 0.9.3"])
     s.add_dependency(%q<sane>, [">= 0.22.0"])
     s.add_dependency(%q<rdp-win32screenshot>, [">= 0.0.7.3"])
     s.add_dependency(%q<mini_magick>, [">= 3.1"])

data/spec/edl_parser.spec.rb

@@ -37,7 +37,7 @@ describe EdlParser do
     "missing_content"=>"this doesn't list some mild name calling", 
     "title"=>"Forever Strong", "source"=>"Hulu", "url"=>"http://www.byutv.org/watch/1790-100", 
     "whatever_else_you_want"=>"this is the old version of the film",
-    "disk_unique_id"=>"19d131ae8dc40cdd70b57ab7e8c74f76"
+    "disk_unique_id"=>"1234|4678"
    }
    E.parse_string(string, nil).should == expected
   end
@@ -60,17 +60,16 @@ describe EdlParser do
   
   it "should detect timestamps well" do
     t = EdlParser::TimeStamp
-   "2:01".should match(t)
-   "1:01.5".should match(t)
-   "00:00:00.5".should match(t)
-   "00:00:00".should match(t)
+    for ts in ["2:01", "1:01.5", "00:00:00.5","00:00:00", "1:23", "01:23"]
+      raise ts unless t =~ ts
+    end
    "5".should_not match(t)
    "category".should_not match(t)
   end
   
   it "should parse a real file" do
    E.parse_file(File.expand_path(__dir__) + "/../zamples/edit_decision_lists/dvds/bobs_big_plan.txt").should ==
-     {"title"=>"Bob's Big Plan", "dvd_title_track"=>1, "other notes"=>"could use more nit-picking of the song, as some parts seem all right in the end", "disk_unique_id"=>"259961ce38971cac3e28214ec4ec278b", "mutes"=>[["00:03.8", "01:03", "theme song is a bit raucous at times"], ["28:13.5", "29:40", "theme song again"], ["48:46", "49:08", "theme song again"]], "blank_outs"=>[]}
+     {"title"=>"Bob's Big Plan", "dvd_title_track"=>1, "other notes"=>"could use more nit-picking of the song, as some parts seem all right in the end", "mutes"=>[["00:03.8", "01:03", "theme song is a bit raucous at times"], ["28:13.5", "29:40", "theme song again"], ["48:46", "49:08", "theme song again"]], "blank_outs"=>[]}
   end
   
   it "should be able to use personal preferences to decide which edits to make" do

data/spec/mencoder_wrapper.spec.rb

@@ -43,17 +43,18 @@ describe MencoderWrapper do
   end
   
   it "should have what looks like a working mencoder grab command" do
-    @out.should match(/mencoder dvdnav:/)
-    @out.should match(/dvdnav.*lavcopt.*keyint=1/)
+    @out.should_not match(/dvd:\//)
+    @out.should_not match(/dvdnav:\//)
+    @out.should match(/mencoder.*lavcopt.*keyint=1/)
     use_mpg2_fulli_unedited = true
     if use_mpg2_fulli_unedited
-      @out.should match(/dvdnav.*lavcopt.*mpeg2video/)
+      @out.should match(/mencoder.*lavcopt.*mpeg2video/)
       @out.should match(/autoaspect/) # try to preserve aspect
     else
-      @out.should match(/dvdnav.*-ovc copy/)
+      @out.should match(/mencoder.*-ovc copy/)
     end
     # "poor" audio for certain DVD's <sigh>
-    @out.should match(/dvdnav.*-oac lavc/)
+    @out.should match(/mencoder.*-oac lavc/)
   end
   
   it "should not double setting params" do

data/spec/notes

@@ -1,11 +1,17 @@
 up next:
   lighning exact frame to compare the two fulli's...
 
+== XBMC not need a plugin? ==
+
+http://forum.xbmc.org/showthread.php?t=28795 XBMC doesn't support real-time DVD EDL playback at all <sniff>
+  ps3ms edl maybe though...
+
 == subtitle accuracy ==
+
   narnia dawn treader had 1 subtitle that was "hand crafted", had the wrong timestamps, but was more accurate.  
     The several others were accurate though.
 
-== ? ==
+== auto subtitle download for a DVD ==
 
   opensubtitles' viewer gets "nothing" for subtitles of DVD's...smplayer requires you to manually search, too...
   splayer doesn't seem to attempt auto-download either of subs for DVD's.  Feels so nice tho :P

data/spec/sensible_cinema_gui.spec.rb

@@ -28,10 +28,10 @@ module SensibleSwing
       MainWindow.new.dispose# doesn't crash :)
     end
 
-    Sintel_ID = '79df7b12|8b27d001'
+    Test_DVD_ID = 'deadbeef|8b27d001'
     
     it "should auto-select a EDL if it matches a DVD's title" do
-      MainWindow.new.single_edit_list_matches_dvd(Sintel_ID).should_not be nil
+      MainWindow.new.single_edit_list_matches_dvd(Test_DVD_ID).should_not be nil
     end
 
     it "should not auto-select if you pass it nil" do
@@ -116,11 +116,11 @@ module SensibleSwing
     before do
       @subject = MainWindow.new
       @subject.stub!(:choose_dvd_drive) {
-        ["mock_dvd_drive", "Volume", Sintel_ID] # happiest baby on the block
+        ["mock_dvd_drive", "Volume", Test_DVD_ID] # happiest baby on the block
       }
       @subject.stub!(:get_mencoder_commands) { |*args|
         args[-5].should match(/abc/)
-        @args = args
+        @get_mencoder_commands_args = args
         'fake get_mencoder_commands'
       }
       @subject.stub!(:new_filechooser) {
@@ -165,6 +165,8 @@ module SensibleSwing
     class FakeFileChooser
       def set_title x; end
       def set_file y; end
+      def set_current_directory x; end
+      def get_current_directory ; 'a great dir!'; end
       def go
         'abc'
       end
@@ -174,13 +176,26 @@ module SensibleSwing
     def click_button(name)
       @subject.instance_variable_get(name).simulate_click
     end
+    
+    it "should be able to run system" do
+      @subject.system_non_blocking "ls"
+    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 prompt twice for filenames--once for the 'to' filename, once for the 'from' filename" do
+      count = 0
+      @subject.stub!(:new_filechooser) {
+        count += 1
+        FakeFileChooser.new
+      }
+      @subject.do_copy_dvd_to_hard_drive(false).should == [false, "abc.fulli_unedited.tmp.mpg"]
+      count.should == 2
+    end
+    
     it "should have a good default title of 1" do
      @subject.get_title_track({}).should == "1"
      descriptors = {"dvd_title_track" => "3"}
@@ -193,7 +208,7 @@ module SensibleSwing
       }
       @subject.do_copy_dvd_to_hard_drive(false)
       @subject.background_thread.join
-      @args[-4].should == nil
+      @get_mencoder_commands_args[-4].should == nil
       @system_blocking_command.should match /explorer/
       @system_blocking_command.should_not match /fulli/
       @played.should == true
@@ -208,22 +223,22 @@ module SensibleSwing
     it "should call explorer eventually, if it has to create the fulli file" do
      @subject.do_copy_dvd_to_hard_drive(true).should == [false, "abc.fulli_unedited.tmp.mpg"]
      join_background_thread
-     @args[-2].should == 1
-     @args[-3].should == "01:00"
+     @get_mencoder_commands_args[-2].should == "2"
+     @get_mencoder_commands_args[-3].should == "01:00"
      @system_non_blocking_command.should match /smplayer/
      @system_non_blocking_command.should_not match /fulli/
     end
 
-    def prompt_for_start_and_end_times
+    def run_preview_section_button_successfully
       click_button(:@preview_section)
       join_background_thread
-      @args[-2].should == 1
-      @args[-3].should == "01:00"
+      @get_mencoder_commands_args[-2].should == "2"
+      @get_mencoder_commands_args[-3].should == "01:00"
       @system_non_blocking_command.should match /smplayer/
     end
 
     it "should prompt for start and end times" do
-      prompt_for_start_and_end_times
+      run_preview_section_button_successfully
     end
     
     temp_dir = Dir.tmpdir
@@ -250,12 +265,12 @@ module SensibleSwing
     end
     
     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
+      run_preview_section_button_successfully
+      old_args = @get_mencoder_commands_args
       old_args.should_not == nil
-      @args = nil
+      @get_mencoder_commands_args = nil
       click_button(:@rerun_preview).join
-      @args.should == old_args
+      @get_mencoder_commands_args.should == old_args
       @system_non_blocking_command.should match(/smplayer/)
     end
     
@@ -276,11 +291,10 @@ module SensibleSwing
     end
 
     it "should warn if you watch an edited time frame with no edits in it" do
-      @subject.unstub!(:get_mencoder_commands)
+      @subject.unstub!(:get_mencoder_commands) # this time through, let it check for existence of edits...
       click_button(:@preview_section)
       @show_blocking_message_dialog_last_arg.should =~ /unable to/
       @subject.stub!(:get_user_input).and_return('06:00', '07:00')
-      # rspec bug: wrong'ish backtrace: proc { prompt_for_start_and_end_times #}.should_not raise_error LODO
       click_button(:@preview_section)
       join_background_thread
       @system_blocking_command.should == "echo wrote (probably successfully) to abc.avi"
@@ -289,7 +303,7 @@ module SensibleSwing
     it "if the .done files exists, watch unedited should call smplayer ja" do
       FileUtils.touch "abc.fulli_unedited.tmp.mpg.done"
       @subject.instance_variable_get(:@watch_unedited).simulate_click
-      @system_non_blocking_command.should == "smplayer abc.fulli_unedited.tmp.mpg"
+      @system_non_blocking_command.should == "smplayer_portable abc.fulli_unedited.tmp.mpg"
       FileUtils.rm "abc.fulli_unedited.tmp.mpg.done"
     end
     
@@ -332,7 +346,7 @@ module SensibleSwing
       @system_blocking_command.should match(/-dvd-device /)
     end
     
-    it "should play edl with elongated mutes" do
+    it "should play edl with extra time for the mutes because of the EDL aspect" do
       click_button(:@mplayer_edl).join
       wrote = File.read(MainWindow::EdlTempFile)
       # normally "378.0 379.1 1"
@@ -374,17 +388,16 @@ module SensibleSwing
         count += 1
         FakeFileChooser.new
       }
-      @subject.get_save_to_filename 'yo'
-      @subject.get_save_to_filename 'yo'
-      count.should == 1
+      3.times { @subject.do_copy_dvd_to_hard_drive(false) }
+      count.should == 2 # else would have been 6...
     end
     
     describe 'with unstubbed choose_dvd_drive' do
       before do
         DriveInfo.stub!(:get_dvd_drives_as_openstruct) {
           a = OpenStruct.new
-          # NB no VolumeName set
-          a.Name = 'a name'
+          a.VolumeName = 'a dvd name'
+          a.Name = 'a path location'
           [a] 
         }
         @subject.unstub!(:choose_dvd_drive)
@@ -394,7 +407,7 @@ module SensibleSwing
         count = 0
         DriveInfo.stub!(:md5sum_disk) {
           count += 1
-          Sintel_ID
+          Test_DVD_ID
         }
         @subject.choose_dvd_and_edl_for_it
         @subject.choose_dvd_and_edl_for_it
@@ -402,15 +415,21 @@ module SensibleSwing
       end
   
       it "should prompt you if you need to insert a dvd" do
-        proc {@subject.choose_dvd_drive}.should raise_error(/might not yet have.*in it/)
+        DriveInfo.stub!(:get_dvd_drives_as_openstruct) {
+          a = OpenStruct.new
+          #a.VolumeName = 'a dvd name' # we "don't have one" for this test...
+          a.Name = 'a path location'
+          [a] 
+        }
+        proc {@subject.choose_dvd_drive}.should raise_error(SystemExit)
         @show_blocking_message_dialog_last_arg.should_not be nil
       end
     end
     
     it "should not show the normal buttons in create mode" do
-      MainWindow.new.buttons.length.should == 3 # exit button, two normal buttons
+      MainWindow.new.buttons.length.should == 3 # exit button plus two normal buttons
       ARGV << "--create-mode"
-      MainWindow.new.buttons.length.should == 12
+      MainWindow.new.buttons.length.should == 15 # all of them :P
       ARGV.pop # test cleanup--why not :)
     end
     
@@ -434,6 +453,20 @@ module SensibleSwing
       end
    end
   
+   it "should be able to parse an srt for ya" do
+     @subject.stub!(:new_filechooser) {
+       fc = FakeFileChooser.new
+       fc.stub!(:go) {
+         'spec/dragon.srt'
+       }
+       fc
+     }
+     file = SensibleSwing::MainWindow::EdlTempFile
+     FileUtils.rm_rf file
+     click_button(:@parse_srt)
+     assert File.read(file).contain? "deitys"
+   end
+  
   end # describe MainWindow
   
 end