sensible-cinema 0.18.1 → 0.18.2

data/TODO

@@ -2,11 +2,6 @@
   
 == up next release ==
 
-  realtime
-    mplayer EDL...
-      test...
-        out of order ok?
-  
   simplify/de-bugify
   
     that button shows up? (issue 10)
@@ -15,7 +10,8 @@
     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...
+    only pick output filename once per session...
+    kill mencoder instances.
   
 calculating disk's unique id...
 F:\, Roger's Wedding, a2e3ece630251e4a785218ce71a20ce1
@@ -30,7 +26,6 @@ D:\dev\sensible-cinema-never-commit-from-here\zamples\edit_decision_lists\dvds/p
   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 ==
 
   compare computer DVD timings with physical player...
@@ -53,6 +48,7 @@ D:\dev\sensible-cinema-never-commit-from-here\zamples\edit_decision_lists\dvds/p
 
 == DVD backlog (unordered, some very low prio, basically never do) ==
 
+  fix some specz
   can pull from imdb at package time [?]
   delete fulli file
     except if it's a specific scene run...
@@ -112,7 +108,6 @@ D:\dev\sensible-cinema-never-commit-from-here\zamples\edit_decision_lists\dvds/p
   re-do DVD EDL's that need it :P
    all dogs go to heaven...finish EDL
   warn when labels exist and don't match...
-  kill old mencoder instances more often...
   auto-download imagemagick, too
   check all the many options to see if there's a "cross platform way to split files accurately" besides my hacky kludge.
   can rip from a DVD-like local folder (would anybody ever need this?)

data/VERSION

@@ -1 +1 @@
-0.18.1
+0.18.2

data/bin/sensible-cinema

@@ -25,14 +25,19 @@ require 'sane' # failure here means you haven't bundled your dependencies...[rak
 require_relative '../lib/mencoder_wrapper'
 require_relative '../lib/storage'
 require_relative '../lib/edl_parser'
+require_relative '../lib/mplayer_edl'
 
 require 'tmpdir'
 require_relative '../lib/swing_helpers'
 require_relative '../lib/drive_info'
 require 'whichr'
 
+# must put mencoder first, as it has a working mplayer.exe in it...
 ENV['PATH'] = ENV['PATH'] + ';' + File.expand_path(File.dirname(__FILE__)) + '/../vendor/cache/mencoder'.to_filename
-ENV['PATH'] = ENV['PATH'] + ";d:\\Program Files\\SMPlayer;c:\\Program Files\\SMPlayer"
+
+for drive in ['c', 'd', 'e']
+  ENV['PATH'] = ENV['PATH'] + ";#{drive}:\\Program Files\\SMPlayer;#{drive}"
+end
 
 module SensibleSwing
   class MainWindow < JFrame
@@ -99,11 +104,31 @@ module SensibleSwing
       @create.on_clicked {
         do_copy_dvd_to_hard_drive false
       }
+      
+      @edl = new_jbutton( "Watch from DVD edited", false )
+      @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...
+        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
+      }
 
-      @watch_unedited = new_jbutton("Watch the current DVD unedited (from hard drive)", true) # LODO watch in realtime option--then rippers and watchers can combine
+      @watch_unedited = new_jbutton("Watch the current DVD unedited (from hard drive)", true)
       @watch_unedited.on_clicked {
         path = RubyWhich.new.which('smplayer')
-        if(path.length == 0)
+        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)
@@ -118,12 +143,15 @@ module SensibleSwing
           if success_no_run
             on_success.call
           else
-            @after_success_once = on_success # shenanigans to be able to let that thread run...
+            Thread.new { 
+              sleep 5; on_success.call # start it anyway :) 
+            }
+            #@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", false)
+      @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
@@ -262,7 +290,7 @@ EOL
           download("http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip", "7za920.zip")
           system_blocking("unzip -o 7za920.zip") # -o means "overwrite" without prompting
           # now we have 7za.exe
-          Kernel.print 'downloading mencoder'
+          Kernel.print 'downloading mencoder.7z...'
           download("http://downloads.sourceforge.net/project/mplayer-win32/MPlayer%20and%20MEncoder/revision%2032492/MPlayer-rtm-svn-32492.7z", "mencoder.7z")
           system_blocking("7za e mencoder.7z -y -omencoder")
           Kernel.puts 'done'
@@ -306,8 +334,8 @@ EOL
     def get_user_input(message, default = '')
       start_time = JOptionPane.showInputDialog(message, default)
     end
