sensible-cinema 0.19.3 → 0.19.4

data/ChangeLog

@@ -1,3 +1,13 @@
+== 0.19.4 ==
+
+Now you can specify an arbitrary "precision" around mute settings to make them more conservative or not.
+Add audio alert.
+Fix broken button.
+
+== 0.19.3 ==
+
+Hopefully work with audio from more DVD's now.
+
 == 0.19.2 ==
 
 More user friendliness.

data/TODO

@@ -2,44 +2,42 @@
   
 == up next release ==
 
-  edit lists actually *working*:
+  low hanging fruit/bugs:
     cool runnings at home
-    temple at home
-    cars bring home :)
+    edl straight is broken on HP at 2 hours
+      if it's all blank outs works right then? baby/HP?
 
 == slightly lower than that, somewhat ordered ==
 
-  broken button
-  edl is broken on HP at 2 hours, "from the dvd straight"
-  mplayer edl if it's all blank outs works right then?
-  fix edl_parser spec
-  detect disks have changed, re-query.
-  cleaner error on locked file :)
+  temple at home
+  cars bring home :)
   linearize edl's
     don't use them linear, just linearize
       not this release
-  play a bigger noise when totally done...(dvd flick'ish...)
   mpeg is lossy (at least my current one pass conversion still is...) AND SO SLOW FOR EDITING and smplayer can't play it right unedited
     frame accurate splitter
   can I use ffmpeg to re-sync audio, and be able to re-play the edited copy, and thus avoid the small but extra harddup overhead (basically "just avoid")?
     I can live with "watching while grabbing" being lack luster...or maybe I can grab it with acodec copy (typically), then reencode it somehow later into something that is friendlier to computer players...or is it encoders?
       appears the only messed up audio one is smplayer...and probably mplayer with DVD's [?]
-  button start EDL playback here [?]
+        do this after frame accurate
   partner for filters (Jon, Karlie if interested...give beta)
     lotsa filters somehow
       my dvd's (loose timestamps...)
       partners'...
       only after linearize
+  button start EDL playback here [?] (for create mode)
   beta release/rinse and repeat with various ppl (once it's releasable...)
   a real'ish-er website
     link to ML
   compare computer DVD timings with physical player's timings...
     if same, add imdb todo's up here
+  cleaner user error on locked file :)
   propaganda-ize
     advertise in christian places
     blogs that have ever mentioned clearplay :P
     free google adwords (?)
     advertise urug, ruby flow :)
+    only after new year
   add they 'play from unedited from grab till it hits the first bad spot', if useful [?]
   md5 and verify the fulli version... [?]
     only useful once I get the frame accurate stuff done, and any audio tweakage, etc.

data/VERSION

@@ -1 +1 @@
-0.19.3
+0.19.4

data/bin/sensible-cinema

@@ -26,6 +26,7 @@ require_relative '../lib/mencoder_wrapper'
 require_relative '../lib/storage'
 require_relative '../lib/edl_parser'
 require_relative '../lib/mplayer_edl'
+require_relative '../lib/play_audio'
 
 require 'tmpdir'
 require_relative '../lib/swing_helpers'
@@ -77,8 +78,9 @@ module SensibleSwing
     
     # make them choose which system call to use explicitly
     undef system
+    
     def initialize
-      super "Sensible-Cinema (gpl)"
+      super "Sensible-Cinema #{VERSION} (GPL)"
       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.TXT file', File.expand_path(File.dirname(__FILE__) + "/../LICENSE.TXT"), 'LICENSE.TXT file', 'I acknowledge that I have read the LICENSE.TXT file.'
@@ -105,13 +107,13 @@ module SensibleSwing
         do_copy_dvd_to_hard_drive false
       }
       
