sensible-cinema 0.16.5 → 0.16.7

data/ChangeLog

@@ -1,3 +1,12 @@
+== 0.16.7 ==
+
+Accomodate for disks that have scratches in them better.
+
+== 0.16.5 ==
+
+Enable "preferences merging" of user preferences with an edit decision list to come up with a new edit decision list for them.
+The prototypes are there, though it's not enabled.
+
 == 0.16.0 ==
 
 Change the YAML style so that it can have filterable categories (disabled for now, but there are unit tests
@@ -16,6 +25,8 @@ Note that by at least this version, auto DVD title selection as a parameter has
 Note that by at least this version, it could compute an md5sum of a DVD's IFO files to compute
 a unique ID for that disk.
 Note that before this, I was using the volume name to generate filenames.
+Note that several (even more) revisions ago, I used on screen timestamp OCR and thus tracking to be able to 
+control output of hulu, youtube, etc. (online displayable programs).
 
 == 0.14.8 ==
 

data/README

@@ -32,7 +32,8 @@ Q. How do I watch these on my TV?
 A. You can burn a DVD with it.  First create it on your hard drive.  Then use
   Dvd Flick ()a good one for windows) (here's a screencast of using it within http://rogerdpack.t28.net/sensible-cinema)
   For OS X : iDVD might work well.
-  You might be able to "beam" it to your PS3 and play it from there, using PS3 media server (or windows media player), or put it on a flash drive and play it from that.
+  You could also drag your laptop over to your TV and hook it in that way.
+  If you're interested in being able to "beam" it from your computer to your game console (ex: PS3) ping me--I might have something in mind.
 
 == Caveats ==
 

data/Rakefile

@@ -61,7 +61,7 @@ task 'bundle_dependencies' => 'gemspec' do
   
    spec = eval File.read('sensible-cinema.gemspec')
    dependencies = spec.runtime_dependencies
-   dependencies = dependencies + get_transitive_dependencies(dependencies)
+   dependencies = (dependencies + get_transitive_dependencies(dependencies)).uniq
    Gem.loaded_specs.select{|name, spec| name == 'os'}
    FileUtils.rm_rf 'vendor/cache'
    Dir.mkdir 'vendor/cache'
@@ -72,7 +72,7 @@ task 'bundle_dependencies' => 'gemspec' do
      puts 'downloading in jruby-complete.jar file' 
      # jruby complete .jar file
      Net::HTTP.start("jruby.org.s3.amazonaws.com") { |http|
-       resp = http.get("/downloads/1.5.5/jruby-complete-1.5.5.jar")
+       resp = http.get("/downloads/1.5.6/jruby-complete-1.5.6.jar")
        puts 'copying it... '
        open("jruby-complete-1.5.5.jar", "wb") { |file|
          file.write(resp.body)

data/TODO

@@ -1,32 +1,72 @@
 == medium ==
   
 == probably next up+low prio ==
- 
+
+  "non realtime, non edity good" release (family only)
+    add some "||'s" to bat files...
+    popup "you may now watch": bring it to the front...
+
 == slightly lower than that ==
 
+  note "I first use this to edit my temple movie"
+  move the progressbar to the bottom :)
+  license the first time they run it (gplv3)
+  only pick that filename once per session...
+  note "just a linear editor"
+  note "just a wrapper"
   partner for filters (Jon, Karlie if interested...give beta)
     lotsa filters somehow
       my dvd's
+      friend's dvd's
+      partners'...
   beta release/rinse and repeat with various ppl (once it's releasable...)
-  can generate mplayer EDL's and play them...hmm...smplayer them?
-    update license too...
   a real'ish website
-  license the first time they run it (gplv3)
   checkbox for other license or something?
-  bring that window to the top! (before done dialog...)
-  assert that at least one drive has a DVD in it...
   compare computer DVD playback with physical player...
-  just run previews in smplayer :P
-  ffmpeg easier
+  overlay audio
 
 == DVD backlog (unordered, some very low prio) ==
 
+  assert that at least one drive has a DVD in it...maybe loop refuse with message until this?
+  cool runnings:
+     make a copy me--do they now match?
+     get a working copy--do they match?
+  md5sum the full rip files...appears necessary...
+    is it necessary?
+    add button for md5sum
+  propaganda-ize
+    alternative.to
+    blogs that have ever mentioned clearplay
+  play a bigger noise when totally done...(dvd flick has one...)
+  vnc has a good looking license :)
+  unzip instructions?
+  prompt for name, auto populate with volume name
+  LLC before ever pay anyone
+  redo the edit buttons into an ordering of sorts...
+  note that this can corrupt your soul!
+  plus figure out if mplayer is a fast forward feature...
+  several "play now" options...without a navigator of course :)
+    one for watch unedited "as grabbing" (create mode)
+    visualbasic
+    "round conservatively, write no file" way
+      mplayer batch (playlist?)
+    "round conservatively, yes write file" (+1 you track it)
+    can generate mplayer EDL's and play them...hmm...smplayer them?
+      update license too...
+    get half-way through, start playing back as writing edited full copy
+      maybe not all of these tho...
+  non parallelize
+    can have different volume settings
+    can insert other titles mid-stream [?]
+      these last two have gotta be lower prio than the rest...
+  whichr: return nil
+  install smplayer before mencoder [?]
   smaller .zip
   bundle 7z [?]
    remove note about it
  using, burning, creating  "howto's"
    better
-    usability test?
+    usability test them?
     
  using+burning screencast
  editing screencast
@@ -36,18 +76,17 @@
      add an option "just save full disk (unedited) to hard drive..."
        note to people: can edit those to your liking
 
+ imagemagick (ffmpeg) easier install...
  DRY up dependency installation code
   install them to cache2 or something...so I can cleanup the deploy code...
  advertise urug, ruby flow :)
  "Re-run most recent" disabled when there isn't one [?]
