sensible-cinema 0.19.0 → 0.19.1

data/ChangeLog

@@ -1,3 +1,8 @@
+== 0.19.1 ==
+
+Clarify buttons' meanings, layout (add one), fix some bugs in create mode, like it not re-loading edited files.
+Can optionally watch unedited.
+
 == 0.19.0 ==
 
 Add working EDL playback with mplayer, cleanup interfaces.

data/README

@@ -1,17 +1,17 @@
 Sensible-cinema (also known to us as "paranoid cinema" [inside joke ha ha] ) is a program that allows you to apply 
-programmed edit lists (i.e. Edit Decision Lists) to DVD's you own [2].
+programmed delete lists (i.e. Edit Decision Lists [2]) to DVD's you already own.
 
 I.e. you can edit a DVD to "mute out" or skip certain scenes.
 
 It is essentially a linear editor [1] that applies Edit Decision Lists [2] to videos, by wrapping
-a few freely available open source programs [3] (VLC Media Player, Mplayer/mencoder, ffmpeg et al)
-to accomplish the editing for you.  Then you can sit back and relax as you watch a "sanitized"
+a few freely available open source programs [3]
+to accomplish the editing for you.  Then you can sit back and relax as you watch the "sensible"
 version of your DVD.
 
-To use it, basically install it then run it (see installation section, below).
+To use it, basically install it then run it (see installation, below).
 It will come up with some windows where you choose what you want to do
 
-If you try to make an edited copy of your DVD, note that it will take about one and a half times
+If you try to make a copy of your DVD, note that it will take about one and a half times
 as long as the playtime of the movie itself, so budget some time for it.
 
 Also note that just because a video lacks profanity...does not immediately make it an inspiring experience.
@@ -26,7 +26,7 @@ Enjoy your movies!
 
 [1] http://en.wikipedia.org/wiki/Linear_video_editing
 [2] http://en.wikipedia.org/wiki/Edit_decision_list
-[3] mostly GPL programs, see http://www.gnu.org/licenses/
+[3] mostly GPL programs, see http://www.gnu.org/licenses/ VLC Media Player, Mplayer/mencoder, ffmpeg, etc.
 [4] http://lds.org/library/display/0,4945,161-1-11-1,00.html search for the word "wholesome"
 
 == Installation ==
@@ -35,7 +35,7 @@ To install, download the latest .zip versioned file from: http://rogerdpack.t28.
 then unzip it (right click -> Extract all)
 then "click into it" and search for and run the file "run sensible cinema.bat"
 
-== Creating Your Own Edit Lists, or modifying previously existing ones ==
+== Creating Your Own Delete Lists, or modifying previously existing ones ==
 
 See the accompanied how_to_create.txt file.
 
@@ -56,7 +56,7 @@ A. Probably give them the original DVD and a link to sensible-cinema :)
 
 == Caveats ==
 
-NB that "someone" has to create a edit decision lists, per DVD.
+NB that "someone" has to create a delete list, per DVD.
 If one doesn't yet exist for the DVD you want edited,
 you could employ somebody to create it, or create it yourself.  Make sure to submit it
 back to us when you're done, so that everyone can benefit from it.
@@ -168,7 +168,7 @@ to your EDL and try again.
 
 Also if your DVD playback has no audio, try the "lavc" setting, above.  And report it (see feedback).
 
-It can fail also because an edit decision is past end of DVD, or 
+It can fail also because a deletion is past end of DVD, or 
 Also note that if your DVD has scratches that cause it to skip, the time signatures will be off after that point, 
 so clean your discs and try again!
 

data/Rakefile

@@ -114,6 +114,8 @@ end
 
 desc 'j -S rake bundle_dependencies create_distro_dir ... (releases with clean cache dir, which we need now)'
 task 'full_release' => [:bundle_dependencies, :create_distro_dir, :build] do # :release sigh
-  system("#{Gem.ruby} -S gem push #{Dir['pkg/*.gem'][-1]}") 
+  gems = Dir['pkg/*.gem']
+  gems[0..-2].each{|f| File.delete f} # kill old versions...
+  system("#{Gem.ruby} -S gem push #{gems[-1]}") 
   puts "don't forget to blog about it...and upload .zip of it..."
 end

data/TODO

@@ -3,20 +3,23 @@
 == up next release ==
 
   edit lists:
-    cool runnings
-  make sure release has right .bat files
-    
+    cool runnings EDL
+    stuff from paper
+      less "need java first" messages
+      
 == slightly lower than that, somewhat ordered ==
 
+  @license: requires legal DVD's to be present
+  can you forceidx on the original copy and have mplayer replay EDL in realtime accurately or not?
   linearize edl's
     don't use them linear, just linearize
+      not this release
   
   edit lists:
     temple
-    cool runnings
     cars
   compare computer DVD timings with physical player's timings...
-    if same, add imdb todo's here
+    if same, add imdb todo's up here
   mpeg is lossy (at least my current one pass conversion is)
   check the DVD burning experience too...
     could check if DVD Flick handles *oversize* files well, for information sake 
@@ -28,17 +31,18 @@
   beta release/rinse and repeat with various ppl (once it's releasable...)
   a real'ish-er website
     mailing list, link to it
+    button to mail/submit :)
   play a bigger noise when totally done...(dvd flick'ish...)
   propaganda-ize
     advertise in christian places
-    alternative.to
     blogs that have ever mentioned clearplay :P
     free google adwords (?)
     advertise urug, ruby flow :)
-  add they 'play from unedited till it hits the first bad spot
+  add they 'play from unedited till it hits the first bad spot, if still useful
   
 == DVD backlog (unordered, some very low prio, basically never do) ==
 
+  dvdnav versus dvd for mplayer edl?
   disallow choosing empty drive? fail more gracefully? (issue 11)
   some status bar that shows which DVD is in currently, how many match it, et al (pre button)
   splitter abs. coords option

data/VERSION

@@ -1 +1 @@
-0.19.0
+0.19.1

data/bin/sensible-cinema

@@ -45,17 +45,17 @@ module SensibleSwing
   
   class MainWindow < JFrame
 
-    def new_jbutton title, only_on_create_mode
+    def new_jbutton title, only_on_create_mode, add = false
       button = JButton.new title
       button.set_bounds(44, @starting_button_y, @button_width, 23)
       
-      if only_on_create_mode
-        if ARGV.index("--create-mode") || ARGV.index("-c")
-          increment_button_location
-          @panel.add button
-          @buttons << button
-        end
+      if ARGV.index("--create-mode")
+        add = true if only_on_create_mode
       else
+        add = true if !only_on_create_mode
+      end
+         
+      if add
         increment_button_location
         @panel.add button
         @buttons << button
@@ -126,41 +126,28 @@ module SensibleSwing
 
       @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')
-        if(path.length == 0 || path2.length == 0)
-          # this one has its own license...
-          show_blocking_message_dialog("It appears that you need to install a dependency: SMPlayer.\n
-          Click ok to be directed to its download website, where you can download and install it.", "Lacking dependency", JOptionPane::ERROR_MESSAGE)
-          system_non_blocking("start http://smplayer.sourceforge.net/downloads.php")
-          System.exit(1)
-        else
-          success_no_run, wrote_to_here_fulli = do_copy_dvd_to_hard_drive false, true
-          sleep 5 unless success_no_run
-          command = "smplayer #{wrote_to_here_fulli}"
-          system_non_blocking command
-        end
+        success_no_run, wrote_to_here_fulli = do_copy_dvd_to_hard_drive false, true
+        sleep 5 unless success_no_run
+        command = "smplayer #{wrote_to_here_fulli}"
+        system_non_blocking command
       }
 
       @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
-        on_success = proc { |file|
-          system_non_blocking("smplayer #{file}")          
-        }
-        if success_no_run
-          on_success.call
-        else
-          @after_success_once = on_success # shenanigans to be able to let that thread run...
-        end
+        do_copy_dvd_to_hard_drive true
+      }
+      
+      @preview_section_unedited = new_jbutton("Preview a certain time frame (unedited)", true)
+      @preview_section_unedited.on_clicked {
+        do_copy_dvd_to_hard_drive true, false, 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
+        repeat_last_copy_dvd_to_hard_drive 
       }
 