-      @mplayer_edl = new_jbutton( "Watch DVD on computer edited realtime", true ) # TODO enable once it works with HP
+      @mplayer_edl = new_jbutton( "Watch DVD on computer edited realtime (might not work)", false )
       @mplayer_edl.on_clicked {
         drive, dvd_volume_name, md5sum, edl_path, descriptors = choose_dvd_and_edl_for_it
         descriptors = EdlParser.parse_file edl_path
         temp_dir = Dir.tmpdir
         temp_file = temp_dir + '/mplayer.temp.edl'
-        edl_contents = MplayerEdl.convert_to_edl descriptors, 5.75 # add a sec to mutes to accomodate for mplayer's oddness...
+        edl_contents = MplayerEdl.convert_to_edl descriptors, 1.75 # add a sec to mutes to accomodate for mplayer's oddness...
         File.write(temp_file, edl_contents)
         title_track = get_title_track(descriptors)
         # oh the insanity of the console UI...LODO more user friendly player
@@ -126,7 +128,7 @@ module SensibleSwing
 
       @watch_unedited = new_jbutton("Watch a DVD unedited (while grabbing to hard drive)", true)
       @watch_unedited.on_clicked {
-        success_no_run, wrote_to_here_fulli = do_copy_dvd_to_hard_drive false, true
+        success_no_run, wrote_to_here_fulli = do_copy_dvd_to_hard_drive false, true, true
         sleep 5 unless success_no_run
         command = "smplayer #{wrote_to_here_fulli}"
         system_non_blocking command
@@ -193,7 +195,7 @@ EOL
         This is used to identify a disk to match it to its EDL, later.", "\"disk_unique_id\" => \"#{md5}\",")
       }
       
-      @upload = new_jbutton( "Upload/e-mail suggestion/Submit anything").on_clicked {
+      @upload = new_jbutton( "Upload/E-mail suggestion/Submit anything", true).on_clicked {
         system_non_blocking("start mailto:sensible-cinema@googlegroups.com")
         system_non_blocking("start http://groups.google.com/group/sensible-cinema")
       }
@@ -343,9 +345,9 @@ EOL
     end
     
     def choose_dvd_and_edl_for_it
-      @_choose_dvd_and_edl_for_it ||= 
+      drive, dvd_volume_name, md5sum = choose_dvd_drive
+      @_edit_list_path ||= 
       begin
-        drive, dvd_volume_name, md5sum = choose_dvd_drive
         puts "#{drive}, #{dvd_volume_name}, #{md5sum}"
         edit_list_path = single_edit_list_matches_dvd(md5sum)
         if !edit_list_path
@@ -355,22 +357,20 @@ EOL
           edit_list_path = fc.go
         end
         raise 'cancelled' unless edit_list_path
-        [drive, dvd_volume_name, md5sum, edit_list_path, nil]
+        edit_list_path
       end
       
       # reload it just in case it has changed on disk
-      edit_list_path = @_choose_dvd_and_edl_for_it[3]
       descriptors = nil
       while(!descriptors)
           begin
-            descriptors = parse_edl edit_list_path
+            descriptors = parse_edl @_edit_list_path
           rescue SyntaxError => e
             puts e
-            show_blocking_message_dialog("your file has an error--please fix then hit ok: \n" + edit_list_path + "\n " + e)
+            show_blocking_message_dialog("your file has an error--please fix then hit ok: \n" + @_edit_list_path + "\n " + e)
           end
       end
-      @_choose_dvd_and_edl_for_it[-1] = descriptors
-      @_choose_dvd_and_edl_for_it
+      [drive, dvd_volume_name, md5sum, @_edit_list_path, descriptors]
     end
     
     def get_title_track descriptors
@@ -465,7 +465,7 @@ EOL
       # LODO warn if they will overwrite a file in the end...
     end
     
-    attr_accessor :background_thread, :after_success_once, :buttons
+    attr_accessor :background_thread, :buttons
 
     def run_create_commands batch_commands, save_to, run_mplayer
       @buttons.each{|b| b.set_enabled false}
@@ -497,6 +497,7 @@ EOL
           show_file = "explorer /e,/select,\"#{File.expand_path(saved_to).to_filename}\""
           system_blocking show_file # returns immediately
           show_blocking_message_dialog "Done--you may now watch file #{saved_to} in SMPlayer or VLC player"
+          PlayAudio.play(File.expand_path(File.dirname(__FILE__)) + "/../vendor/music.wav")
         end
       else
         show_blocking_message_dialog("Failed--please examine console output and report back!\nAlso consult the troubleshooting section of the README file.", "Failed", JOptionPane::ERROR_MESSAGE)
@@ -505,7 +506,11 @@ EOL
 
     # returns e:\, volume, md5sum
     def choose_dvd_drive
-      opticals = DriveInfo.get_dvd_drives_as_win32ole
+      opticals = DriveInfo.get_dvd_drives_as_openstruct
+      if @saved_opticals == opticals
+        # memoize :)
+        return @_choose_dvd_drive
+      end
       show_blocking_message_dialog 'insert dvd first' unless opticals.find{|d| d.VolumeName }
       names = opticals.map{|d| d.Name + "\\" + " (" +  (d.VolumeName || 'Insert DVD and re-start') + ")"}
 
@@ -524,7 +529,9 @@ EOL
         prefix = names[selected_idx][0..2]
         puts "calculating disk's unique id..."
         md5sum = DriveInfo.md5sum_disk(prefix)
-        return prefix, opticals[selected_idx].VolumeName, md5sum
+        @_choose_dvd_drive = [prefix, opticals[selected_idx].VolumeName, md5sum]
+        @saved_opticals = opticals
+        return @_choose_dvd_drive
       else
         puts 'did not select a drive...exiting'
         java.lang.System.exit 1

data/lib/drive_info.rb

@@ -17,6 +17,7 @@ This file is part of Sensible Cinema.
 =end
 require 'digest/md5'
 require 'ruby-wmi'
+require 'ostruct'
 
 class DriveInfo
 
@@ -30,9 +31,9 @@ class DriveInfo
   digest.hexdigest
  end
 
- def self.get_dvd_drives_as_win32ole
+ def self.get_dvd_drives_as_openstruct
    disks = WMI::Win32_LogicalDisk.find(:all)
-   disks.select{|d| d.Description =~ /CD-ROM/} # hope this works...
+   disks.select{|d| d.Description =~ /CD-ROM/}.map{|d| d2 = OpenStruct.new; d2.VolumeName = d.VolumeName; d2.Name = d.Name; d2}
  end
   
 def self.get_drive_with_most_space_with_slash

data/lib/edl_parser.rb

@@ -78,10 +78,10 @@ class EdlParser
   
   # 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
+  def self.convert_incoming_to_split_sectors incoming, add_this_to_mutes_end = 0, add_this_to_mutes_beginning = 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]}
+    mutes = mutes.map{|k, v| [OverLayer.translate_string_to_seconds(k) - add_this_to_mutes_beginning, OverLayer.translate_string_to_seconds(v) + add_this_to_mutes_end, :mute]}
     blanks = blanks.map{|k, v| [OverLayer.translate_string_to_seconds(k), OverLayer.translate_string_to_seconds(v), :blank]}
 
     combined = (mutes+blanks).sort_by{|entry| entry[0,1]}