-
-    def do_copy_dvd_to_hard_drive should_prompt_for_start_and_end_times, want_full_list = false
+    
+    def choose_dvd_and_edl_for_it
       drive, dvd_volume_name, md5sum = choose_dvd_drive
       puts "#{drive}, #{dvd_volume_name}, #{md5sum}"
       edit_list_path = single_edit_list_matches_dvd(md5sum)
@@ -317,9 +345,14 @@ EOL
         fc.set_directory EDL_DIR
         edit_list_path = fc.go
       end
-      return unless edit_list_path
+      raise 'cancelled' unless edit_list_path
       descriptors = EdlParser.parse_file edit_list_path
+      return drive, dvd_volume_name, md5sum, edit_list_path, descriptors
+    end
 
+    def do_copy_dvd_to_hard_drive should_prompt_for_start_and_end_times, want_full_list = false
+      drive, dvd_volume_name, md5sum, edit_list_path, descriptors = choose_dvd_and_edl_for_it
+      
       dvd_title = descriptors['title'] || dvd_volume_name
 
       fc = new_filechooser
@@ -347,9 +380,9 @@ 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"]
+      dvd_title_track = descriptors["dvd_title_track"] || "1"
       # how does save_to map to fulli?
-      fulli = save_to + ".fulli.tmp.avi"
+      fulli = MencoderWrapper.calculate_final_filename save_to
       if want_full_list
         # make it create a dummy response file for us :)
         start_time = "00:00"
@@ -416,7 +449,7 @@ EOL
       @progress_bar.visible=false
       @buttons.each{|b| b.set_enabled true}
       if success
-        saved_to = save_to + '.avi' # LODO pass this out?
+        saved_to = save_to + '.avi'
         if @after_success_once
           @after_success_once.call saved_to
         else

data/lib/mencoder_wrapper.rb

@@ -34,10 +34,15 @@ class MencoderWrapper
       out + "call mencoder dvdnav://#{@dvd_title_track} -of mpeg -mpegopts format=dvd:tsaf -alang en -nocache -sid 1000 -oac #{audio_codec} #{video_opts} -ovc lavc -o #{@big_temp} -dvd-device #{this_drive} && echo got_file > #{@big_temp}.done\n"
     end
     
+    def calculate_final_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
       combined = VLCProgrammer.convert_incoming_to_split_sectors these_settings
       @dvd_title_track = dvd_title_track
+      assert dvd_title_track
       if start_here || end_here
         raise 'need both' unless end_here && start_here
         start_here = OverLayer.translate_string_to_seconds(start_here)
@@ -48,7 +53,7 @@ class MencoderWrapper
       else
         previous_end = 0
       end
-      @big_temp = to_here_final_file + ".fulli_unedited.tmp.mpg"
+      calculate_final_filename to_here_final_file
       out = get_header this_drive, these_settings
       @idx = 0
       combined.each {|start, endy, type|

data/lib/mplayer_edl.rb

@@ -15,20 +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'
+require_relative 'vlc_programmer'
 
 class MplayerEdl
   def self.convert_to_edl specs
-    out = []
-    for type, metric in {"mutes" => 1, "blank_outs" => 0}
-      specs[type].each{|start, endy, other|
-        out << [OverLayer.translate_string_to_seconds(start), OverLayer.translate_string_to_seconds(endy), metric]
-      }
+    combined = VLCProgrammer.convert_incoming_to_split_sectors specs
+    out = ''
+    map = {:mute => 1, :blank => 0}
+    for start, endy, type in combined
+      out += "#{start} #{endy} #{map[type]}\n"
     end
-    real_out = ''
-    out.sort.each{|start, endy, metric|
-      real_out += "#{start} #{endy} #{metric}\n"
-    }
-    real_out
+    out
   end
 end

data/lib/vlc_programmer.rb

@@ -24,6 +24,8 @@ 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
     mutes = incoming["mutes"] || {}
     blanks = incoming["blank_outs"] || {}
@@ -36,7 +38,7 @@ class VLCProgrammer
       puts 'warning--detected an end before a start' if e < s
     }
 
-    # a = VLCProgrammer.convert_to_full_xspf({ "mutes" => {5=> 7}, "blank_outs" => {6=>7} } )
+    # 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..

data/sensible-cinema.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.18.1"
+  s.version = "0.18.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]

data/spec/mplayer_edl.spec.rb

@@ -30,4 +30,13 @@ describe MplayerEdl do
 2793.5 2801.0 1
 EOL
   end
