sensible-cinema 0.14.5 → 0.14.6

data/ChangeLog

@@ -1,3 +1,7 @@
+== 0.14.6 ==
+
+Auto-select EDL depending on which disk they have.
+
 == 0.14.5 ==
 
 Make it distributable more easily.

data/Rakefile

@@ -93,8 +93,6 @@ task 'create_distro_dir' do
   raise 'need  bundle_dependencies first' unless File.directory? 'vendor/cache'
   require 'fileutils'
   spec = eval File.read('sensible-cinema.gemspec')
-  require 'ruby-debug'
-  #debugger
   dir_out = spec.name + "-" + spec.version.version + '/sensible-cinema'
   FileUtils.rm_rf dir_out + '/..' # in case it exists
   existing = Dir['*']

data/TODO

@@ -9,17 +9,16 @@
 
 == slightly lower than that even ==
 
+  
 == slightly lower than that ==
 
-  auto-select EDL
-    can even tell them a button "play movie x" or what not, has been detected
-
+  pass unit tests jruby
   can parse IMDB (require they put in the URL by hand fer now)
     add stuffs to imdb hmmm
     IMDB easy mapping
   unit test the GUI
   can have collaborators re-selling EL's
-    good license for their stuff like "public domain" or what not :P
+    good license for their stuff like "public domain" or what not :P Can't be a hypocrite now, can I?
     80/20
   can "watch as it is being ripped" (concat, watching it as it grows faster than you watch...)
   a "big download" of the whole thing (so that people can actually use it without pain...batch file even would probably work splendidly...
@@ -28,16 +27,16 @@
     easily
       automagically... (call into iso blah blah blah?)
     can lop off sections to save space (?)
-    can burn the extra sections, too?
+    can burn the extras from the DVD, too?
   easy editor for this style of edit
   split the two projects loosely, then cleanly (project, distribution)
   partner (Jon, Karlie if interested...give beta)
   survey/beta release
-  a certified clean list (?)
-  better playlist names, like with the DVD title in there :)
 
 == DVD monetary backlog (unordered) ==
 
+use DVD navigator ?
+  http://msdn.microsoft.com/en-us/library/dd388584(v=VS.85).aspx
 some way to choose between x,y,z when auto-select sees several
 careful phrasing "if you can't afford it..."
 authorize instead of paypal?
@@ -60,6 +59,7 @@ mplayer EDL's
 
 == random backlog ... note: just plow forward, to "grab" available ideas...except that for now, just what *I* plan on needing for myself (filters for what I need/want). ==
 
+a "certified clean" list (?)
 screencast of things helpful (use, creation...).
 tune up the levels...
 prototypes of the experimental stuff (overlay, track time while recording -> map file, specifiable levels, more?)

data/VERSION

@@ -1 +1 @@
-0.14.5
+0.14.6

data/bin/sensible-cinema

@@ -15,6 +15,7 @@ add_any_bundled_gems
 require 'sane' # File.write
 require 'ruby-wmi'
 require_relative '../lib/swing_helpers'
+require_relative '../lib/drive_info'
 load File.dirname(__FILE__) +  '/sensible-cinema-cli'
 require 'tmpdir'
 
@@ -80,7 +81,7 @@ module SensibleSwing
    end
   
    def vlc_currently_installed?
-     if !system("vlc  --qt-start-minimized vlc://quit")
+     if !system("vlc  --qt-start-minimized vlc://quit 2>NUL")
        JOptionPane.showMessageDialog(nil, "Appears you do not yet have VLC Media Player installed. Click ok to download it.", "VLC Player not found", JOptionPane::ERROR_MESSAGE)
        system("start http://www.videolan.org/")
        false
@@ -89,65 +90,84 @@ module SensibleSwing
      end
    end
   
-   def do_copy_dvd_to_hard_drive should_save_file
+  def single_edit_list_matches_dvd volume_name
+    matching =  Dir[EDL_DIR + '/*.txt'].select{|file|
+      YAML.load_file(file)["dvd_drive_label"] == volume_name      
+    }
+    if matching.length == 1
+      file = matching[0]
+      p "selecting only matching file #{file}"
+      return file
+    end    
+    nil
+  end
+  
+  EDL_DIR = __dir__  + "/../zamples/edit_decision_lists/dvds"
+  
+  def do_copy_dvd_to_hard_drive should_save_file
       return unless vlc_currently_installed?