- unit test the GUI
  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 various options to see if there's a "cross platform way to split files accurately" besides my hacky kludge.
-  popup "you may now watch": bring it to the front...
+  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 folder (?)
   ripping "redoes" a large last section, for combining. Can I avoid this?
     plus I do some copy, some ac3?
@@ -63,24 +102,24 @@
 in general, fine tune burning with various things...
 
 make sure can work with very large DVD's...
-  can use a fast temp drive, save through to other :P
-    only prompt if have two...
+  can use a fast temp drive, save through it to another :P
+    (when they have two...)
   can have collaborators re-selling EDL's
     good license for their stuff like "public domain" or what not :P Can't be a hypocrite now, can I?
-a real website
+a real website that looks good
 k9 might preserve/shrink well...hmm...auto calculation may be possible...hmm...
 better .exe icon...
-ensure file exists after we created it...and has a reasonable size, before declaring success
-      148 cars_widescreen_2006_edited.ps
 blu-ray support somehow (real-time? rip?)
 use DVD navigator ?
   http://msdn.microsoft.com/en-us/library/dd388584(v=VS.85).aspx
   with an avi file sink?
 double buffering hard drive/incoming copying from DVD might speed things, if your HD is fast.
-make the progress bar map "better" to the size of the various sections...
-detect occurrence of these type errors (DVD read failure): dvdnav warning: cannot get next block (Error reading from DVD.) somehow (file size...)
-per movie, several EDL's, one includes profanity, one just violence, one paranoid, etc.
-when there are several, it lets you just choose between the ones that are valid (?)
+  might not work for all modes tho...
+make the progress bar map "better" to the actual time that each section should take...
+
+"show" what drive they have in there--like an auto-detect, and if it has EDL's available for it or not.
+Note to people: make several EDL's per movie.
+Note to people: clean your disks!
 
 burnable to DVD/CD/multi DVD automagically... (auto-burn insert your new disk!)
     can *re-use* original navigation stuffs, less the profanity (is that possible? VobBlanker help, perhaps?)
@@ -92,7 +131,9 @@ burnable to DVD/CD/multi DVD automagically... (auto-burn insert your new disk!)
 try to compile transcode in cygwin (yipes)
 legal shtuff (LICENSE)
 