-      @open_list = new_jbutton("Open/Edit a pre-existing DVD Edit List", true)
+      @open_list = new_jbutton("Open a Delete List", true)
       @open_list.on_clicked {
         dialog = FileDialog.new(self, "Pick file to edit")
         dialog.set_directory EDL_DIR
@@ -168,7 +155,7 @@ module SensibleSwing
         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 = new_jbutton("Create new Delete 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}")
@@ -214,7 +201,7 @@ EOL
       increment_button_location
       increment_button_location
 
-      @exit = new_jbutton("Exit", false).on_clicked {
+      @exit = new_jbutton("Exit", false, true).on_clicked {
         self.close
       }
 
@@ -234,6 +221,7 @@ EOL
     end
     
     def show_blocking_license_accept_dialog program, license_name, license_url_should_also_be_embedded_by_you_in_message, title = 'Confirm Acceptance of License Agreement', message = nil
+      puts 'Please confirm license agreement in an open window'
       old = ['no', 'yes', 'ok'].map{|name| 'OptionPane.' + name + 'ButtonText'}.map{|name| [name, UIManager.get(name)]}
       UIManager.put("OptionPane.yesButtonText", 'Accept')
       UIManager.put("OptionPane.noButtonText", 'View License')
@@ -288,6 +276,19 @@ EOL
           Kernel.puts 'done'
         end
       end
+      
+      if ARGV.index('--create-mode')
+        # they're going to want these dependencies
+        path = RubyWhich.new.which('smplayer')
+        path2 = RubyWhich.new.which('mplayer')
+        if(path.length == 0 || path2.length == 0)
+          # this one has its own license...
+          show_blocking_message_dialog("It appears that you need to install a dependency: SMPlayer.\n
+          Click ok to be directed to its download website, where you can download and install it.", "Lacking dependency", JOptionPane::ERROR_MESSAGE)
+          system_non_blocking("start http://smplayer.sourceforge.net/downloads.php")
+          System.exit(1)
+        end
+      end
     end
 
     def open_file_to_edit_it filename
@@ -331,8 +332,8 @@ EOL
       start_time = JOptionPane.showInputDialog(message, default)
     end
     
-    def parse_edl path
-      EdlParser.parse_file path
+    def parse_edl path, ignore_settings = false
+      EdlParser.parse_file path, ignore_settings
     end
     
     def choose_dvd_and_edl_for_it
@@ -343,7 +344,7 @@ EOL
         edit_list_path = single_edit_list_matches_dvd(md5sum)
         if !edit_list_path
           fc = FileDialog.new(self)
-          fc.set_title "Please pick a DVD Edit Decision List File"
+          fc.set_title "Please pick a DVD Delete List File"
           fc.set_directory EDL_DIR
           edit_list_path = fc.go
         end
@@ -359,6 +360,9 @@ EOL
         end
         [drive, dvd_volume_name, md5sum, edit_list_path, descriptors]
       end
+      # reload it just in case it has changed on disk
+      @_choose_dvd_and_edl_for_it[4] = parse_edl(@_choose_dvd_and_edl_for_it[3])
+      @_choose_dvd_and_edl_for_it
     end
     
     def get_title_track descriptors
@@ -381,12 +385,15 @@ EOL
       end
     end
 
-    def do_copy_dvd_to_hard_drive should_prompt_for_start_and_end_times, exit_early_if_fulli_exists = false
+    def do_copy_dvd_to_hard_drive should_prompt_for_start_and_end_times, exit_early_if_fulli_exists = false, ignore_settings = false
       drive, dvd_volume_name, md5sum, edit_list_path, descriptors = choose_dvd_and_edl_for_it
+      
+      descriptors = parse_edl(edit_list_path, ignore_settings)
+      
       # LODO allow for spaces in the save_to filename
       if should_prompt_for_start_and_end_times
         # only show it once :)
-        @show_block ||= 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") || true
+        @show_block ||= 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 a deletion section 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") || true
         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'])
         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'])
         unless start_time and end_time
@@ -410,7 +417,7 @@ EOL
       
       dvd_title_track = get_title_track(descriptors)
       run_mplayer = should_prompt_for_start_and_end_times || exit_early_if_fulli_exists
-      generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track, run_mplayer
+      generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track, run_mplayer, !ignore_settings
       [false, fulli] # false means it's running in a background thread :P
     end
 
@@ -418,13 +425,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
-      MencoderWrapper.get_bat_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track
+    def get_mencoder_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track, require_deletion_entry
+      MencoderWrapper.get_bat_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track, true, require_deletion_entry # delete partials...
     end
 
-    def generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track, run_mplayer
-      Storage['last_params'] = [save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track, run_mplayer]
-      commands = get_mencoder_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track
+    def generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track, run_mplayer, require_deletion_entry
+      Storage['last_params'] = [save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track, run_mplayer, require_deletion_entry]
+      commands = get_mencoder_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track, require_deletion_entry
       temp_dir = Dir.tmpdir
       temp_file = temp_dir + '/vlc.temp.bat'
       File.write(temp_file, commands)
@@ -443,7 +450,7 @@ EOL
       # LODO warn if they will overwrite a file in the end...
     end
     
-    attr_accessor :background_thread, :after_success_once
+    attr_accessor :background_thread, :after_success_once, :buttons
 
     def run_create_commands batch_commands, save_to, run_mplayer
       @buttons.each{|b| b.set_enabled false}

data/create or edit sensible cinema decision list files.bat

@@ -3,4 +3,4 @@
 @set RUBYOPT=
 @echo This window will display lots of debug message output!
 @cd sensible-cinema && java -cp "./vendor/cache/jruby-complete-1.5.5.jar" org.jruby.Main bin\sensible-cinema --create-mode || echo you need to install java first! please report back the error you see! && pause
-@rem taskkill /f /im mencoder.exe
+@taskkill /f /im mencoder.exe

data/how_to_create.txt

@@ -1,16 +1,16 @@
-You create an edit decision list for sensible cinema to use against whatever you want.
+You create a delete list for sensible cinema to use against whatever you want.
 
-An Edit Decision List looks something like this:
+An delete list looks something like this example:
 
 https://github.com/rdp/sensible-cinema/blob/master/zamples/edit_decision_lists/example_edit_decision_list.txt
 
-Basically your job is to create an appropriate file (like that one) somewhere, 
+Basically your job is to create an appropriate file (like that one), 
 then start sensible-cinema and instruct it to use your new file.
 
 For a DVD, the steps might look like this:
 
-open Sensible cinema in create mode
-insert DVD, click "create new edit list" button
+open Sensible cinema "create mode"
+insert DVD, click "create new" button
 
 click "open ripped version of DVD unedited", right click, create new file, name it something.txt, right click, "open", and then select it.
 
@@ -39,7 +39,7 @@ Also after you're done, you can submit it back to the project by emailing me wit
 
 Also if you want sensible-cinema to be able to auto-choose your EDL, then include its unique id (click the "Get a disk's unique id" button).
 
- I typically like to make two edit lists per DVD.  One that takes out swearing, sex, and gruesome violence, and another
+ I typically like to make two delete lists per DVD.  One that takes out swearing, sex, and gruesome violence, and another
    "more paranoid" version that takes out basically anything that could be offensive to anybody :) ("dang", "fetch", "too tense" of scenes...)
   
 A few pointers:

data/lib/edl_parser.rb

@@ -15,15 +15,18 @@ 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
+
+require_relative 'overlayer'
+
 class EdlParser
 
-  def self.parse_file filename
-    parse_string File.read(filename), filename
+  def self.parse_file filename, ignore_settings = false
+    parse_string File.read(filename), filename, [], ignore_settings
   end
   
   # better eye-ball these before letting people run them, eh?
   # but I couldn't think of any other way
-  def self.parse_string string, filename, ok_categories_array = []
+  def self.parse_string string, filename, ok_categories_array = [], ignore_settings = false
     string = '{' + string + "\n}"
     if filename
      raw = eval(string, binding, filename)
@@ -31,9 +34,14 @@ class EdlParser
      raw = eval string
     end
     
+    raise SyntaxError.new("maybe missing quotation marks?" + string) if raw.keys.contain?(nil)
+    
     # mutes and blank_outs need to be special parsed into arrays...
     mutes = raw["mutes"] || []
     blanks = raw["blank_outs"] || []
+    if ignore_settings
+      mutes = blanks = []
+    end
     raw["mutes"] = convert_to_timestamp_arrays(mutes, ok_categories_array)
     raw["blank_outs"] = convert_to_timestamp_arrays(blanks, ok_categories_array)
     raw
@@ -67,5 +75,58 @@ class EdlParser
     end
     out
   end
+  
+  # divides up mutes and blanks so that they don't overlap, preferring blanks over mutes
+  # returns it like [[start,end,type], [s,e,t]...] type like :blank and :mute
+  def self.convert_incoming_to_split_sectors incoming, add_this_to_mutes = 0
+    mutes = incoming["mutes"] || {}
+    blanks = incoming["blank_outs"] || {}
+    mutes = mutes.map{|k, v| [OverLayer.translate_string_to_seconds(k), OverLayer.translate_string_to_seconds(v) + add_this_to_mutes, :mute]}
+    blanks = blanks.map{|k, v| [OverLayer.translate_string_to_seconds(k), OverLayer.translate_string_to_seconds(v), :blank]}
+
+    combined = (mutes+blanks).sort
+
+    combined.each{|s, e, t|
+      puts 'warning--detected an end before a start' if e < s
+    }
+
+    # VLCProgrammer.convert_to_full_xspf({ "mutes" => {5=> 7}, "blank_outs" => {6=>7} } )
+    # should mute 5-6, skip 6-7
+    previous = combined[0]
+    combined.each_with_index{|(start, endy, type), index|
+      next if index == 0 # nothing to do there..
+      previous_end = previous[1]
+      previous_type = previous[2]
+      previous_start = previous[0]
+      if type == :blank
+        raise 'no overlap like that allowed as of yet' unless previous_end <= endy
+        if previous_type == :mute && previous_end > start
+          previous[1] = start # make it end when we start...
+        end
+      elsif type == :mute
+        if previous_end > start
+          
+          if previous_end >= endy
+            combined[index] = [nil] # null it out...it's a mute subsumed by a blank apparently...
+            if previous_type == :mute
+               raise 'overlapping mute?'
+            end
+            next
+          else
+             # start mine when the last one ended...
+             combined[index] = [previous_end, endy, type]
+          end
+
+        end
+      else
+        raise 'unexpected'
+      end
+      previous = combined[index] 
+    }
+    
+    combined.select{|start, endy, type|
+     (start != nil) && (endy > start) # ignore mutes wholly contained within blanks...
+    }
+  end
 
 end

data/lib/mencoder_wrapper.rb

@@ -16,7 +16,7 @@ This file is part of Sensible Cinema.
     along with Sensible Cinema.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-require_relative 'vlc_programmer'
+require_relative 'edl_parser'
 
 class MencoderWrapper
 
@@ -39,8 +39,8 @@ class MencoderWrapper
     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
-      combined = VLCProgrammer.convert_incoming_to_split_sectors these_settings
+    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
+      combined = EdlParser.convert_incoming_to_split_sectors these_settings
       @dvd_title_track = dvd_title_track
       assert dvd_title_track
       if start_here || end_here
@@ -48,6 +48,7 @@ class MencoderWrapper
         start_here = OverLayer.translate_string_to_seconds(start_here)
         end_here   = OverLayer.translate_string_to_seconds(end_here)
         combined.select!{|start, endy, type| start > start_here && endy < end_here }
+        raise "unable to find deletion entry between #{start_here} and #{end_here}" if require_deletion_entry && combined.length == 0
         # it's relative now, since we rip from not the beginning
         previous_end = start_here
       else

data/lib/mplayer_edl.rb

@@ -21,7 +21,8 @@ require_relative 'vlc_programmer'
 
 class MplayerEdl
   def self.convert_to_edl specs, add_this_many_to_end = 0
-    combined = VLCProgrammer.convert_incoming_to_split_sectors specs, add_this_many_to_end
+    # simple re-map.
+    combined = EdlParser.convert_incoming_to_split_sectors specs, add_this_many_to_end
     out = ''
     map = {:mute => 1, :blank => 0}
     for start, endy, type in combined

data/lib/vlc_programmer.rb

@@ -24,57 +24,6 @@ class VLCProgrammer
     @overlayer.translate_time_to_human_readable s
   end
   
-  # divides up mutes and blanks so that they don't overlap, preferring blanks over mutes
-  # returns it like [[start,end,type], [s,e,t]...] type like :blank and :mute
-  def self.convert_incoming_to_split_sectors incoming, add_this_to_mutes = 0
-    mutes = incoming["mutes"] || {}
-    blanks = incoming["blank_outs"] || {}
-    mutes = mutes.map{|k, v| [OverLayer.translate_string_to_seconds(k), OverLayer.translate_string_to_seconds(v) + add_this_to_mutes, :mute]}
-    blanks = blanks.map{|k, v| [OverLayer.translate_string_to_seconds(k), OverLayer.translate_string_to_seconds(v), :blank]}
-
-    combined = (mutes+blanks).sort
-
-    combined.each{|s, e, t|
-      puts 'warning--detected an end before a start' if e < s
-    }
-
-    # VLCProgrammer.convert_to_full_xspf({ "mutes" => {5=> 7}, "blank_outs" => {6=>7} } )
-    # should mute 5-6, skip 6-7
-    combined.each_with_index{|(start, endy, type), index|
-      next if index == 0 # nothing to do there..
-      previous = combined[index-1]
-      previous_end = previous[1]
-      previous_type = previous[2]
-      previous_start = previous[0]
-      if type == :blank
-        raise 'no overlap like that allowed as of yet' unless previous_end <= endy
-        if previous_type == :mute && previous_end > start
-          previous[1] = start # make it end when we start...
-        end
-      elsif type == :mute
-        if previous_end > start
-          
-          if previous_end >= endy
-            combined[index] = [nil] # null it out...it's a mute subsumed by a blank apparently...
-            if previous_type == :mute
-               raise 'overlapping mute?'
-            end
-          else
-             # start mine when the last one ended...
-             combined[index] = [previous_end, endy, type]
-          end
-
-        end
-     
-      else
-        raise 'unexpected'
-      end
-    }
-    
-    combined.select{|start, endy, type|
-     (start != nil) && (endy > start) # ignore mutes wholly contained within blanks...
-    }
-  end
 
   def self.convert_to_full_xspf incoming, filename = nil, drive_with_slash = nil, dvd_title_track = nil, dvd_title_name = nil
   
@@ -82,7 +31,7 @@ class VLCProgrammer
     @filename_or_playlist_if_nil = filename
     @dvd_title_track = dvd_title_track || "1"
     @dvd_title_name = dvd_title_name
-    combined = convert_incoming_to_split_sectors incoming
+    combined = EdlParser.convert_incoming_to_split_sectors incoming
     
     out = get_header
 

data/sensible-cinema.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.19.0"
+  s.version = "0.19.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
-  s.date = %q{2010-12-18}
+  s.date = %q{2010-12-21}
   s.email = %q{rogerdpack@gmail.com}
   s.executables = ["sensible-cinema", "sensible-cinema-cli"]
   s.extensions = ["ext/mkrf_conf.rb"]
@@ -62,6 +62,7 @@ Gem::Specification.new do |s|
     "spec/convert_image.rb",
     "spec/drive_info.spec.rb",
     "spec/edl_parser.spec.rb",
+    "spec/go_line.bat",
     "spec/images/black.bmp",
     "spec/images/colon.bmp",
     "spec/images/hulu_0.bmp",

data/spec/edl_parser.spec.rb

@@ -38,7 +38,8 @@ describe EdlParser do
     ["01:01:00", "01:02:00", "profanity", "bodily function 1"]], 
     "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"
+    "whatever_else_you_want"=>"this is the old version of the film",
+
    }
    E.parse_string(string, nil).should == expected
   end