-      drive = choose_dvd_drive
-      fc = JFileChooser.new 
-      fc.setFileSelectionMode(nil)
-      fc.set_dialog_title "Please pick a DVD Edit List File"
-      fc.set_current_directory(JFile.new( __dir__  + "/../zamples/edit_decision_lists/dvds"))
-      edit_list_path = fc.go
+      drive, volume_name = choose_dvd_drive
+      if !(edit_list_path = single_edit_list_matches_dvd(volume_name))
+        fc = JFileChooser.new
+        fc.setFileSelectionMode(nil)
+        fc.set_dialog_title "Please pick a DVD Edit List File"
+        fc.set_current_directory(JFile.new EDL_DIR)
+        edit_list_path = fc.go
+      end
       descriptors = YAML.load_file edit_list_path
-      
+      dvd_title = descriptors['title']
       if should_save_file
         fc = JFileChooser.new 
-        # LODO allow for spaces in save to file
+        # LODO allow for spaces in the save to file
         fc.set_dialog_title "Pick where to save the file to"
-        save_to_file_name = ((descriptors["title"] || "my dvd") + ' edited copy').gsub(' ', '_').gsub( /\W/, '') # no punctuation for now...
-        fc.setSelectedFile(JFile.new(get_drive_with_most_space_with_slash + save_to_file_name)) 
+        save_to_file_name = ((dvd_title || "my dvd") + ' edited copy').gsub(' ', '_').gsub( /\W/, '') # no punctuation for now...
+        fc.setSelectedFile(JFile.new(DriveInfo.get_drive_with_most_space_with_slash + save_to_file_name)) 
         save_to = fc.go
       else
         save_to = nil
       end
-      # LODO don't pop up those annoying windows
       dvd_title_track = descriptors["dvd_title_track"]
-      bat_file_or_xspf = VLCProgrammer.convert_to_full_xspf(descriptors, save_to, drive, dvd_title_track)
-      temp_dir = Dir.tmpdir
+      bat_file_or_xspf = VLCProgrammer.convert_to_full_xspf(descriptors, save_to, drive, dvd_title_track, dvd_title)
       if should_save_file
-        # allow our popups to still be serviced while it is running
+        
+        popup = ModeLessDialog.new("Running edit list #{File.basename edit_list_path} against #{drive} (#{dvd_title})...\n" +
+          "Copying to #{save_to}.\n" + 
+          "This could take quite awhile, and will prompt you when it is done.\n" +
+          "It may also cause small popup ballon dialogs to appear.\n" +
+          "You can close this window and continue working while it runs.",
+          "OK")
+        
+        # this allows our popups to still be serviced while it is running
         Thread.new {
           run_copy_commands bat_file_or_xspf, save_to
         }
       else
-        temp_file = temp_dir + '/' + 'vlc.xspf'
+       temp_dir = Dir.tmpdir
+        temp_file = temp_dir + '/' + 'vlc.temp.xspf'
         File.write(temp_file, bat_file_or_xspf)
         command = "vlc \"#{temp_file.to_filename}\" vlc://quit"
-        p 'running playlist: ', command
+        p 'running playlist for DVD: ', command
         system(command) # blocks the current window while running...
-        p 'done running playlist'
+        p 'done playing DVD'
       end
-      # TODO warn if they don't have VLC installed, with instructions...
       # LODO warn if they will overwrite a file in the end
    end
   
-   def run_copy_commands batch_file, save_to
-      popup = ModeLessDialog.new("Running the encoding in the background...\n" +
-        "This could take quite awhile, and will prompt you when it is done.\n" +
-        "It may also cause small popup ballon dialogs to appear.")
-      p 'saving to ' +  save_to + '.ps'
+   def run_copy_commands batch_commands, save_to
+      p 'saving to ' +  save_to + '.ps' # lodo cleanup the .ps here...
       @buttons.each{|b| b.set_enabled false}
       success = true
-      lines = batch_file.lines.to_a
+      lines = batch_commands.lines.to_a
       total_size = lines.length.to_f
       @progress_bar.visible=true
-      @progress_bar.set_value(0)
+      @progress_bar.set_value(10) # start at 10% always, so they can see something.
       lines.each_with_index{|l, idx|
         if success
           success = system(l) unless ARGV.find{|a| a == '--test'} # this doesn't seem to cancel out early for some reason..
-          @progress_bar.set_value(idx/total_size*100)
+          @progress_bar.set_value(10 + idx/total_size*90)
         end
-      }      
-      @progress_var.visible=false
+      }
+      @progress_bar.visible=false
       @buttons.each{|b| b.set_enabled true}
       popup.dispose
       if success