data/lib/mplayer_edl.rb

@@ -20,9 +20,9 @@ require_relative 'overlayer'
 require_relative 'edl_parser'
 
 class MplayerEdl
-  def self.convert_to_edl specs, add_this_many_to_end = 0
+  def self.convert_to_edl specs, add_this_many_to_end = 0, add_this_many_to_beginning = 0
     # simple re-map.
-    combined = EdlParser.convert_incoming_to_split_sectors specs, add_this_many_to_end
+    combined = EdlParser.convert_incoming_to_split_sectors specs, add_this_many_to_end, add_this_many_to_beginning
     out = ''
     map = {:mute => 1, :blank => 0}
     for start, endy, type in combined

data/lib/play_audio.rb

@@ -0,0 +1,16 @@
+require 'java'
+
+class PlayAudio
+  import "sun.audio.AudioStream"
+  import "sun.audio.AudioPlayer"
+  def self.play filename
+    i = java.io.FileInputStream.new(filename)
+    a = AudioStream.new(i)
+    AudioPlayer.player.start(a)
+  end
+end
+
+if $0 == __FILE__
+ puts 'syntax: filename.wav'
+ PlayAudio.play ARGV[0] # doesn't exit for awhile, for some reason
+end

data/sensible-cinema.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.19.3"
+  s.version = "0.19.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
     "lib/muter.rb",
     "lib/ocr.rb",
     "lib/overlayer.rb",
+    "lib/play_audio.rb",
     "lib/screen_tracker.rb",
     "lib/storage.rb",
     "lib/swing_helpers.rb",
@@ -128,6 +129,7 @@ Gem::Specification.new do |s|
     "spec/vlc_programmer.spec.rb",
     "todo_if_need_speed",
     "vendor/gocr049.exe",
+    "vendor/music.wav",
     "vendor/unzip.exe",
     "zamples/edit_decision_lists/category descriptions.txt",
     "zamples/edit_decision_lists/dvds/COOL_RUNNINGS.txt",