@@ -90,4 +91,13 @@ describe EdlParser do
     end
   end
   
+  it "should reject misformatted files" do
+    proc {E.parse_string 'mutes=>["0:33", "0:34"]', 'filename'}.should raise_error(SyntaxError)
+    proc {E.parse_string '"mutes"=>["0:33", "0:34"]', 'filename'}.should_not raise_error
+  end
+  
+  it "should be able to optionally ignore settings" do
+    E.parse_string('"mutes"=>["0:33", "0:34"]', 'filename', [], true)['mutes'].should == []
+  end
+  
 end

data/spec/go_line.bat

@@ -0,0 +1 @@
+jd -S rspec sensible_cinema_gui.spec.rb -l %*

data/spec/mencoder_wrapper.spec.rb

@@ -208,7 +208,7 @@ describe MencoderWrapper do
   
   it "should allow you to play something even if there's no edit list, just for examination sake" do
     setup
-    proc { MencoderWrapper.get_bat_commands @settings, "e:\\", 'to_here', '00:14', '00:15'}.should_not raise_error(/unable/)
+    proc { MencoderWrapper.get_bat_commands @settings, "e:\\", 'to_here', '00:14', '00:15', "1", false, true}.should raise_error(/unable/)
   end
   
 end

data/spec/sensible_cinema_gui.spec.rb