@@ -160,42 +180,33 @@ module SensibleSwing
       end
    end
   
+  # returns e:\, win32ole instance
    def choose_dvd_drive
-    opticals = get_dvd_drives
-    opticals.map!{|d| d.Name + "\\" + " (" +  (d.VolumeName || 'empty') + ")"}
+    opticals = DriveInfo.get_dvd_drives_as_win32ole
+    names = opticals.map{|d| d.Name + "\\" + " (" +  (d.VolumeName || 'empty') + ")"}
     
     if opticals.length != 1
-      dialog = GetDisk.new(self, opticals)
+      dialog = GetDisk.new(self, names)
       dialog.setSize 200,125
       dialog.show
-      selected = dialog.selected
+      selected_idx = dialog.selected_idx
     else
-      selected = opticals[0]
-    end
-    if selected
-      return selected[0..2] 
+      selected_idx = 0
+      p 'selecting only disk drive ' + names[0]
+    end    
+    if selected_idx
+      disk = opticals[selected_idx]
+      return names[selected_idx][0..2], opticals[selected_idx].VolumeName
     else
-      puts 'did not select drive'
+      puts 'did not select a drive'
       java.lang.System.exit 1      
     end
-   end
-  
-  def get_drive_with_most_space_with_slash
-    disks = WMI::Win32_LogicalDisk.find(:all)
-    out = disks.sort_by{|d| d.FreeSpace.to_i}[-1].Name + "\\"
-    out
-  end
-    
-  private
-  def get_dvd_drives
-    disks = WMI::Win32_LogicalDisk.find(:all)
-    disks.select{|d| d.Description =~ /CD-ROM/} # hope this works...
   end
 
  end
 
  class GetDisk < JDialog
-   attr_reader :selected
+   attr_reader :selected_idx
    def initialize parent, options_array
      super parent, true
      
@@ -203,8 +214,9 @@ module SensibleSwing
      box.add_action_listener do |e|
        idx = box.get_selected_index
        if idx != 0
-        @selected = box.get_selected_item
-        dispose 
+        # don't count choosing the first as a real entry
+        @selected_idx = box.get_selected_index - 1
+        dispose
        end
      end
     
@@ -220,7 +232,7 @@ module SensibleSwing
  
 end
 
-
-SensibleSwing::MainWindow.new.set_visible true
-
-puts 'Please use the Sensible Cinema GUI window popup'
+if $0 == __FILE__
+  SensibleSwing::MainWindow.new.set_visible true
+  puts 'Please use the Sensible Cinema GUI window popup...'
+end

data/lib/drive_info.rb

@@ -0,0 +1,27 @@
+require 'digest/md5'
+require 'ruby-wmi'
+
+class DriveInfo
+
+ def self.md5sum_disk(dir)
+  digest = Digest::MD5.new()
+  
+  Dir[dir + "VIDEO_TS/*.IFO"].sort.each{|f|
+    digest << File.binread(f) 
+  }
+  digest.hexdigest
+ end
+
+ def self.get_dvd_drives_as_win32ole
+   disks = WMI::Win32_LogicalDisk.find(:all)
+   disks.select{|d| d.Description =~ /CD-ROM/} # hope this works...
+ end
+  
+def self.get_drive_with_most_space_with_slash
+  disks = WMI::Win32_LogicalDisk.find(:all)
+  most_space = disks.sort_by{|d| d.FreeSpace.to_i}[-1]
+  most_space.Name + "\\"
+end
+
+end
+

data/lib/swing_helpers.rb

@@ -35,18 +35,19 @@ module SensibleSwing
     def go
       success = show_open_dialog nil
       unless success == Java::javax::swing::JFileChooser::APPROVE_OPTION
-        raise 'did not choose one' # don't kill background proc...
+        java.lang.System.exit 1 # kills background proc...but we shouldn't let them do stuff while a background proc is running, anyway
       end
       get_selected_file.get_absolute_path
     end
   end
-  #showMessageDialog JOptionPane
+  
   class ModeLessDialog < JDialog
     def initialize title_and_display_text, close_button_text= 'Close'
       super nil