data/spec/drive_info.spec.rb

@@ -29,7 +29,7 @@ describe 'dvd_drive_info' do
   end
   
   it "should be able to do it for real drive" do
-    DriveInfo.get_dvd_drives_as_win32ole.each{|d|
+    DriveInfo.get_dvd_drives_as_openstruct.each{|d|
       DriveInfo.md5sum_disk(d.Name + "/").length.should be > 0 if d.VolumeName
     }
   end

data/spec/edl_parser.spec.rb

@@ -33,13 +33,11 @@ describe EdlParser do
     "mutes"=>[["00:00:01", "00:00:02"], 
     ["00:00:01", "00:00:02", "profanity", "dang"], 
     ["01:01:00", "01:02:00"]], 
-    "blank_outs"=>[["01:01:00", "01:02:00", "nudity", "5"], 
-    ["00:03:03.5", "00:03:04.5"], 
-    ["01:01:00", "01:02:00", "profanity", "bodily function 1"]], 
+    "blank_outs"=>[["01:01:00", "01:02:00", "nudity", "..."], ["00:03:03.5", "00:03:04.5"]], 
     "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"
    }
    E.parse_string(string, nil).should == expected
   end
@@ -72,7 +70,7 @@ describe EdlParser do
   
   it "should parse a real file" do
    E.parse_file(File.expand_path(__dir__) + "/../zamples/edit_decision_lists/dvds/bobs_big_plan.txt").should ==
-      {"mutes"=>[["00:03.8", "01:03", "theme song is a bit raucous at times"], ["48:46", "49:08", "theme song again"], ["29:14", "30:46", "theme song again"]], "title"=>"Bob's Big Plan", "dvd_drive_label"=>"BOBS_BIG_PLAN", "source"=>"DVD", "dvd_title_track"=>1, "other notes"=>"could use more nit-picking of the song, as some parts seem all right in the end", "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", "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"=>[]}
   end
   
   it "should be able to use personal preferences to decide which edits to make" do
@@ -104,4 +102,9 @@ describe EdlParser do
     EdlParser.convert_incoming_to_split_sectors({"mutes"=>{105=>145}, "blank_outs"=>{105=>145}}).should == [[105.0, 145.0, :blank]]
   end
   
+  it "should add to both ends" do
+    EdlParser.convert_incoming_to_split_sectors({"mutes"=>{105=>145}}, 1).should == [[105.0, 146.0, :mute]]
+    EdlParser.convert_incoming_to_split_sectors({"mutes"=>{105=>145}}, 1,1).should == [[104.0, 146.0, :mute]]
+  end
+  
 end

data/spec/mplayer_edl.spec.rb

@@ -53,7 +53,15 @@ EOL
 105.0 106.0 1
 106.0 107.0 0
 EOL
-
 end  
 
+  it "should add to beginning and ending of mutes" do
+    a = MplayerEdl.convert_to_edl({ "mutes"=>{105=>106}, "blank_outs" => {110 => 111} }, 1, 1 )
+    a.should == <<EOL
+104.0 107.0 1
+110.0 111.0 0
+EOL
+  
+  end
+
 end

data/spec/notes

@@ -1,3 +1,5 @@
+edl works *great* with cars at 15 minutes, and appears to at an hour, too.  Oh, and the audio matches perfectly.
+
 The kicker is that if I want to watch the "unedited all" option in mplayer (which I do for the "quick start" mode), then it needs to be as is...
 
 audio_codec = these_settings['audio_codec'] || 'lavc' # not copy...sniff...or you can't hear cars...as ffmpeg loses it on transfer [?] at least the intermediates you *cannot* hear.

data/spec/sensible_cinema_gui.spec.rb

@@ -127,10 +127,8 @@ module SensibleSwing
     end
 
     class FakeFileChooser
-      def set_title x
-      end
-      def set_file y
-      end
+      def set_title x; end
+      def set_file y; end
       def go
         'abc'
       end
@@ -154,22 +152,26 @@ module SensibleSwing
     end
     
     it "should call through to explorer for the full thing" do
+      PlayAudio.stub!(:play) {
+        @played = true
+      }
       @subject.do_copy_dvd_to_hard_drive(false)
       @subject.background_thread.join
       @args[-4].should == nil
       @system_blocking_command.should match /explorer/
       @system_blocking_command.should_not match /fulli/