@@ -58,20 +58,26 @@ module SensibleSwing
       @subject.single_edit_list_matches_dvd 'fake md5'
     end
     
-    it "should prompt if two EDL's match a DVD title" do
+    def with_clean_edl_dir_as this
+      FileUtils.rm_rf 'temp'
+      Dir.mkdir 'temp'
       old_edl = MainWindow::EDL_DIR
+      MainWindow.const_set(:EDL_DIR, 'temp')
       begin
-        MainWindow.const_set(:EDL_DIR, 'temp')
-        FileUtils.rm_rf 'temp'
-        Dir.mkdir 'temp'
+        yield
+      ensure
+        MainWindow.const_set(:EDL_DIR, old_edl)
+      end
+    end
+    
+    it "should prompt if two EDL's match a DVD title" do
+      with_clean_edl_dir_as 'temp' do
         MainWindow.new.single_edit_list_matches_dvd("BOBS_BIG_PLAN").should be nil
         Dir.chdir 'temp' do
           File.binwrite('a.txt', "\"disk_unique_id\" => \"abcdef1234\"")
           File.binwrite('b.txt', "\"disk_unique_id\" => \"abcdef1234\"")
         end
         MainWindow.new.single_edit_list_matches_dvd("abcdef1234").should be nil
-      ensure
-      MainWindow.const_set(:EDL_DIR, old_edl)
       end
     end
 