+  
+  
+  it "should ignore overlaps" do
+    a = MplayerEdl.convert_to_edl({ "mutes"=>{105=>145}, "blank_outs" => {105 => 145} } )
+    a.should == <<EOL
+105.0 145.0 0
+EOL
+    
+  end
 end

data/spec/sensible_cinema_gui.spec.rb

@@ -53,11 +53,15 @@ module SensibleSwing
     it "should modify path to have mencder available, and ffmpeg, and download them on the fly" do
       ENV['PATH'].should include("mencoder")
     end
-
+    
+    it "should not modify path to have mplayer available" do
+      ENV['PATH'].should_not include("mplayer")
+    end
+    
     before do
       @subject = MainWindow.new
       @subject.stub!(:choose_dvd_drive) {
-        ["drive", "Volume", "19d121ae8dc40cdd70b57ab7e8c74f76"] # happiest baby on the block
+        ["mock_dvd_drive", "Volume", "19d121ae8dc40cdd70b57ab7e8c74f76"] # happiest baby on the block
       }
       @subject.stub!(:get_mencoder_commands) { |*args|
         args[-5].should match(/abc/)
@@ -90,10 +94,12 @@ module SensibleSwing
     end
     
     it "should be able to do a normal copy to hard drive, edited" do
-      @subject.do_copy_dvd_to_hard_drive(false).should == [false, "abc.fulli.tmp.avi"]
+      @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 call through to explorer for the full thing" do
       @subject.do_copy_dvd_to_hard_drive(false)
       @subject.background_thread.join
@@ -103,13 +109,13 @@ module SensibleSwing
     end
     
     it "should be able to return the full list if it already exists" do
-      FileUtils.touch "abc.fulli.tmp.avi.done"
-      @subject.do_copy_dvd_to_hard_drive(false,true).should == [true, "abc.fulli.tmp.avi"]
-      FileUtils.rm "abc.fulli.tmp.avi.done"
+      FileUtils.touch "abc.fulli_unedited.tmp.mpg.done"
+      @subject.do_copy_dvd_to_hard_drive(false,true).should == [true, "abc.fulli_unedited.tmp.mpg"]
+      FileUtils.rm "abc.fulli_unedited.tmp.mpg.done"
     end
     
     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.tmp.avi"]
+     @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"
@@ -139,20 +145,17 @@ module SensibleSwing
     
     
     it "if the .done file exists, it should directly call smplayer" do
-      FileUtils.touch "abc.fulli.tmp.avi.done"
+      FileUtils.touch "abc.fulli_unedited.tmp.mpg.done"
       @subject.instance_variable_get(:@watch_unedited).simulate_click
-      @command.should == "smplayer abc.fulli.tmp.avi"
-      FileUtils.rm "abc.fulli.tmp.avi.done"
+      @command.should == "smplayer abc.fulli_unedited.tmp.mpg"
+      FileUtils.rm "abc.fulli_unedited.tmp.mpg.done"
     end
     
-    it "if the .done file does not exist, it should call mplayer later" do
-      @subject.instance_variable_get(:@watch_unedited).simulate_click
-      @subject.after_success_once.should_not == nil
-      @command.should == nil # scary timing spec
-      @subject.background_thread.join
-      # should have cleaned up...
+    it "if the .done file does not exist, it should call smplayer ja" do
+      @subject.stub!(:sleep) {} # speed this up...
+      @subject.instance_variable_get(:@watch_unedited).simulate_click.join
       @subject.after_success_once.should == nil
-      @command.should_not == nil
+      @command.should_not == nil # scary timing spec
     end
     
     it "should create a new file for ya" do
@@ -172,9 +175,17 @@ module SensibleSwing
       end
     end
     
-    it "should display unique" do
+    it "should display unique disc in an input box" do
       @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
+      
+      @command.should match(/mplayer.*-edl/)
+      @command.should match(/-dvd-device /)
+      p @command
+    end
+    
   end
 end

data/zamples/edit_decision_lists/dvds/bob the builder pets in a pickle.txt

@@ -2,8 +2,9 @@
 
 "disk_unique_id" => "dc5a1b0081d60a94f1d7742ee14759cd",
 
-#"blank_outs" => [
-#  "5:44", "6:10",
-#],
+"blank_outs" => [
+  "5:44", "6:10",
+  "0:10", "0:20",
+],
 
 # appears pretty clean overall...

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 18
-    - 1
-  version: 0.18.1
+    - 2
+  version: 0.18.2
 platform: ruby
 authors: 
   - Roger Pack