sensible-cinema 0.20.5 → 0.21.3

data/VERSION

@@ -1 +1 @@
-0.20.5
+0.21.3

data/bin/sensible-cinema-cli

@@ -41,7 +41,12 @@ def go_sc(args)
   
     puts <<-END
   
-    syntax: [player_description.yml|test] edit_decision_list.txt [-t -v --clear-cache] (or nothing at all--it will prompt)
+    syntax: [player_description.yml] [delete_list.txt|test] [-t -v --clear-cache] (or just nothing at all--it will prompt for all things needed)
+    
+    If you specify "test" for the delete list, it will pause 4s, take a snapshot of the player, then exit.
+    Useful for debugging your screen capture of the current player.
+    You can also specify -v or -t if you want to enable more verbose (chatty) output.
+    
     END
       
     for file in Dir[__dir__ + '../zamples/mute*/*']
@@ -91,8 +96,8 @@ def go_sc(args)
       
       # exit early if we just wanted a screen dump...a little kludgey...
       unless overlay
-        puts 'warning--only doing screen dump in t-minus 4s...'      
-        sleep 4
+        puts 'warning--only doing screen dump in t-minus 2s...'      
+        sleep 2
         puts 'snap!'
         screen_tracker.dump_bmp
         exit 1

data/bin/sensible-cinema.rb

@@ -31,31 +31,36 @@ require 'tmpdir'
 require_relative '../lib/swing_helpers'
 require_relative '../lib/drive_info'
 require 'whichr'
+require 'ruby-wmi'
 
 # 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
+vendor = File.expand_path(File.dirname(__FILE__)) + '/../vendor'
+# XX do we need to_filename though?
+ENV['PATH'] = ENV['PATH'] + ';' + (vendor + '/cache/mencoder').to_filename + ';' + (vendor + '/cache').to_filename
 
 for drive in ['c', 'd', 'e']
   ENV['PATH'] = ENV['PATH'] + ";#{drive}:\\Program Files\\SMPlayer;#{drive}"
 end
 
+import 'javax.swing.ImageIcon'
+
 module SensibleSwing
   VERSION = File.read(File.dirname(__FILE__) + "/../VERSION").strip
   puts "v. " + VERSION
   
   class MainWindow < JFrame
 
-    def new_jbutton title, only_on_create_mode, add = false
+    def new_jbutton title, only_on_create_mode, always_add = false
       button = JButton.new title
       button.set_bounds(44, @starting_button_y, @button_width, 23)
       
       if ARGV.index("--create-mode")
-        add = true if only_on_create_mode
+        always_add = true if only_on_create_mode
       else
-        add = true if !only_on_create_mode
+        always_add = true if !only_on_create_mode
       end
          
-      if add
+      if always_add
         increment_button_location
         @panel.add button
         @buttons << button
@@ -68,15 +73,7 @@ module SensibleSwing
     end
 
     Storage = Storage.new("sc")
-    
-    alias system_blocking system
-    
-    def system_non_blocking command
-     Thread.new { system_blocking command }
-    end
-    
-    # make them choose which system call to use explicitly
-    undef system
+   
     
     def initialize
       super "Sensible-Cinema #{VERSION} (GPL)"
@@ -99,19 +96,23 @@ module SensibleSwing
       jlabel.set_bounds(44,44,160,14)
       panel.add jlabel
       @starting_button_y = 120
-      @button_width = 350
+      @button_width = 400
 
       @create = new_jbutton( "Create edited copy of DVD on Your Hard Drive, from a DVD", false )
       @create.on_clicked {
         do_copy_dvd_to_hard_drive false
       }
       
-      @mplayer_edl = new_jbutton( "Watch DVD on computer edited realtime", false )
+      @mplayer_edl = new_jbutton( "Watch DVD on computer edited realtime", false, true )
       @mplayer_edl.on_clicked {
         do_mplayer_edl
       }
+      
+#      @watch_created_file = new_jbutton( "Watch edited copy of DVD", false).on_clicked {
+#        raise 'todo'
+#      }
 