@@ -89,9 +95,9 @@ module SensibleSwing
         ["mock_dvd_drive", "Volume", "19d121ae8dc40cdd70b57ab7e8c74f76"] # happiest baby on the block
       }
       @subject.stub!(:get_mencoder_commands) { |*args|
-        args[-4].should match(/abc/)
+        args[-5].should match(/abc/)
         @args = args
-        'sleep 0.1'
+        'fake get_mencoder_commands'
       }
       @subject.stub!(:new_filechooser) {
         FakeFileChooser.new
@@ -148,7 +154,7 @@ module SensibleSwing
     it "should call through to explorer for the full thing" do
       @subject.do_copy_dvd_to_hard_drive(false)
       @subject.background_thread.join
-      @args[-3].should == nil
+      @args[-4].should == nil
       @system_blocking_command.should match /explorer/
       @system_blocking_command.should_not match /fulli/
     end
@@ -162,17 +168,17 @@ 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[-1].should == 1
-     @args[-2].should == "01:00"
+     @args[-2].should == 1
+     @args[-3].should == "01:00"
      @command.should match /smplayer/
      @command.should_not match /fulli/
     end
 
     def prompt_for_start_and_end_times
-      @subject.instance_variable_get(:@preview_section).simulate_click
-      @args[-1].should == 1
-      @args[-2].should == "01:00"
-      @subject.background_thread.join
+      click_button(:@preview_section)
+      join_background_thread
+      @args[-2].should == 1
+      @args[-3].should == "01:00"
       @command.should match /smplayer/
     end
 
@@ -180,6 +186,21 @@ module SensibleSwing
       prompt_for_start_and_end_times
     end
     
+    temp_dir = Dir.tmpdir
+    
+    def join_background_thread
+      @subject.background_thread.join
+    end
+    
+    it "should be able to preview unedited" do
+      @subject.stub!(:get_user_input).and_return('06:00', '07:00')
+      @subject.unstub!(:get_mencoder_commands)
+      click_button(:@preview_section_unedited)
+      join_background_thread
+      temp_file = temp_dir + '/vlc.temp.bat'
+      File.read(temp_file).should include("59.99")
+    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
@@ -190,7 +211,17 @@ module SensibleSwing
       @command.should match(/smplayer/)
     end
     
-    it "if the .done file exists, it should directly call smplayer" do
+    it "should raise if you watch an edited time frame with no edits in it" do
+      @subject.unstub!(:get_mencoder_commands)
+      proc { prompt_for_start_and_end_times }.should raise_error(/unable to find deletion entry/)
+      @subject.stub!(:get_user_input).and_return('06:00', '07:00')
+      # rspec bug: wrong backtrace: proc { prompt_for_start_and_end_times #}.should_not raise_error LODO
+      click_button(:@preview_section) # doesn't raise
+      join_background_thread
+      @system_blocking_command.should == "echo wrote (probably successfully) to abc.avi"
+    end
+    
+    it "if the .done files exists, it should directly call smplayer" do
       FileUtils.touch "abc.fulli_unedited.tmp.mpg.done"
       @subject.instance_variable_get(:@watch_unedited).simulate_click
       @command.should == "smplayer abc.fulli_unedited.tmp.mpg"
@@ -201,7 +232,7 @@ module SensibleSwing
       @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
     end
     
     it "should create a new file for ya" do
@@ -231,12 +262,11 @@ module SensibleSwing
     end
     
     it "should play edl with elongated mutes" do
-      temp_dir = Dir.tmpdir
       temp_file = temp_dir + '/mplayer.temp.edl'
       click_button(:@mplayer_edl).join
       wrote = File.read(temp_file)
       # normally "378.0 379.1 1\n"
-      wrote.should include("380.6 1")
+      wrote.should include("380.85 1")
     end
     
     it "should only prompt for drive once" do
@@ -251,6 +281,18 @@ module SensibleSwing
       count.should == 1
     end
     
+    it "should allow for file to change contents while editing it" do
+      with_clean_edl_dir_as 'temp' do
+        File.binwrite('temp/a.txt', "\"disk_unique_id\" => \"abcdef1234\"")
+        @subject.stub!(:choose_dvd_drive) {
+          ["mock_dvd_drive", "Volume", "abcdef1234"]
+        }
+        @subject.choose_dvd_and_edl_for_it[4]['mutes'].should == []
+        File.binwrite('temp/a.txt', '"disk_unique_id" => "abcdef1234","mutes"=>["0:33", "0:34"]')
+        @subject.choose_dvd_and_edl_for_it[4]['mutes'].should_not == []
+      end
+    end
+    
     it "should only prompt for save to filename once" do
       count = 0
       @subject.stub!(:new_filechooser) {
@@ -262,8 +304,16 @@ module SensibleSwing
       count.should == 1
     end
     
-    it "should prompt you if you need to insert a dvd"
+    it "should prompt you if you need to insert a dvd" do
+      # it does :)
+    end
     
+    it "should not show the normal buttons in create mode" do
+      MainWindow.new.buttons.length.should == 3 # exit button, two normal buttons
+      ARGV << "--create-mode"
+      MainWindow.new.buttons.length.should == 8
+      ARGV.pop # cleanup--why not :)
+    end
     
   end
   

data/spec/vlc_programmer.spec.rb

@@ -92,6 +92,11 @@ describe 'VLC Programmer' do
     a.scan(/ to /).length.should == 2 # 0->6, 7 -> end
 
   end
+  
+  it "should ignore a mute wholly within a blank" do
+    a = VLCProgrammer.convert_to_full_xspf({ "mutes" => {6=> 7}, "blank_outs" => {5=>8, 9=>10} } )
+    a.scan(/ to /).length.should == 3 # 0->5, 8 -> 9, 10 => end
+  end
 
   it "should not try to save it to a file from within the xml" do
     a = VLCProgrammer.convert_to_full_xspf({ "mutes" => {5=>10} } )

data/zamples/edit_decision_lists/dvds/COOL_RUNNINGS.txt

@@ -1,11 +1,8 @@
 # comments can go after a # on any line.
 "mutes" => [
  "14:53.7", "14:55", "greetings sled g..",
- #59:16
- #59:22
- #59:52 dang good apology
- #1:02:08 "butt whipped"
- #1:02:27 "butt whipping"
+ "1:02:03", "1:02:04", "butt whipped"
+ "1:02:36", "1:02:37", "butt whipping" #not verified
  #1:01:40 "sled g... does it again"
 ],
 
@@ -17,8 +14,8 @@
   "1:16:57.0" , "1:16:57.5", "bad a..",
   # 15:22 irv beats his radio with pool cue should go...
   "15:20", "15:30",
-  "59:15", "59:59",
-  "1:01:35", "1:01:45"
+  "59:15", "59:59", "bad arsenic ...",
+  
 ],
 
 "disk_unique_id" => "5a0a43f52e5d5e705fdfaa831b38409b",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 19
-    - 0
-  version: 0.19.0
+    - 1
+  version: 0.19.1
 platform: ruby
 authors: 
   - Roger Pack
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-18 00:00:00 -07:00
+date: 2010-12-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -200,6 +200,7 @@ files:
   - spec/convert_image.rb
   - spec/drive_info.spec.rb
   - spec/edl_parser.spec.rb
+  - spec/go_line.bat
   - spec/images/black.bmp
   - spec/images/colon.bmp
   - spec/images/hulu_0.bmp