-== random non-DVD 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). ==
+@smplayer: right click on DVD...
+
+== random non-DVD (or don't care when) 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). ==
 
 the ac3 thing
 ask VLC "fuzzy menus on the happiest baby dvd expected?"

data/VERSION

@@ -1 +1 @@
-0.16.5
+0.16.7

data/bin/sensible-cinema

@@ -3,7 +3,7 @@
 puts 'Loading Sensible Cinema...'
 
 require File.dirname(__FILE__) + "/../lib/add_any_bundled_gems_to_load_path.rb"
-require 'sane'
+require 'sane' # failure here means you haven't bundled your dependencies...[rake task]
 
 require_relative '../lib/mencoder_wrapper'
 require_relative '../lib/storage'
@@ -15,237 +15,266 @@ require_relative '../lib/drive_info'
 require 'whichr'
 
 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"
 
 module SensibleSwing
- class MainWindow < JFrame
-   Storage = Storage.new("sc")
-   def initialize
-     super "Sensible-Cinema"
-     setDefaultCloseOperation JFrame::EXIT_ON_CLOSE
-     panel = JPanel.new
-     panel.set_layout nil
-     add panel # why can't I just slap these down?
- 
-     jlabel = JLabel.new 'Welcome to Sensible Cinema!'
-     happy = Font.new("Tahoma", Font::PLAIN, 11)
-     jlabel.setFont(happy)
-     jlabel.set_bounds(44,44,160,14)
-     panel.add jlabel
+  class MainWindow < JFrame
+
+    def new_jbutton title, only_on_create_mode
+      button = JButton.new title
+      button.set_bounds(44, @starting_button_y, @button_width, 23)
+      @starting_button_y += 30
+      if only_on_create_mode
+        if ARGV.index("--create-mode")
+          @panel.add button
+          @buttons << button
+        end
+      else
+        @panel.add button
+        @buttons << button
+      end
+      button
+    end
+
+    Storage = Storage.new("sc")
     
-     button_width = 270
+    alias system_blocking system
     
-     c = JButton.new( "Create edited copy of DVD on Your Hard Drive" )
-     c.on_clicked {
-       do_copy_dvd_to_hard_drive false
-     }
-     c.set_bounds(44,120,button_width,23)
-     panel.add c
+    def system_non_blocking command
+     Thread.new { system_blocking command }
+    end
     
-     b = JButton.new("Watch DVD from hard drive unedited") # LODO watch in realtime option--then rippers and watchers can combine
-     b.on_clicked {
-       ENV['PATH'] = ENV['PATH'] + ";d:\\Program Files\\SMPlayer;c:\\Program Files\\SMPlayer"
-       path = RubyWhich.new.which('smplayer')
-       if(path.length == 0)
-            JOptionPane.showMessageDialog(self, "It appears that you need to install a dependency: SMPlayer.\n
-         Click ok to be directed to its download website.
-         Also note that if it ever hangs, kill the process, and then use VLC instead
-         (though VLC only has approximate timings).", "Lacking dependency", JOptionPane::ERROR_MESSAGE)
-         system("start http://smplayer.sourceforge.net/downloads.php")
-       else
-         success_no_run, wrote_to_here_fulli = do_copy_dvd_to_hard_drive false, true
-         command = "smplayer #{wrote_to_here_fulli}"
-         on_success = proc {
-           puts command
-           Thread.new { system(command) }
-         }
+    # make them choose which one to use
+    undef system
+
+    def initialize
+      super "Sensible-Cinema"
+      setDefaultCloseOperation JFrame::EXIT_ON_CLOSE
+      panel = JPanel.new
+      @panel = panel
+      @buttons = []
+      panel.set_layout nil
+      add panel # why can't I just slap these down?
+
+      jlabel = JLabel.new 'Welcome to Sensible Cinema!'
+      happy = Font.new("Tahoma", Font::PLAIN, 11)
+      jlabel.setFont(happy)
+      jlabel.set_bounds(44,44,160,14)
+      panel.add jlabel
+      @starting_button_y = 120
+      @button_width = 270
+
+      @progress_bar = JProgressBar.new(0, 100)
+      @progress_bar.set_bounds(44,80,@button_width,23)
+      @progress_bar.visible = false
+      panel.add @progress_bar
+
+      @create = new_jbutton( "Create edited copy of DVD on Your Hard Drive", false )
+      @create.on_clicked {
+        do_copy_dvd_to_hard_drive false
+      }
+
+      @watch_unedited = new_jbutton("Watch DVD from hard drive unedited", true) # LODO watch in realtime option--then rippers and watchers can combine
+      @watch_unedited.on_clicked {
+        path = RubyWhich.new.which('smplayer')
+        if(path.length == 0)
+          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 # LODO pass in a block (currently @after_success_once is run from the other thread--even have a race condition in there!)
+          on_success = proc {
+            command = "smplayer #{wrote_to_here_fulli}"
+            system_non_blocking command
+          }
+          if success_no_run
+            on_success.call
+          else
+            @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 Edit Decision List", false)
+      @open_list.on_clicked {
+        dialog = FileDialog.new(self, "Pick file to edit")
+        dialog.set_directory EDL_DIR
+        filename = dialog.go
+        open_file_to_edit_it filename if filename
+      }
+
+      @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 this thread run...
+          @after_success_once = on_success # shenanigans to be able to let that thread run...
         end
-       end 
-     }
-     b.set_bounds(44,150,button_width,23)
-     panel.add b if ARGV.index("--create-mode") # LODO allow end users to play it from here?
-    
-     d = JButton.new( "Preview edited section of current DVD" )
-     d.on_clicked {
-       do_copy_dvd_to_hard_drive true
-     }
-    
-     d.set_bounds(44,180,button_width,23)
-     panel.add d if ARGV.index("--create-mode")
-   
-     f = JButton.new("Open/Edit an Edit Decision List")
-     f.on_clicked {
-       dialog = FileDialog.new(self, "Pick file to edit")
-       dialog.set_directory EDL_DIR
-       filename = dialog.go
-       open_file_to_edit_it filename if filename
-    }
-     f.set_bounds(44,260,button_width,23)
-     panel.add f if ARGV.index("--create-mode")
-  
-     e = JButton.new( "Re-run most recent preview segment" )
-     e.on_clicked {
-       repeat_last_copy_dvd_to_hard_drive
-     }
-    
-     e.set_bounds(44,220,button_width,23)
-     panel.add e if ARGV.index("--create-mode")
-    
-     reload = JButton.new( "Get a disk's unique ID" ).on_clicked {
-       drive, volume, md5 = choose_dvd_drive
-       # display it, allow them to copy and paste it out
-       JOptionPane.showInputDialog("#{drive} #{volume} for your copying+pasting pleasure (highlight, then ctrl+c to copy)        \n
-      This is used to identify a disk to match it to its EDL, later.", "\"disk_unique_id\" => \"#{md5}\",")
-     }
-    
-     reload.set_bounds(44,290,button_width,20)
-     panel.add reload  if ARGV.index("--create-mode")
+      }
 
-     @progress_bar = JProgressBar.new(0, 100)
-     @progress_bar.set_bounds(44,280,button_width,23)
-     @progress_bar.visible = false
-     panel.add @progress_bar
-    
-     g = JButton.new("Create New Edit List for current DVD")
-     g.on_clicked do
-       drive, volume, md5 = choose_dvd_drive
+      @rerun_preview = new_jbutton( "Re-run most recently performed preview", true )
+      @rerun_preview.on_clicked {
+        repeat_last_copy_dvd_to_hard_drive
+      }
+
+      @create_new_edl_for_current_dvd = new_jbutton("Create new Edit Decision List for current DVD", true)
+      @create_new_edl_for_current_dvd.on_clicked do
+        drive, volume, md5 = choose_dvd_drive
       input = <<-EOL
-# comments can go after a # on any line.
+# comments can go after a # on any line, for example this one.
 "mutes" => [
-  #"00:00:01", "00:00:02",
+  "0:00:01.0", "0:00:02.0", "da..",
 ],
 
 "blank_outs" => [
-  #"01:01:00" , "01:02:00"
+  "1:01:00.0" , "1:02:00.0", "violent scene of some sort"
 ],
 "disk_unique_id" => "#{md5}",
 "title" => "#{volume}",
-EOL
-      puts input
-      filename = volume.gsub(' ', '_') + '.txt'
-      File.write(filename, input) unless File.exist?(filename) # lodo let them choose name (?)
-      open_file_to_edit_it filename
-      
-     end 
-     g.set_bounds(44,320,button_width,20)
-     panel.add g if ARGV.index("--create-mode")
-
-     @exit = JButton.new("Exit").on_clicked {
-       self.close
-     }
-     @exit.set_bounds(44,350,button_width,23)
-     panel.add @exit    
-
-     setSize 350,430
-     
-     @buttons = [b,c,d,e,reload,@exit]
-     check_for_dependencies
-   end
-  
-  def download full_url, to_here
-    require 'open-uri'
-    writeOut = open(to_here, "wb")
-    writeOut.write(open(full_url).read)
-    writeOut.close
-  end
-  
-  def check_for_dependencies
-    ffmpeg = RubyWhich.new.which('ffmpeg')
-    if ffmpeg.length == 0
-      JOptionPane.showMessageDialog(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
-      Then restart Sensible-Cinema.", "Lacking dependency", JOptionPane::ERROR_MESSAGE)      
-      system("start http://www.imagemagick.org/script/binary-releases.php#windows")
-      java.lang.System.exit(1)
+"dvd_title_track" => "1" # most DVD's use title 1 for the main film.  Some don't though.  The correct number is discoverable by opening the film in VLC and choosing "playback -> title" while watching the main feature.  If its not 1, then change this here.  And delete this overly verbose comment either way :)
+        EOL
+        filename = EDL_DIR + "\\" + volume.gsub(' ', '_') + '.txt'
+        File.write(filename, input) unless File.exist?(filename) # lodo let them choose name (?)
+        open_file_to_edit_it filename
+
+      end
+
+      @display_unique = new_jbutton( "Calculate DVD's unique ID", true ).on_clicked {
+        drive, volume, md5 = choose_dvd_drive
+        # display it, allow them to copy and paste it out
+        get_user_input("#{drive} #{volume} for your copying+pasting pleasure (highlight, then ctrl+c to copy)        \n
+        This is used to identify a disk to match it to its EDL, later.", "\"disk_unique_id\" => \"#{md5}\",")
+      }
+
+      @exit = new_jbutton("Exit", false).on_clicked {
+        self.close
+      }
+
+      setSize 350,430
+
+      check_for_dependencies
     end
-    mencoder = RubyWhich.new.which('mencoder')
-    if mencoder.length == 0
-      answer = JOptionPane.showConfirmDialog(nil, "Appears that you need to install a dependency: mencoder.
-      Its license is at: http://www.gnu.org/licenses/gpl-2.0.html.
-      Also this will download 7z locally (license: http://www.7-zip.org/license.txt).
-      Click yes if you accept the terms of the several license agreements mentioned. The programs will then be downloaded.
-      Or click no to cancel and exit.", "Lacking dependency", JOptionPane::YES_NO_OPTION)
-      if answer == 1
-        p 'exiting, no mencoder...'
+    
+    def download full_url, to_here
+      require 'open-uri'
+      writeOut = open(to_here, "wb")
+      writeOut.write(open(full_url).read)
+      writeOut.close
+    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
+        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
-      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 unzip utility...'
-        download("http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip", "7za920.zip")
-        system("unzip -o 7za920.zip") # -o means "overwrite" without prompting
-        # now we have 7za.exe
-        Kernel.print 'downloading mencoder'
-        download("http://downloads.sourceforge.net/project/mplayer-win32/MPlayer%20and%20MEncoder/revision%2032492/MPlayer-rtm-svn-32492.7z", "mencoder.7z")
-        system("7za e mencoder.7z -y -omencoder")
-        Kernel.puts 'done'
+      mencoder = RubyWhich.new.which('mencoder')
+      if mencoder.length == 0
+        answer = JOptionPane.showConfirmDialog(nil, "Appears that you need to install a dependency: mencoder.
+        Its license is at: http://www.gnu.org/licenses/gpl-2.0.html.
+        Also this will download 7z locally (license: http://www.7-zip.org/license.txt).
+        Click yes if you accept the terms of the several license agreements mentioned. The programs will then be downloaded.
+          Or click no to cancel and exit.", "Lacking dependency", JOptionPane::YES_NO_OPTION)
+        if answer == 1
+          p 'exiting, no mencoder...'
+          java.lang.System.exit(1)
+        end
+        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 unzip utility...'
+          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'
+          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'
+        end
       end
     end
-  end
 
-  def open_file_to_edit_it filename
-   Thread.new { system("notepad \"#{filename}\"")} # blocks otherwise...
-  end
+    def open_file_to_edit_it filename
+      system_non_blocking "notepad \"#{filename}\""
+    end
+
+    def single_edit_list_matches_dvd md5
+      return unless md5 # ignore nil searches, where it wasn't set in the .txt file
+      matching =  Dir[EDL_DIR + '/*.txt'].select{|file|
+        EdlParser.parse_file(file)["disk_unique_id"] == md5
+      }
+      if matching.length == 1
+        file = matching[0]
+        p "selecting the one matching file #{file} #{md5}"
+        file
+      else
+        nil
+      end
+    end
+
+    EDL_DIR = File.expand_path(__dir__  + "/../zamples/edit_decision_lists/dvds").to_filename
 
-  def single_edit_list_matches_dvd md5
-    return unless md5 # ignore nil searches, where it wasn't set in the .txt file
-    matching =  Dir[EDL_DIR + '/*.txt'].select{|file|
-      EdlParser.parse_file(file)["disk_unique_id"] == md5
-    }
-    if matching.length == 1
-      file = matching[0]
-      p "selecting the one matching file #{file} #{md5}"
-      file
-    else
-      nil
+    def repeat_last_copy_dvd_to_hard_drive
+      generate_and_run_bat_file *Storage['last_params']
     end
-  end
-  
-  EDL_DIR = File.expand_path(__dir__  + "/../zamples/edit_decision_lists/dvds").to_filename
-  
-  def repeat_last_copy_dvd_to_hard_drive
-    generate_and_run_bat_file *Storage['last_params']
-  end
-  
-  def do_copy_dvd_to_hard_drive should_prompt_for_start_and_end_times, want_full_list = false
+
+    def new_filechooser
+      JFileChooser.new
+    end
+
+    def show_blocking_message_dialog(message, title = message.split("\n")[0], style= JOptionPane::INFORMATION_MESSAGE)
+      JOptionPane.showMessageDialog(nil, message, title, style)
+    end
+    
+    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
       drive, dvd_volume_name, md5sum = choose_dvd_drive
-      p drive, dvd_volume_name, md5sum
+      puts "#{drive}, #{dvd_volume_name}, #{md5sum}"
       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 List File"
+        fc.set_title "Please pick a DVD Edit Decision List File"
         fc.set_directory EDL_DIR
         edit_list_path = fc.go
       end
+      return unless edit_list_path
       descriptors = EdlParser.parse_file edit_list_path
-      
+
       dvd_title = descriptors['title'] || dvd_volume_name
-      
-      fc = JFileChooser.new
-      # LODO allow for spaces in the save to filename
-      
+
+      fc = new_filechooser
+
+      # LODO allow for spaces in the save_to filename
+
       if should_prompt_for_start_and_end_times
-        JOptionPane.showMessageDialog(nil, "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!", JOptionPane::INFORMATION_MESSAGE)
-          start_time = JOptionPane.showInputDialog("At what point in the video would you like to start your preview? (like 01:00 for starting at 1 minute)", Storage['start_time'])
-          Storage['start_time'] = start_time
-          end_time = JOptionPane.showInputDialog("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'])
-          Storage['end_time'] = end_time
-          unless start_time and end_time
-            JOptionPane.showMessageDialog(nil, " Please choose start and end", "Failed", JOptionPane::ERROR_MESSAGE)
-            return
-          end
+        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")
+        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'])
+        Storage['start_time'] = 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'])
+        Storage['end_time'] = end_time
+        unless start_time and end_time
+          JOptionPane.showMessageDialog(nil, " Please choose start and end", "Failed", JOptionPane::ERROR_MESSAGE)
+          return
+        end
       end
-      
+
       fc.set_title "Pick where to save #{dvd_title} edited to"
-      
+
       save_to_file_name = dvd_title + ' edited copy'
       save_to_file_name += ' single segment' if should_prompt_for_start_and_end_times || want_full_list
-      save_to_file_name=save_to_file_name.gsub(' ', '_').gsub( /\W/, '') # no punctuation for now...
-      fc.setFile(DriveInfo.get_drive_with_most_space_with_slash + save_to_file_name)
+      save_to_file_name = save_to_file_name.gsub(' ', '_').gsub( /\W/, '') # no punctuation for now...
+      fc.set_file(get_drive_with_most_space_with_slash + save_to_file_name)
       save_to = fc.go
       dvd_title_track = descriptors["dvd_title_track"]
       # how does save_to map to fulli?
@@ -260,32 +289,41 @@ EOL
         end
       end
       generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track
-      [false, fulli]
+      [false, fulli] # false means it's running in a background thread :P
+    end
+
+    def get_drive_with_most_space_with_slash
+      DriveInfo.get_drive_with_most_space_with_slash
     end
-  
-  def generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track
+    
+    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
+    end
+
+    def generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track
       Storage['last_params'] = [save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track]
-      bat_file = MencoderWrapper.get_bat_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track
+      commands = get_mencoder_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track
       temp_dir = Dir.tmpdir
       temp_file = temp_dir + '/vlc.temp.bat'
-      File.write(temp_file, bat_file)
-      puts 'commands located for debugging purposes at: ' + bat_file
-      popup = ModeLessDialog.new(          "Copying to #{save_to}.\n" + 
-        "Running #{File.basename edit_list_path} against #{drive} (#{dvd_title}).\n" +
-        "This could take quite awhile, and will prompt you when it is done.\n" +
-        "You can close this window and continue working while it runs.\n" + 
-        "NB that the created file will be playable with SMplayer or VLC player.",
-        "OK")
-      
+      File.write(temp_file, commands)
+      popup = ModeLessDialog.new(          "Copying to #{save_to}.\n" +
+      "Running #{File.basename edit_list_path} against #{drive} (#{dvd_title}).\n" +
+      "This could take quite awhile, and will prompt you when it is done.\n" +
+      "You can close this window and continue working while it runs.\n" +
+      "NB that the created file will be playable only with smplayer or VLC player.",
+      "OK")
+
       # allow our popups to still be serviced while it is running
-      Thread.new {
-        run_create_commands bat_file, save_to
+      @background_thread = Thread.new {
+        run_create_commands commands, save_to
         popup.dispose
       }
       # LODO warn if they will overwrite a file in the end...
     end
-  
-   def run_create_commands batch_commands, save_to
+    
+    attr_accessor :background_thread, :after_success_once
+
+    def run_create_commands batch_commands, save_to
       @buttons.each{|b| b.set_enabled false}
       success = true
       lines = batch_commands.lines.to_a
@@ -294,7 +332,7 @@ EOL
       @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 might not actually cancel out early for some reason...
+          success = system_blocking(l) unless ARGV.find{|a| a == '--test'} # this might not actually cancel out early for some reason...
           if l =~ /@rem /
             success = true # these fail fof some reason?
           else
@@ -305,76 +343,75 @@ EOL
       }
       @progress_bar.visible=false
       @buttons.each{|b| b.set_enabled true}
-      if true#success
+      if success
+        saved_to = save_to + '.avi' # LODO pass this out?
         if @after_success_once
-          procy = @after_success_once
-          @after_success_once = nil
-          procy.call
+          @after_success_once.call saved_to
         else
-          saved_to = save_to + '.avi' # LODO pass this out?
-          JOptionPane.showMessageDialog(nil, " Done--you may now watch file #{saved_to} in SMPlayer or VLC player", "Done!", JOptionPane::INFORMATION_MESSAGE)
+          show_blocking_message_dialog(" Done--you may now watch file #{saved_to} in SMPlayer or VLC player")
           show_file = "explorer /e,/select,\"#{File.expand_path(saved_to).to_filename}\""
-          system show_file
+          system_non_blocking show_file
           #self.close # ?
         end
       else
-        JOptionPane.showMessageDialog(nil, " Failed--please examine screen output and report back!", "Failed", JOptionPane::ERROR_MESSAGE)
+        show_blocking_message_dialog("Failed--please examine screen output and report back!", "Failed", JOptionPane::ERROR_MESSAGE)
       end
-   end
-  
-  # returns e:\, volume, md5sum
-   def choose_dvd_drive
-    opticals = DriveInfo.get_dvd_drives_as_win32ole
-    names = opticals.map{|d| d.Name + "\\" + " (" +  (d.VolumeName || 'please insert DVD before proceeding if you want to use this drive') + ")"}
-    
-    if opticals.length != 1
-      dialog = GetDisk.new(self, names)
-      dialog.setSize 200,125
-      dialog.show
-      selected_idx = dialog.selected_idx
-    else
-      selected_idx = 0
-      p 'selecting user\'s only disk drive ' + names[0]
+      @after_success_once = nil
     end
-    
-    if selected_idx
-      disk = opticals[selected_idx]
-      prefix = names[selected_idx][0..2] 
-      return prefix, opticals[selected_idx].VolumeName, DriveInfo.md5sum_disk(prefix)
-    else
-      puts 'did not select a drive...exiting'
-      java.lang.System.exit 1      
+
+    # returns e:\, volume, md5sum
+    def choose_dvd_drive
+      opticals = DriveInfo.get_dvd_drives_as_win32ole
+      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
+      else
+        selected_idx = 0
+        p 'selecting user\'s only disk drive ' + names[0]
+      end
+
+      if selected_idx
+        disk = opticals[selected_idx]
+        prefix = names[selected_idx][0..2]
+        return prefix, opticals[selected_idx].VolumeName, DriveInfo.md5sum_disk(prefix)
+      else
+        puts 'did not select a drive...exiting'
+        java.lang.System.exit 1
+      end
     end
+
   end
 
- end
-
- class GetDisk < JDialog
-   attr_reader :selected_idx
-   def initialize parent, options_array
-     super parent, true
-     
-     box = JComboBox.new
-     box.add_action_listener do |e|
-       idx = box.get_selected_index
-       if idx != 0
-        # don't count choosing the first as a real entry
-        @selected_idx = box.get_selected_index - 1
-        dispose
-       end
-     end
-    
-     box.add_item "Click to select DVD drive" # put something in index 0
-     options_array.each{|drive|
-       box.add_item drive
-     }
-     add box
-     pack
+  class GetDisk < JDialog
+    attr_reader :selected_idx
+    def initialize parent, options_array
+      super parent, true
+
+      box = JComboBox.new
+      box.add_action_listener do |e|
+        idx = box.get_selected_index
+        if idx != 0
+          # don't count choosing the first as a real entry
+          @selected_idx = box.get_selected_index - 1
+          dispose
+        end
+      end
+
+      box.add_item "Click to select DVD drive" # put something in index 0
+      options_array.each{|drive|
+        box.add_item drive
+      }
+      add box
+      pack
     end
- end
+  end
 end
 
 if $0 == __FILE__
   SensibleSwing::MainWindow.new.set_visible true
   puts 'Please use the Sensible Cinema GUI window popup...'
-end
+end

data/lib/mencoder_wrapper.rb

@@ -53,7 +53,7 @@ class MencoderWrapper
       out += "call mencoder #{partials.join(' ')} -o #{to_here_final_file}.avi -ovc copy -oac copy\n"
       # LODO only do this if they want to watch it on their computer, with something other than smplayer, or want to make it smaller, as it takes *forever* longer
       # LODO the "insta play" mode, or the "faster rip" mode (related...)
-      # out += "call mencoder -oac lavc -ovc lavc -of mpeg -mpegopts format=dvd:tsaf -vf scale=720:480,harddup -srate 48000 -af lavcresample=48000 -lavcopts vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=18:vstrict=0:acodec=ac3:abitrate=192:aspect=16/9 -ofps 30000/1001  #{partials.join(' ')} -o #{to_here_final_file}\n"
+      out += "@rem call mencoder -oac lavc -ovc lavc -of mpeg -mpegopts format=dvd:tsaf -vf scale=720:480,harddup -srate 48000 -af lavcresample=48000 -lavcopts vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=18:vstrict=0:acodec=ac3:abitrate=192:aspect=16/9 -ofps 30000/1001  #{partials.join(' ')} -o #{to_here_final_file}\n"
 
       out += "@rem del #{@big_temp}\n" # LODO      
       out += "del " + partials.join(' ') + "\n"# LODO

data/lib/swing_helpers.rb

@@ -18,18 +18,23 @@ module SensibleSwing
   
    def on_clicked &block
      raise unless block
+     @block = block
      add_action_listener do |e|
        begin
-        block.call
-      rescue Exception => e
-        puts 'got fatal exception', e
-        puts e.backtrace.join("\n")
-        System.exit(1) # LODO no exit 
-      end        
+         block.call
+       rescue Exception => e
+         puts 'got fatal exception', e
+         puts e.backtrace.join("\n")
+         System.exit(1) # LODO no exit 
+       end        
      end
      self
    end
   
+  def simulate_click
+    @block.call
+  end
+  
  end
 
  class JFrame

data/sensible-cinema.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.16.5"
+  s.version = "0.16.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
-  s.date = %q{2010-12-04}
+  s.date = %q{2010-12-06}
   s.email = %q{rogerdpack@gmail.com}
   s.executables = ["sensible-cinema", "sensible-cinema-cli"]
   s.extensions = ["ext/mkrf_conf.rb"]
@@ -23,11 +23,13 @@ Gem::Specification.new do |s|
     "ChangeLog",
     "LICENSE",
     "README",
+    "RUN SENSIBLE CINEMA CLICK HERE.bat",
     "Rakefile",
     "TODO",
     "VERSION",
     "bin/sensible-cinema",
     "bin/sensible-cinema-cli",
+    "edit sensible cinema decision list files.bat",
     "experimental_readme.txt",
     "ext/mkrf_conf.rb",
     "gplv3.txt",
@@ -50,8 +52,6 @@ Gem::Specification.new do |s|
     "lib/swing_helpers.rb",
     "lib/vlc_programmer.rb",
     "never_do",
-    "run_sensible_cinema.bat",
-    "run_sensible_cinema_in_create_mode.bat",
     "sensible-cinema.gemspec",
     "spec/blanker.spec.rb",
     "spec/common.rb",
@@ -121,6 +121,7 @@ Gem::Specification.new do |s|
     "vendor/gocr049.exe",
     "vendor/unzip.exe",
     "zamples/edit_decision_lists/category descriptions.txt",
+    "zamples/edit_decision_lists/dvds/COOL_RUNNINGS.txt",
     "zamples/edit_decision_lists/dvds/bob the builder pets in a pickle.txt",
     "zamples/edit_decision_lists/dvds/bobs_big_plan.txt",
     "zamples/edit_decision_lists/dvds/happiest baby on the block.txt",

data/spec/sensible_cinema_gui.spec.rb

@@ -3,16 +3,21 @@ load '../bin/sensible-cinema'
 
 module SensibleSwing
   describe MainWindow do
-  
+
+    it "should be able to start up" do
+      MainWindow.new.dispose# shouldn't crash :)
+    end
+
     it "should auto-select a EDL if it matches a DVD's title" do
-      MainWindow.new.single_edit_list_matches_dvd("d41d8cd98f00b204e9800998ecf8427e").should_not be nil
+      MainWindow.new.single_edit_list_matches_dvd("19d121ae8dc40cdd70b57ab7e8c74f76").should_not be nil
     end
-    
+
     it "should not auto-select if you pass it nil" do
       MainWindow.new.single_edit_list_matches_dvd(nil).should be nil
     end
-    
+
     it "should prompt if two EDL's match a DVD title" do
+      old_edl = MainWindow::EDL_DIR
       MainWindow.const_set(:EDL_DIR, 'temp')
       FileUtils.rm_rf 'temp'
       Dir.mkdir 'temp'
@@ -22,11 +27,127 @@ module SensibleSwing
         File.binwrite('b.txt', "\"disk_unique_id\" => \"abcdef1234\"")
       end
       MainWindow.new.single_edit_list_matches_dvd("abcdef1234").should be nil
+      MainWindow.const_set(:EDL_DIR, old_edl)
     end
-    
+
     it "should modify path to have mencder available, and ffmpeg, and download them on the fly" do
       ENV['PATH'].should include("mencoder")
     end
-  
+
+    before do
+      @subject = MainWindow.new
+      @subject.stub!(:choose_dvd_drive) {
+        ["drive", "volume", "19d121ae8dc40cdd70b57ab7e8c74f76"] # happiest baby on the block
+      }
+      @subject.stub!(:get_mencoder_commands) { |*args|
+        args[-4].should match(/abc/)
+        @args = args
+        'sleep 0.1'
+      }
+      @subject.stub!(:new_filechooser) {
+        FakeFileChooser.new
+      }
+      @subject.stub!(:get_drive_with_most_space_with_slash) {
+        "e:\\"
+      }
+      @subject.stub!(:show_blocking_message_dialog) {}
+      @subject.stub!(:get_user_input) {'01:00'}
+      @subject.stub!(:system_non_blocking) { |command|
+        @command = command
+        Thread.new {} # fake out the return...
+      }
+      @subject.stub!(:open_file_to_edit_it) {}
+    end
+
+    class FakeFileChooser
+      def set_title x
+      end
+      def set_file y
+      end
+      def go
+        'abc'
+      end
+    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"]
+    end
+    
+    it "should call through to explorer for the full thing" do
+      @subject.do_copy_dvd_to_hard_drive(false)
+      @subject.background_thread.join
+      @args[-2].should == nil
+      @command.should match /explorer/
+      @command.should_not match /fulli/
+    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"
+    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.background_thread.join
+     @args[-1].should == 1
+     @args[-2].should == "01:00"
+     @command.should match /explorer/
+     @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
+      @command.should match /smplayer/
+    end
+
+    it "should prompt for start and end times" do
+      prompt_for_start_and_end_times
+    end
+    
+    it "should be able to reprompt for start and end times automagically" do
+      prompt_for_start_and_end_times
+      old_args = @args
+      @args = nil
+      @subject.repeat_last_copy_dvd_to_hard_drive.join
+      @args.should == old_args
+    end
+    
+    
+    it "if the .done file exists, it should directly call smplayer" do
+      FileUtils.touch "abc.fulli.tmp.avi.done"
+      @subject.instance_variable_get(:@watch_unedited).simulate_click
+      @command.should == "smplayer abc.fulli.tmp.avi"
+      FileUtils.rm "abc.fulli.tmp.avi.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...
+      @subject.after_success_once.should == nil
+      @command.should_not == nil
+    end
+    
+    it "should create a new file for ya" do
+      out = MainWindow::EDL_DIR + "/volume.txt"
+      File.exist?( out ).should be_false
+      @subject.instance_variable_get(:@create_new_edl_for_current_dvd).simulate_click
+      begin
+        File.exist?( out ).should be_true
+      ensure
+        FileUtils.rm_rf out
+      end
+    end
+    
+    it "should display unique" do
+      @subject.instance_variable_get(:@display_unique).simulate_click.should == "01:00"
+    end
+
   end
-end
+end

data/zamples/edit_decision_lists/dvds/COOL_RUNNINGS.txt

@@ -0,0 +1,11 @@
+# comments can go after a # on any line.
+"mutes" => [
+  "0:00:01.0", "00:00:02.0", "dang",
+],
+
+"blank_outs" => [
+  "1:16:50.0" , "1:17:00.0", "bad ..."
+],
+"disk_unique_id" => "5a0a43f52e5d5e705fdfaa831b38409b",
+"title" => "COOL_RUNNINGS",
+"dvd_title_track" => "1"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 16
-    - 5
-  version: 0.16.5
+    - 7
+  version: 0.16.7
 platform: ruby
 authors: 
   - Roger Pack
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-04 00:00:00 -07:00
+date: 2010-12-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -161,11 +161,13 @@ files:
   - ChangeLog
   - LICENSE
   - README
+  - RUN SENSIBLE CINEMA CLICK HERE.bat
   - Rakefile
   - TODO
   - VERSION
   - bin/sensible-cinema
   - bin/sensible-cinema-cli
+  - edit sensible cinema decision list files.bat
   - experimental_readme.txt
   - ext/mkrf_conf.rb
   - gplv3.txt
@@ -188,8 +190,6 @@ files:
   - lib/swing_helpers.rb
   - lib/vlc_programmer.rb
   - never_do
-  - run_sensible_cinema.bat
-  - run_sensible_cinema_in_create_mode.bat
   - sensible-cinema.gemspec
   - spec/blanker.spec.rb
   - spec/common.rb
@@ -259,6 +259,7 @@ files:
   - vendor/gocr049.exe
   - vendor/unzip.exe
   - zamples/edit_decision_lists/category descriptions.txt
+  - zamples/edit_decision_lists/dvds/COOL_RUNNINGS.txt
   - zamples/edit_decision_lists/dvds/bob the builder pets in a pickle.txt
   - zamples/edit_decision_lists/dvds/bobs_big_plan.txt
   - zamples/edit_decision_lists/dvds/happiest baby on the block.txt