-      @watch_unedited = new_jbutton("Watch a DVD unedited (while grabbing to hard drive--saves overall time)", true)
+      @watch_unedited = new_jbutton("Watch DVD unedited (while also grabbing to hard drive--saves overall time)", true) # if you have a fast enough cpu, that is
       @watch_unedited.on_clicked {
         success_no_run, wrote_to_here_fulli = do_copy_dvd_to_hard_drive false, true, true
         sleep 5 unless success_no_run
@@ -134,22 +135,29 @@ module SensibleSwing
         repeat_last_copy_dvd_to_hard_drive
       }
       
-      @fast_preview = new_jbutton( "preview section fast mode", true).on_clicked {
+      @fast_preview = new_jbutton( "preview (fast mode)", true).on_clicked {
         success, wrote_to_here_fulli = do_copy_dvd_to_hard_drive false, true
         sleep 0.5 # lodo take out ???
         background_thread.join if background_thread # let it write out the original fulli, if necessary [?]
-        nice_file = wrote_to_here_fulli + ".fast.mpg"
-        if !File.exist?(nice_file)
-          p = NonBlockingDialog.new("Creating quick lookup file--NB that for each changed deletion, you'll need to restart the fast preview SMplayer")
-          raise 'create failed' unless system_blocking("ffmpeg -i #{wrote_to_here_fulli} -target ntsc-dvd #{nice_file}")
-          p.dispose # it will be there for sure
+        nice_file = wrote_to_here_fulli #+ ".fast.mpg"
+        if false#!File.exist?(nice_file)
+          p = NonBlockingDialog.new("Creating quick lookup file--NB that for each changed deletion, 
+          you'll need to restart the fast preview SMplayer
+          Also note that the start and end times will be slightly off if reality [delayed]
+          Also note that while doing fast preview, it can be doing a normal preview as well
+          in the background, simultaneously.")
+          unless system_blocking("ffmpeg -i #{wrote_to_here_fulli} -target ntsc-dvd #{nice_file}")
+            File.delete nice_file
+            raise 'create ' 
+          end
+          p.dispose # it will be active for sure
         end
         smplayer_prefs_file = File.expand_path("~/.smplayer/smplayer.ini")
-        old_prefs = File.read(smplayer_prefs_file)
+        old_prefs = File.read(smplayer_prefs_file) rescue ''
         new_prefs = old_prefs.gsub(/mplayer_additional_options=.*/, "mplayer_additional_options=-edl #{EdlTempFile}")
         File.write(smplayer_prefs_file, new_prefs)
-        thread = do_mplayer_edl( "smplayer #{nice_file}")
-        Thread.new { # XX do we need this?
+        thread = do_mplayer_edl( "smplayer #{nice_file}") # note the smplayer, but it's for the fast file...
+        Thread.new { # XXX do we need this?
           begin
             thread.join
           ensure
@@ -168,33 +176,7 @@ module SensibleSwing
 
       @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}")
-
-        input = <<-EOL
-# comments can go after a # on any line, for example this one.
-
-"mutes" => [
-  "0:00:01.0", "0:00:02.0", "profanity", "da..",
-],
-
-"blank_outs" => [
-  "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
-],
-
-"name" => "#{name}",
-"disk_unique_id" => "#{md5}",
-
-# "dvd_title_track" => "1", # most DVD's use title 1. Yours might not.  If it plays anything except the main title, see http://goo.gl/QHLIF
-# "not edited out stuff" => "",
-# "closing thoughts" => "still a fairly dark movie",
-# "mplayer_dvd_splits" => ["59:59", "1:04:59"], # find these by playing your dvd with smplayer, and noting where the timing switches [buggedly] back to zero in error--common on many DVD's.  Setting it here lets the 'insta play' feature work right.
-EOL
-        filename = EDL_DIR + "\\" + name.gsub(' ', '_') + '.txt'
-        filename.downcase!
-        File.write(filename, input) unless File.exist?(filename) # lodo let them choose name (?)
-        open_file_to_edit_it filename
-
+        create_brand_new_edl
       end
 
       @display_unique = new_jbutton( "Display a DVD's unique ID", true ).on_clicked {
@@ -209,6 +191,10 @@ EOL
         system_non_blocking("start http://groups.google.com/group/sensible-cinema")
       }
       
+      @play_smplayer = new_jbutton( "Play DVD unedited (smplayer)", true).on_clicked {
+        play_dvd_smplayer_unedited
+      }
+      
       @progress_bar = JProgressBar.new(0, 100)
       @progress_bar.set_bounds(44,@starting_button_y,@button_width,23)
       @progress_bar.visible = false
@@ -225,10 +211,82 @@ EOL
       increment_button_location
 
       setSize @button_width+80, @starting_button_y
-
+      setIconImage(ImageIcon.new(__dir__ + "/monkey.png").getImage())
       check_for_dependencies
     end
     
+    def create_brand_new_edl
+        drive, volume, md5 = choose_dvd_drive
+        name = get_user_input("Enter DVD name for #{volume}")
+        input = <<-EOL
+# comments can go after a # on any line, for example this one.
+
+"mutes" => [
+  "0:00:01.0", "0:00:02.0", "profanity", "da..",
+],
+
+"blank_outs" => [
+  "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
+],
+
+"name" => "#{name}",
+"disk_unique_id" => "#{md5}",
+
+# "dvd_title_track" => "1", # most DVD's use title 1. Not all do, though.  If sensible-cinema plays anything except the main title (for example, a trailer), when you use it, see http://goo.gl/QHLIF to set this field right.
+# "not edited out stuff" => "some violence",
+# "closing thoughts" => "still a fairly dark movie, overall",
+# "mplayer_dvd_splits" => ["59:59", "1:04:59"], # these are where, in mplayer, the DVD timestamp "resets" to zero for whatever reason.  See http://goo.gl/yMfqX
+        EOL
+        filename = EDL_DIR + "\\" + name.gsub(' ', '_') + '.txt'
+        filename.downcase!
+        File.write(filename, input) unless File.exist?(filename) # lodo let them choose name (?)
+        open_file_to_edit_it filename
+      end
+
+     
+    alias system_original system
+    
+    def system_blocking command, low_prio = false
+      return true if command =~ /^@rem/ # jruby+MRI bug, I think...
+      if low_prio
+        out = IO.popen(command) # + " 2>&1"
+        low_prio = 64 # from msdn
+        
+        if command =~ /(ffmpeg|mencoder)/
+          # XXXX not sure if there's a better way...because some *are* complex and have ampersands...
+          # unfortunately have to check for nil because it could exit too early [?]
+          exe_name = $1 + '.exe'
+          begin
+            p = proc{ ole = WMI::Win32_Process.find(:first,  :conditions => {'Name' => exe_name}); sleep 1 unless ole; ole }
+            piddy = p.call || p.call || p.call # we actually do need this to loop...guess we're too quick
+            # but the first one still inexplicably fails always... LODO
+            if piddy
+              # piddy.SetPriority low_prio # this can seg fault...yikes...
+              pid = piddy.ProcessId # this doesn't seg fault, tho
+              system_original("vendor\\setpriority -lowest #{pid}") # be able to use the PID on the command line
+            else
+              # XXXX first one always fails [?] huh?
+              p 'unable to find to set priority ' + exe_name
+            end
+          rescue Exception => e
+            p 'warning, got exception trying to set PID [jruby...]', e
+          end
+        end
+        print out.read # let it finish
+        out.close
+        $?.exitstatus == 0 # 0 means success
+      else
+        system_original command
+      end
+    end
+    
+    def system_non_blocking command
+     Thread.new { system_original command }
+    end
+    
+    # make them choose which system call to use explicitly
+    undef system
+    
     def download full_url, to_here
       require 'open-uri'
       writeOut = open(to_here, "wb")
@@ -236,14 +294,25 @@ EOL
       writeOut.close
     end
     
+    def play_dvd_smplayer_unedited
+      drive, dvd_volume_name, md5sum, edl_path, descriptors = choose_dvd_and_edl_for_it
+      title_track = get_title_track(descriptors)
+      command =  "smplayer dvdnav://#{title_track} -dvd-device #{drive}"
+      p command
+      system_non_blocking command
+    end
+
     EdlTempFile = Dir.tmpdir + '/mplayer.temp.edl'
     
     def do_mplayer_edl play_this_mplayer = nil, add_secs_end = 0, add_secs_beginning = 0.5
       drive, dvd_volume_name, md5sum, edl_path, descriptors = choose_dvd_and_edl_for_it
       descriptors = EdlParser.parse_file edl_path
       splits = descriptors['mplayer_dvd_splits']
-      if splits == nil
-        show_blocking_message_dialog("warning: delete list does not contain mplayer replay information [mplayer_dvd_splits] so edits past a certain time period won't work (fixable...).")
+      if splits == nil && !play_this_mplayer
+        # don't display warning if they are watching the .fast file, since it doesn't need these
+        if !play_this_mplayer
+          show_blocking_message_dialog("warning: delete list does not contain mplayer replay information [mplayer_dvd_splits] so edits past a certain time period might not won't work ( http://goo.gl/yMfqX ).")
+        end
         splits = []
       end
       splits.map!{|s|  EdlParser.translate_string_to_seconds(s) }
@@ -285,47 +354,52 @@ EOL
         System.exit 1
       end
       if returned == -1
-        p 'license exited'
+        p 'license exited early...'
         System.exit 1
       end
       throw unless returned == 0
       old.each{|name, old_setting| UIManager.put(name, old_setting)}
     end
-
+    
+    def print *args
+      Kernel.print *args # avoid bin\sensible-cinema.rb:83:in `system_blocking': cannot convert instance of class org.jruby.RubyString to class java.awt.Graphics (TypeError)
+    end
+    
     def check_for_dependencies
       ffmpeg = RubyWhich.new.which('ffmpeg')
       if ffmpeg.length == 0
-        show_blocking_message_dialog(self, "It appears that you need to install a dependency: imagemagick.\n
-        Click ok to be directed to its download website.\nYou'll probably want to download and install the \"windows-dll.exe\" package.\n
+        show_blocking_message_dialog("It appears that you need to install a dependency: imagemagick.\n
+        Click ok to be directed to its download website.\nYou'll probably want to download and run the \"windows-dll.exe\" package.\n
         Then restart Sensible-Cinema.", "Lacking dependency", JOptionPane::ERROR_MESSAGE)
         system_non_blocking("start http://www.imagemagick.org/script/binary-releases.php#windows")
         java.lang.System.exit(1)
       end
+      
       mencoder = RubyWhich.new.which('mencoder')
       if mencoder.length == 0
         show_blocking_license_accept_dialog 'MPlayer', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: mencoder."
         vendor_cache = File.expand_path(File.dirname(__FILE__)) + "/../vendor/cache/"
         ENV['PATH'] = ENV['PATH'] + ';' + vendor_cache + '\\..;' + vendor_cache
         Dir.chdir(vendor_cache) do
-          Kernel.print 'downloading unzipper...'
+          print 'downloading unzipper...'
           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.7z (6MB) ...'
+          print 'downloading mencoder.7z (6MB) ...'
           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'
+          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)
+        if(path.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)
+          Click ok to be directed to its download website, where you can download and install it, then restart sensible cinema.", 
+          "Lacking dependency", JOptionPane::ERROR_MESSAGE)
           system_non_blocking("start http://smplayer.sourceforge.net/downloads.php")
           System.exit(1)
         end
@@ -432,6 +506,7 @@ EOL
           show_blocking_message_dialog("Warning: there may not be enough space on the disk for #{save_to} 
           (depending on DVD size, you may need like 16G free, but typically will need around 10GB free--you have #{freespace/1_000_000_000}GB free).  Click OK to continue.")
         end
+        raise 'cannot save to filname with spaces yet (ask for it)' if save_to =~ / /
         save_to
       end
     end
@@ -512,7 +587,8 @@ EOL
       "Copying to #{save_to}.\n" +
       "This could take quite awhile, and will prompt you and chime a noise when it is done.\n" +
       "You can close this window and continue working while it runs in the background.\n" +
-      "NB that the created file will be playable only with VLC (possibly with smplayer).",
+      "NB that the created file will be playable only with VLC (possibly with smplayer, possibly with\n" +
+      "Windows Media Player if you install ffdshow first with mpeg2 video checkbox checked.).",
       "OK")
 
       # allow our popups to still be serviced while it is running
@@ -535,11 +611,9 @@ EOL
       lines.each_with_index{|line, idx|
         if success
           puts "running #{line}"
-          success = system_blocking(line)
-          if line =~ /@rem /
-            success = true # these fail fof some reason?
-          else
-            puts "\n", 'line failed: ' + line + "\n" + '   see troubleshooting in README.txt file!' unless success
+          success = system_blocking(line, true)
+          if !success
+            puts "\n", 'line failed: ' + line + "\n" + '   see troubleshooting section in README.txt file! ignoring further processing commands...'
           end
         end
         @progress_bar.set_value(10 + idx/total_size*90)
@@ -573,10 +647,18 @@ EOL
       names = opticals.map{|d| d.Name + "\\" + " (" +  (d.VolumeName || 'Insert DVD to use') + ")"}
 
       if opticals.length != 1
-        dialog = GetDisk.new(self, names)
-        dialog.setSize 200,125
-        dialog.show
-        selected_idx = dialog.selected_idx
+        count = 0
+        opticals.each{|d| count += 1 if d.VolumeName}
+        if count == 1
+         # just choose it if there's only one disk in there
+         p 'selecting only disk present in the various DVD drives'
+         selected_idx = opticals.index{|d| d.VolumeName}
+        else
+          dialog = GetDisk.new(self, names)
+          dialog.setSize 200,125
+          dialog.show
+          selected_idx = dialog.selected_idx
+        end
       else
         selected_idx = 0
         p 'selecting user\'s only disk drive ' + names[0]
@@ -623,8 +705,19 @@ EOL
   end
 end
 
+require 'ffi'
+
+module Win
+  extend FFI::Library
+  ffi_lib 'kernel32'
+  ffi_convention :stdcall
+  attach_function :get_process_id, :GetProcessId, [ :long ], :uint
+end
+
 if $0 == __FILE__
   a = SensibleSwing::MainWindow.new
   a.set_visible true
   puts 'Please use the Sensible Cinema GUI window popup...'
 end
+
+# icon attribution: http://www.threes.com/index.php?option=com_content&view=article&id=1800:three-wise-monkeys&catid=82:mythology&Itemid=62

data/development.txt

@@ -0,0 +1,29 @@
+Source code (open source, GPLv3) : http://github.com/rdp/sensible-cinema (create an issue for feature requests/bugs etc.)
+
+You can test the program out out by (on windows) installing daemon tools, then mounting the DVD of "big buck bunny" (open source, freely available movie)
+Or you could alternatively burn a copy of big buck bunny to DVD, then use that to test it against (a slightly more cross platform approach).
+
+You should be able to run the program and test it out against said DVD, put it through its paces to demo it, etc.
+
+Or if you have a DVD that already has a delete list available for it, you could use that, obviously.
+
+The main development roadmap is in the README. If you have any feedback/feature requests, et al, post an
+issue or post to the Mailing List: http://groups.google.com/group/sensible-cinema
+
+It's written in jruby, and currently packages itself up as a zip with jruby-complete.jar with its required dependencies (see the Rakefile).
+
+To run it from source, you may need to install a few gem dependencies (listed in the Rakefile)
+
+The tests are in the spec directory, though some of them are out of date as development has focused in other areas.
+
+Currently it's windows only, ping me if you want that changed.
+
+We welcome all feedback/contribution :)
+
+== Advanced Usage ==
+
+For the screen tracker (experimental version--see experimental.txt),
+you could specify the scene descriptions list and player list on the command-line, so you don't want to have
+to re-select them like this will tell you how to run it from the command line:
+
+C:\sensible-cinema-git-clone>jruby bin\sensible-cinema-cli --help