-      set_title title_and_display_text.split("\n")[0]
+      lines = title_and_display_text.split("\n")
+      set_title lines[0]
       get_content_pane.set_layout nil
-      title_and_display_text.split("\n").each_with_index{|line, idx|
+      lines.each_with_index{|line, idx|
         jlabel = JLabel.new line
         jlabel.set_bounds(10, 15*idx, 400, 24)
         get_content_pane.add jlabel
@@ -54,9 +55,9 @@ module SensibleSwing
       close = JButton.new( close_button_text ).on_clicked {
         self.dispose
       }
-      close.set_bounds(125,50,70,25)
+      close.set_bounds(125,30+15*lines.length,70,25)
       get_content_pane.add close
-      set_size 400,125   
+      set_size 400, 100+15*lines.length
       set_visible true
       setDefaultCloseOperation JFrame::DISPOSE_ON_CLOSE
       setLocationRelativeTo nil # center it on the screen
@@ -65,6 +66,7 @@ module SensibleSwing
 end
 
 require 'os'
+
 class String
  def to_filename
    if OS.windows?

data/lib/vlc_programmer.rb

@@ -10,10 +10,12 @@ class VLCProgrammer
     @overlayer.translate_time_to_human_readable s
   end
 
-  def self.convert_to_full_xspf incoming, filename = nil, drive_with_slash = nil, dvd_title_track = nil
+  def self.convert_to_full_xspf incoming, filename = nil, drive_with_slash = nil, dvd_title_track = nil, dvd_title_name = nil
+  
     @drive = drive_with_slash || "e:\\"
     @filename_or_playlist_if_nil = filename
     @dvd_title_track = dvd_title_track || "1"
+    @dvd_title_name = dvd_title_name
     mutes = incoming["mutes"] || {}
     blanks = incoming["blank_outs"] || {}
     mutes = mutes.map{|k, v| [OverLayer.translate_string_to_seconds(k), OverLayer.translate_string_to_seconds(v), :mute]}
@@ -69,11 +71,11 @@ class VLCProgrammer
 
       if previous_end != start
         # play up to next "questionable section"
-        out += get_section("#{to_english previous_end} to #{to_english start} (clean)", previous_end, start, idx += 1)
+        out += get_section("#{@dvd_title_name} : #{to_english previous_end} to #{to_english start} (clean)", previous_end, start, idx += 1)
       end
       # now play through the muted section...
       if type == :mute
-        out += get_section "#{to_english start}s to #{to_english endy}s muted", start, endy, idx += 1, true
+        out += get_section "#{@dvd_title_name} : #{to_english start}s to #{to_english endy}s muted", start, endy, idx += 1, true
       end
       previous_end = endy
     }

data/sensible-cinema.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.14.5"
+  s.version = "0.14.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "ext/mkrf_conf.rb",
      "gplv3.txt",
      "lib/blanker.rb",
+     "lib/drive_info.rb",
      "lib/fake_blanker.rb",
      "lib/file_chooser.rb",
      "lib/keyboard_input.rb",
@@ -48,6 +49,7 @@ Gem::Specification.new do |s|
      "spec/blanker.spec.rb",
      "spec/common.rb",
      "spec/convert_image.rb",
+     "spec/drive_info.spec.rb",
      "spec/images/black.bmp",
      "spec/images/colon.bmp",
      "spec/images/hulu_0.bmp",
@@ -101,6 +103,7 @@ Gem::Specification.new do |s|
      "spec/ocr.spec.rb",
      "spec/overlayer.spec.rb",
      "spec/screen_tracker.spec.rb",
+     "spec/sensible_cinema_gui.spec.rb",
      "spec/silence.wav",
      "spec/swing_helpers.spec.rb",
      "spec/test_yaml.yml",
@@ -139,12 +142,14 @@ Gem::Specification.new do |s|
     "spec/blanker.spec.rb",
      "spec/common.rb",
      "spec/convert_image.rb",
+     "spec/drive_info.spec.rb",
      "spec/keyboard_input.spec.rb",
      "spec/mouse.spec.rb",
      "spec/muter.spec.rb",
      "spec/ocr.spec.rb",
      "spec/overlayer.spec.rb",
      "spec/screen_tracker.spec.rb",
+     "spec/sensible_cinema_gui.spec.rb",
      "spec/swing_helpers.spec.rb",
      "spec/vlc_programmer.spec.rb"
   ]