+      @played.should == true
     end
     
-    it "should be able to return the full list if it already exists" do
+    it "should be able to return the fulli name if it already exists" do
       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
+    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"]
-     @subject.background_thread.join
+     join_background_thread
      @args[-2].should == 1
      @args[-3].should == "01:00"
      @command.should match /smplayer/
@@ -224,19 +226,23 @@ module SensibleSwing
       @system_blocking_command.should == "echo wrote (probably successfully) to abc.avi"
     end
     
-    it "if the .done files exists, it should directly call smplayer" do
+    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
       @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 smplayer ja" do
-      @subject.stub!(:sleep) {} # speed this test up...
+    it "if the .done file does not exist, watch unedited should call smplayer after x seconds" do
+      @subject.stub!(:sleep) {
+        @slept = true
+      } # speed this test up...
+      @subject.unstub!(:get_mencoder_commands)
       click_button(:@watch_unedited).join
-      @subject.after_success_once.should == nil
-      @command.should =~ /smplayer.*fulli/
+      join_background_thread
       @system_blocking_command.should_not == nil
+      @slept.should == true
+      @show_blocking_message_dialog_last_args.should == nil
     end
     
     it "should create a new file for ya" do
@@ -273,17 +279,6 @@ module SensibleSwing
       wrote.should include("380.85 1")
     end
     
-    it "should only prompt for drive once" do
-      count = 0
-      @subject.stub!(:choose_dvd_drive) {
-        raise 'bad' if count == 1
-        count = 1
-        ['drive', 'volume', '19d121ae8dc40cdd70b57ab7e8c74f76']
-      }
-      @subject.choose_dvd_and_edl_for_it
-      @subject.choose_dvd_and_edl_for_it
-      count.should == 1
-    end
     
     def should_allow_for_changing_file corrupt_file = false
        with_clean_edl_dir_as 'temp' do
@@ -324,22 +319,39 @@ module SensibleSwing
       count.should == 1
     end
     
-    it "should prompt you if you need to insert a dvd" do
-      DriveInfo.stub(:get_dvd_drives_as_win32ole) {
-        a = OpenStruct.new
-        a.Name = 'a name'
-        # no VolumeName though
-        [a] 
-      }
-      @subject.unstub!(:choose_dvd_drive)
-      proc {@subject.choose_dvd_drive }.should raise_error(/might not yet have.*in it/)
-      @show_blocking_message_dialog_last_args.should_not be nil
+    describe 'cacheing dvd drive' do
+      before do
+        DriveInfo.stub!(:get_dvd_drives_as_openstruct) {
+          a = OpenStruct.new
+          # NB no VolumeName set
+          a.Name = 'a name'
+          [a] 
+        }
+        @subject.unstub!(:choose_dvd_drive)
+      end
+      
+      it "should only prompt for drive once" do
+        count = 0
+        DriveInfo.stub!(:md5sum_disk) {
+          raise if count == 1
+          count = 1
+          '19d121ae8dc40cdd70b57ab7e8c74f76'
+        }
+        @subject.choose_dvd_and_edl_for_it
+        @subject.choose_dvd_and_edl_for_it
+        count.should == 1
+      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/)
+        @show_blocking_message_dialog_last_args.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 == 2 # exit button, two normal buttons
       ARGV << "--create-mode"
-      MainWindow.new.buttons.length.should == 8
+      MainWindow.new.buttons.length.should == 10
       ARGV.pop # test cleanup--why not :)
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 19
-    - 3
-  version: 0.19.3
+    - 4
+  version: 0.19.4
 platform: ruby
 authors: 
   - Roger Pack
@@ -189,6 +189,7 @@ files:
   - lib/muter.rb
   - lib/ocr.rb
   - lib/overlayer.rb
+  - lib/play_audio.rb
   - lib/screen_tracker.rb
   - lib/storage.rb
   - lib/swing_helpers.rb
@@ -266,6 +267,7 @@ files:
   - spec/vlc_programmer.spec.rb
   - todo_if_need_speed
   - vendor/gocr049.exe
+  - vendor/music.wav
   - vendor/unzip.exe
   - zamples/edit_decision_lists/category descriptions.txt
   - zamples/edit_decision_lists/dvds/COOL_RUNNINGS.txt