data/spec/drive_info.spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.dirname(__FILE__) + '/common')
+require_relative '../lib/drive_info'
+
+describe 'dvd_drive_info' do
+  it 'should be able to get an md5sum from the dvd' do
+    FileUtils.mkdir_p 'VIDEO_TS'
+    Dir.chdir 'VIDEO_TS' do
+      File.binwrite("VTS_01_0.IFO", "b")
+      File.binwrite("VIDEO_TS.IFO", "a")
+    end
+    DriveInfo.md5sum_disk(".\\").should == Digest::MD5.hexdigest("ab")
+  end
+  
+  it "should be able to do it for real drive" do
+    DriveInfo.get_dvd_drives_as_win32ole.each{|d|
+      DriveInfo.md5sum_disk(d.Name + "/").length.should be > 0 if d.VolumeName
+    }
+  end
+  
+  it "should return a drive with most space" do
+    DriveInfo.get_drive_with_most_space_with_slash[1..-1].should == ":\\"
+  end
+
+end

data/spec/sensible_cinema_gui.spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/common')
+load '../bin/sensible-cinema'
+
+module SensibleSwing
+describe MainWindow do
+
+  it "should auto-select an EDL if the title matches" do
+    MainWindow.new.single_edit_list_matches_dvd("BOBS_BIG_PLAN").should_not be nil
+  end
+  
+  it "should prompt if two match" do
+    MainWindow.const_set(:EDL_DIR, 'temp')
+    FileUtils.rm_rf 'temp'
+    Dir.mkdir 'temp'
+    MainWindow.new.single_edit_list_matches_dvd("BOBS_BIG_PLAN").should be nil
+    Dir.chdir 'temp' do
+      File.binwrite('a.txt', "dvd_drive_label: BOBS_BIG_PLAN")
+      File.binwrite('b.txt', "dvd_drive_label: BOBS_BIG_PLAN")
+    end
+    MainWindow.new.single_edit_list_matches_dvd("BOBS_BIG_PLAN").should be nil
+    
+  end
+
+end
+end

data/zamples/edit_decision_lists/dvds/bobs_big_plan.txt

@@ -1,12 +1,13 @@
 mutes:
-  "1" : "1:06" # theme song is a bit raucous
+  "1" : "1:07" # theme song is a bit loud at times.
   "48:46" : "49:08" # theme song again
-  "29:14" : "30:46" # theme song yikes.
+  "29:14" : "30:46" # theme song again
 blank_outs:
   # none
 
 title: Bob's Big Plan
+dvd_drive_label: BOBS_BIG_PLAN
 source: DVD (vlc)
 dvd_title_track: 1
 
-other_notes: could use more differentiation, as I don't dislike *all* the music.
+other_notes: could use more differentiation during the song, as I don't dislike *all* the music.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 14
-  - 5
-  version: 0.14.5
+  - 6
+  version: 0.14.6
 platform: ruby
 authors: 
 - Roger Pack
@@ -179,6 +179,7 @@ files:
 - ext/mkrf_conf.rb
 - gplv3.txt
 - lib/blanker.rb
+- lib/drive_info.rb
 - lib/fake_blanker.rb
 - lib/file_chooser.rb
 - lib/keyboard_input.rb
@@ -196,6 +197,7 @@ files:
 - spec/blanker.spec.rb
 - spec/common.rb
 - spec/convert_image.rb
+- spec/drive_info.spec.rb
 - spec/images/black.bmp
 - spec/images/colon.bmp
 - spec/images/hulu_0.bmp
@@ -249,6 +251,7 @@ files:
 - spec/ocr.spec.rb
 - spec/overlayer.spec.rb
 - spec/screen_tracker.spec.rb
+- spec/sensible_cinema_gui.spec.rb
 - spec/silence.wav
 - spec/swing_helpers.spec.rb
 - spec/test_yaml.yml
@@ -313,11 +316,13 @@ test_files:
 - spec/blanker.spec.rb
 - spec/common.rb
 - spec/convert_image.rb
+- spec/drive_info.spec.rb
 - spec/keyboard_input.spec.rb
 - spec/mouse.spec.rb
 - spec/muter.spec.rb
 - spec/ocr.spec.rb
 - spec/overlayer.spec.rb
 - spec/screen_tracker.spec.rb
+- spec/sensible_cinema_gui.spec.rb
 - spec/swing_helpers.spec.rb
 - spec/vlc_programmer.spec.rb