sensible-cinema 0.34.0 → 0.35.3

data/lib/gui/dependencies.rb

@@ -1,47 +1,50 @@
-require 'java'
-
-require 'sane'
-
-module SensibleSwing
-  
-  class MainWindow < javax.swing.JFrame
-    
-	 
-    def force_accept_license_first
-      if !(LocalStorage['main_license_accepted'] == VERSION)
-        require_blocking_license_accept_dialog 'Sensible Cinema', 'gplv3', 'http://www.gnu.org/licenses/gpl.html', 'Sensible Cinema license agreement', 
-            "Sensible Cinema is distributed under the gplv3 (http://www.gnu.org/licenses/gpl.html).\nBY CLICKING \"accept\" YOU SIGNIFY THAT YOU HAVE READ, UNDERSTOOD AND AGREED TO ABIDE BY THE TERMS OF THIS AGREEMENT"
-        require_blocking_license_accept_dialog 'Sensible Cinema', 'is_it_legal_to_copy_dvds.txt file', File.expand_path(File.dirname(__FILE__) + "/../../documentation/is_it_legal_to_copy_dvds.txt"), 
-            'is_it_legal_to_copy_dvds.txt file', 'I acknowledge that I have read, understand, accept and agree to abide by the implications noted in the documentation/is_it_legal_to_copy_dvds.txt file'
-        if JOptionPane.show_select_buttons_prompt("Would you like to use this with Zoom Player MAX's scene cuts [3rd party player program, costs $], or just MPlayer [free]", :yes => "ZoomPlayer MAX", :no => "Just MPlayer") == :yes
-          LocalStorage['have_zoom_button'] = true
-        end
-        LocalStorage['main_license_accepted'] = VERSION
-      end
-    end
-   
-    def self.download full_url, to_here
-      require 'open-uri'
-      require 'openssl'
-      eval("OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE") if full_url =~ /https/
-      keep_going_bg_thread = true
-	  print 'working'
-      Thread.new { while keep_going_bg_thread; print '.'; sleep 1; end}
-      writeOut = open(to_here, "wb")
-      writeOut.write(open(full_url).read)
-      writeOut.close
-      keep_going_bg_thread = false
-    end
-    
-    def self.download_to_string full_url
-       require 'tempfile'
-       to = Tempfile.new 'abc'
-       download(full_url, to.path)
-       out = File.binread(to.path)
-       to.delete
-       out
-    end
-
+require 'java'
+
+require 'sane'
+
+module SensibleSwing
+  
+  class MainWindow < javax.swing.JFrame    
+	 
+    def force_accept_license_first
+      if !(LocalStorage['main_license_accepted'] == VERSION)
+        require_blocking_license_accept_dialog 'Sensible Cinema', 'gplv3', 'http://www.gnu.org/licenses/gpl.html', 'Sensible Cinema license agreement', 
+            "Sensible Cinema is distributed under the gplv3 (http://www.gnu.org/licenses/gpl.html).\nBY CLICKING \"accept\" YOU SIGNIFY THAT YOU HAVE READ, UNDERSTOOD AND AGREED TO ABIDE BY THE TERMS OF THIS AGREEMENT"
+        LocalStorage['main_license_accepted'] = VERSION
+      end
+    end
+    
+    def force_accept_file_style_license
+       if !(LocalStorage['accepted_legal_copys'] == VERSION)
+        require_blocking_license_accept_dialog 'Sensible Cinema', 'is_it_legal_to_copy_dvds.txt file', File.expand_path(File.dirname(__FILE__) + "/../../documentation/is_it_legal_to_copy_dvds.txt"), 
+            'is_it_legal_to_copy_dvds.txt file', 'I acknowledge that I have read, understand, accept and agree to abide by the implications noted in the documentation/is_it_legal_to_copy_dvds.txt file.'
+        LocalStorage['accepted_legal_copys'] = VERSION
+      end
+    end
+   
+    def self.download full_url, to_here
+      require 'open-uri'
+      require 'openssl'
+      eval("OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE") if full_url =~ /https/
+      keep_going_bg_thread = true
+      print 'downloading'
+      Thread.new { while keep_going_bg_thread; print '.'; sleep 1; end}
+      writeOut = open(to_here, "wb")
+      writeOut.write(open(full_url).read)
+      writeOut.close
+      keep_going_bg_thread = false
+      puts 'done!'
+    end
+    
+    def self.download_to_string full_url
+       require 'tempfile'
+       to = Tempfile.new 'abc'
+       download(full_url, to.path)
+       out = File.binread(to.path)
+       to.delete
+       out
+    end
+
 
     def download_7zip
       Dir.mkdir('./vendor/cache') unless File.directory? 'vendor/cache' # development may not have it created yet... [?]
@@ -78,29 +81,27 @@ module SensibleSwing
           true
         end
       end
-    end
-	
-	def check_for_file_manipulation_dependencies
-	
-	   if !check_for_exe('vendor/cache/mencoder/mencoder.exe', 'mencoder') # both use it now, since we have to use our own mplayer.exe for now...
-        require_blocking_license_accept_dialog 'mplayer', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: mplayer with mencoder."
-        download_zip_file_and_extract "Mplayer/mencoder (6MB)", "http://sourceforge.net/projects/mplayer-win32/files/MPlayer%20and%20MEncoder/revision%2034118/MPlayer-rtm-svn-34118.7z", "mencoder"
-        old = File.binread 'vendor/cache/mencoder/mplayer.exe'
-        old.gsub! "V:%6.1f", "V:%6.2f" # better precision! :)
-        File.binwrite('vendor/cache/mencoder/mplayer.exe', old)
-      end
+    end
+	
+	def check_for_file_manipulation_dependencies	
+	   if !check_for_exe('vendor/cache/mencoder/mencoder.exe', 'mencoder') # both use it now, since we have to use our own mplayer.exe for now...
+        require_blocking_license_accept_dialog 'mplayer', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: mplayer with mencoder."
+        download_zip_file_and_extract "Mplayer/mencoder (6MB)", "http://sourceforge.net/projects/mplayer-win32/files/MPlayer%20and%20MEncoder/revision%2034118/MPlayer-rtm-svn-34118.7z", "mencoder"
+        old = File.binread 'vendor/cache/mencoder/mplayer.exe'
+        old.gsub! "V:%6.1f", "V:%6.2f" # better precision! though I don't use that for playing anymore :)
+        File.binwrite('vendor/cache/mencoder/mplayer.exe', old)
+      end
     end
     
-    def check_for_various_dependencies
-            
+    def check_for_various_dependencies            
       if OS.doze? && !check_for_exe('vendor/cache/mplayer_edl/mplayer.exe', nil)
         require_blocking_license_accept_dialog 'Mplayer-EDL', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: mplayer EDL "
         FileUtils.mkdir_p 'vendor/cache/mplayer_edl'
-        puts 'downloading mplayer edl [10 MB]'
-        MainWindow.download('http://sourceforge.net/projects/mplayer-edl/files/mplayer.exe', 'vendor/cache/mplayer_edl/mplayer.exe')
-		config_dir = File.expand_path('~/mplayer')
-		FileUtils.mkdir(config_dir) unless File.directory?(config_dir)
-		FileUtils.cp('vendor/subfont.ttf', config_dir) # TODO mac
+        puts 'downloading mplayer edl [12 MB]'
+        MainWindow.download('http://sourceforge.net/projects/mplayer-edl/files/0.4/mplayer.exe', 'vendor/cache/mplayer_edl/mplayer.exe')
+		config_dir = File.expand_path('~/mplayer')
+		FileUtils.mkdir(config_dir) unless File.directory?(config_dir)
+		FileUtils.cp('vendor/subfont.ttf', config_dir) # TODO mac
       end
 
       # runtime dependencies, at least as of today...
@@ -114,22 +115,23 @@ module SensibleSwing
       else      
         path = RubyWhich.new.which('smplayer')
         if(path.length == 0)
-          # this one has its own installer...
-		      require_blocking_license_accept_dialog 'Smplayer', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: smplayer."
-     		  save_to_dir = SwingHelpers.new_existing_dir_chooser_and_go 'pick dir to save smplayer exe installer to:'
-		      save_to_file =  "#{save_to_dir}/smplayer-0.6.9-win32.exe"
-    		  puts "downloading smplayer.exe [14MB] to #{save_to_file}"
-          MainWindow.download "http://sourceforge.net/projects/smplayer/files/SMPlayer/0.6.9/smplayer-0.6.9-win32.exe", save_to_file
-		      show_blocking_message_dialog "Run this file to install it (ok to reveal): smplayer-0.6.9-win32.exe"
+          # this one has its own installer...
+		      require_blocking_license_accept_dialog 'Smplayer', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: smplayer."
+     		  save_to_dir = SwingHelpers.new_existing_dir_chooser_and_go 'pick dir to save smplayer exe installer to:'
+		      save_to_file =  "#{save_to_dir}/smplayer-0.6.9-win32.exe"
+    		  puts "downloading smplayer.exe [14MB] to #{save_to_file}"
+          MainWindow.download "http://sourceforge.net/projects/smplayer/files/SMPlayer/0.6.9/smplayer-0.6.9-win32.exe", save_to_file
+		      show_blocking_message_dialog "Run this file to install it (ok to reveal): smplayer-0.6.9-win32.exe"
     		  show_in_explorer save_to_file
           sleep 2
-		      show_blocking_message_dialog "hit ok after smplayer is installed:"
+		      show_blocking_message_dialog "hit ok after smplayer is installed:"
         end
       end
     end
-    
+    
     def assert_ownership_dialog 
-      message = "Do you certify you own the DVD this came of and have it in your possession, if it came from a DVD?"
+      force_accept_file_style_license
+      message = "Do you certify you own the DVD this came of and have it in your possession, if necessary in your legal jurisdiction?"
       title = "Verify ownership"
       returned = JOptionPane.show_select_buttons_prompt(message, {:yes => "no", :no => "yes"})
       assert_confirmed_dialog returned, nil
@@ -157,8 +159,8 @@ module SensibleSwing
         if license_url_should_also_be_embedded_by_you_in_message
           SwingHelpers.open_url_to_view_it_non_blocking license_url_should_also_be_embedded_by_you_in_message
           puts "Please restart after reading license agreement, to be able to then accept it."
-        else
-          puts 'dialog assertion failed'
+        else
+          puts 'dialog assertion failed'
         end
         System.exit 0
       elsif returned == :cancel
@@ -172,6 +174,38 @@ module SensibleSwing
       else
         raise 'unknown?'
       end
-    end
-  end
+    end
+	
+	def set_individual_preferences
+      get_set_preference 'mplayer_beginning_buffer', "How much extra \"buffer\" time to add at the beginning of all cuts/mutes in normal mode [for added safety sake]."
+      if JOptionPane.show_select_buttons_prompt("Would you like to use this with Zoom Player MAX's scene cuts [3rd party player program, costs $], or MPlayer et al [free]", :no => "ZoomPlayer MAX", :yes => "MPlayer/VLC/DVD-Navigator [all free]") == :no
+        LocalStorage['have_zoom_button'] = true
+      else
+	    LocalStorage['have_zoom_button'] = false
+	  end
+	  # TODO break these out into create mode prefs versus human [?]
+      if JOptionPane.show_select_buttons_prompt("Would you like to enable obscure options, like using keyboard shortcuts to create EDL files on the fly, or creating euphemized .srt files (you probably don't)?") == :yes
+        LocalStorage['prompt_obscure_options'] = true
+      else
+	    LocalStorage['prompt_obscure_options'] = false
+	  end
+	  true
+	end
+    
+    def get_set_preference name, english_name
+      old_preference = LocalStorage[name]
+      old_class = old_preference.class
+	  
+	  new_preference = get_user_input("Enter value for #{english_name}", old_preference)
+      display_and_raise 'enter something like 0.0' if new_preference.empty?
+      if old_class == Float
+        new_preference = new_preference.to_f
+      elsif old_class == String
+        # leave same
+      else
+        raise 'unknown type?' + old_class.to_s
+      end
+      LocalStorage[name] = new_preference
+    end
+  end # MainWindow
 end

data/lib/gui/normal.rb

@@ -23,12 +23,8 @@ module SensibleSwing
 
     attr_accessor :parent, :upconv_line
    
-    # converts to full path, 8.3 if on doze
-    def normalize_path path
-      path = File.expand_path path
-      path = EightThree.convert_path_to_8_3 path if OS.doze?
-    end
     def hard_exit; java::lang::System.exit 0; end
+
     def setup_normal_buttons
       add_text_line ""
   
@@ -36,10 +32,10 @@ module SensibleSwing
       @mplayer_edl.tool_tip = "This will watch your DVD in realtime from your computer while skipping/muting questionable scenes."
       @mplayer_edl.on_clicked {
         play_smplayer_edl_non_blocking
-		sleep 5
-		puts 'enjoy your movie playing in other window'
+	sleep 5
+	puts 'enjoy your movie playing in other window'
         sleep 1
-		hard_exit # paranoid on usage LOL
+	hard_exit if OS.doze? # paranoid on cpu usage LOL LODO mac too? it kills mplayer child processes currently...hmm...
       }
       
       add_callback_for_dvd_edl_present { |disk_available, edl_available|
@@ -59,6 +55,7 @@ module SensibleSwing
       }
       
       @watch_file_edl = new_jbutton( "Watch movie file edited (realtime)" ) do
+        force_accept_file_style_license
         choose_file_and_edl_and_create_sxs_or_play false
       end
       
@@ -69,7 +66,8 @@ module SensibleSwing
         It takes quite awhile maybe 2 hours.  Sometimes the progress bar will look paused--it typically continues eventually.
       EOL
       @create.on_clicked {
-	    check_for_file_manipulation_dependencies
+        force_accept_file_style_license
+  	    check_for_file_manipulation_dependencies
         do_create_edited_copy_via_file false
       }
       
@@ -83,17 +81,27 @@ module SensibleSwing
       end
       
       @show_upconvert_options = new_jbutton("Tweak Preferences [timing, upconversion]") do
-        get_set_preference 'mplayer_beginning_buffer', "How much extra \"buffer\" time to add at the beginning of all cuts/mutes in normal mode [for added safety sake]."
-        show_blocking_message_dialog "You will now be able to set some upconversion options, which makes the playback look nicer but uses more cpu [if desired].\nClose the window when finished."
-        upconvert_window = new_child_window
-        upconvert_window.add_change_upconvert_buttons
-      end
-      @show_upconvert_options.tool_tip= "Allows you to set your upconvert options.\nUpconverting attempts to playback your movie with higher quality on high resolution monitors."
+	    set_individual_preferences
+        show_blocking_message_dialog "You will now be able to set some upconversion options, which makes the playback look nicer but uses more cpu [if desired].\nClose the window when finished."
+        upconvert_window = new_child_window
+        upconvert_window.add_change_upconvert_buttons
+      end
+      @show_upconvert_options.tool_tip= "Allows you to set your upconvert options.\nUpconverting attempts to playback your movie with higher quality on high resolution monitors."
       
-	  new_jbutton("Create new Edit Decision List") do
-	    window = new_child_window
-        window.setup_advanced_buttons
-	  end
+ 	    new_jbutton("Create new Edit Decision List") do
+	      window = new_child_window
+        window.setup_create_buttons
+	    end
+		
+        @upload = new_jbutton("Feedback/submissions welcome!") # keeps this one last! :)
+        @upload.tool_tip = "We welcome all feedback!\nQuestion, comments, request help.\nAlso if you create a new EDL, please submit it back to us so that others can benefit from it later!"
+        @upload.on_clicked {
+		      show_blocking_message_dialog "ok, next it will open up the groups page now or optionally an email you could send"
+          system_non_blocking("start mailto:sensible-cinema@googlegroups.com")
+          system_non_blocking("start http://groups.google.com/group/sensible-cinema")
+        }
+        increment_button_location
+
 	  
       @progress_bar = JProgressBar.new(0, 100)
       @progress_bar.set_bounds(44,@starting_button_y,@button_width,23)
@@ -101,21 +109,7 @@ module SensibleSwing
       @panel.add @progress_bar 
       add_text_line ""# spacing
     end
-    
-    def get_set_preference name, english_name
-      old_preference = LocalStorage[name]
-      old_class = old_preference.class
-      new_preference = get_user_input("Enter value for #{english_name}", old_preference)
-      display_and_raise 'enter something like 0.0' if new_preference.empty?
-      if old_class == Float
-        new_preference = new_preference.to_f
-      elsif old_class == String
-        # leave same
-      else
-        raise 'unknown type?' + old_class.to_s
-      end
-      LocalStorage[name] = new_preference
-    end
+	
     
     def add_open_documentation_button
       @open_help_file = new_jbutton("View Sensible Cinema Documentation") do
@@ -124,16 +118,14 @@ module SensibleSwing
     end
     
     # side by side stuff we haven't really factored out yet, also doubles for both normal/create LODO
-    def choose_file_and_edl_and_create_sxs_or_play just_create_dot_edl_file_instead_of_play
+    def choose_file_and_edl_and_create_sxs_or_play just_create_xbmc_dot_edl_file_instead_of_play
       filename_mpg = new_existing_file_selector_and_select_file( "Pick moviefile (like moviename.mpg or video_ts/anything.ext)")
       edl_filename = new_existing_file_selector_and_select_file( "Pick an EDL file to use with it", EdlParser::EDL_DIR)
       assert_ownership_dialog
-      if just_create_dot_edl_file_instead_of_play
+      if just_create_xbmc_dot_edl_file_instead_of_play
         descriptors = EdlParser.parse_file edl_filename
-        # LODO these timings...DRY up...plus is XBMC the same? what about on a slower computer?
-        # NB these are just for the Side by side EDL's!
-        
-        edl_contents = MplayerEdl.convert_to_edl descriptors, add_secs_end = MplayerEndBuffer, MplayerBeginingBuffer, splits = []
+        # XBMC can use english timestamps
+        edl_contents = MplayerEdl.convert_to_edl descriptors, add_secs_end = 0.0, begin_buffer_preference, splits = [], extra_time_to_all = 0.0, use_english_timestamps=true
         output_file = filename_mpg.gsub(/\.[^\.]+$/, '') + '.edl' # sanitize...
         File.write(output_file, edl_contents)
         raise unless File.exist?(output_file) # sanity
@@ -143,47 +135,6 @@ module SensibleSwing
       end
     end
     
-    def we_are_in_upconvert_mode
-       ARGV.index("--upconvert-mode")
-    end
-    
-    def setup_default_buttons
-      if we_are_in_upconvert_mode
-        add_play_upconvert_buttons
-      else
-        if we_are_in_create_mode
-          setup_advanced_buttons
-          add_text_line 'Contact:'
-        else
-          setup_normal_buttons
-        end
-      
-        @upload = new_jbutton("Feedback/submissions welcome!") # keeps this one last! :)
-        @upload.tool_tip = "We welcome all feedback!\nQuestion, comments, request help.\nAlso if you create a new EDL, please submit it back to us so that others can benefit from it later!"
-        @upload.on_clicked {
-		  show_blocking_message_dialog "ok, will open up the groups page now and optionally an email to it"
-          system_non_blocking("start mailto:sensible-cinema@googlegroups.com")
-          system_non_blocking("start http://groups.google.com/group/sensible-cinema")
-        }
-        increment_button_location
-
-      end # big else
-      
-      @exit = new_jbutton("Exit", "Exits the application and kills any background processes that are running at all--don't exit unless you are done processing all the way!")
-      @exit.on_clicked {
-        Thread.new { self.close } # don't waste the time to close it :P
-        puts 'Thank you for using Sensible Cinema. Come again!'
-        System.exit 0
-      }
-
-      increment_button_location
-      increment_button_location
-      self
-
-    end
-    def get_disk_chooser_window names
-      DropDownSelector.new(self, names, "Click to select DVD drive")
-    end
     
   end
 end

data/lib/mplayer_edl.rb

@@ -19,7 +19,8 @@ This file is part of Sensible Cinema.
 require_relative 'edl_parser'
 
 class MplayerEdl
-  def self.convert_to_edl specs, add_this_many_to_end = 0, add_this_many_to_beginning = 0, splits = [], extra_time_to_all = 0.0
+  
+  def self.convert_to_edl specs, add_this_many_to_end = 0, add_this_many_to_beginning = 0, splits = [], extra_time_to_all = 0.0, use_english_timestamps = false
     
     # simple re-map to EDL style output
     combined = EdlParser.convert_incoming_to_split_sectors specs, add_this_many_to_end, add_this_many_to_beginning, splits
@@ -29,8 +30,13 @@ class MplayerEdl
     for start, endy, type in combined
       start += extra_time_to_all
       endy += extra_time_to_all
+      if use_english_timestamps
+        start = EdlParser.translate_time_to_human_readable start
+        endy  = EdlParser.translate_time_to_human_readable endy
+      end
       out += "#{start} #{endy} #{map[type]}\n"
     end
     out
   end
+  
 end

data/lib/subtitle_profanity_finder.rb

@@ -1,6 +1,6 @@
 #
 # warning: somewhat scary/explicit down there!
-# see also todo.subtitle file, though what's here is mostly pretty well functional
+# see also todo.subtitle file, though what's here is mostly pretty well functional/complete
 #
 begin
   require 'sane'
@@ -35,11 +35,15 @@ module SubtitleProfanityFinder
        out.beginning_time = EdlParser.translate_string_to_seconds ts_begin
        out.ending_time = EdlParser.translate_string_to_seconds ts_end
        out.text = text.strip # harmless right?
-	   out.single_line_text = text.strip.gsub(/^[- ,_\.]+/, '').gsub(/[- ,_]+$/, '').gsub(/[\r\n]/, ' ')
+       add_single_line_minimized_text_from_multiline out
        out
      }
    end
-
+
+   def self.add_single_line_minimized_text_from_multiline entry
+     entry.single_line_text = entry.text.strip.gsub(/^[- ,_\.]+/, '').gsub(/[- ,_]+$/, '').gsub(/[\r\n]/, ' ')
+   end
+
    # convert string to regexp, also accomodating for "full word" type profanities
    def self.convert_to_regexps profanity_hash
     all_profanity_combinations = []
@@ -138,8 +142,8 @@ module SubtitleProfanityFinder
       111.chr + 
       100.chr +
       's' => 'deitys',
-      'meu deus' => 'lo..',
-      'lord' => 'lo..', 'da' +
+      'meu deus' => 'l...',
+      'lord' => 'l...', 'da' +
       'mn' => 'da..', 
       'f' +
       117.chr +
@@ -232,6 +236,7 @@ module SubtitleProfanityFinder
           text.gsub!(/\[+/, '[')
           text.gsub!(/\]+/, ']')
           entry.text = text
+          add_single_line_minimized_text_from_multiline entry
           text = text.gsub(/[\r\n]|\n/, ' ') # flatten up to 3 lines of text to just 1
           ts_begin_human = EdlParser.translate_time_to_human_readable ts_begin, true
           ts_end_human = EdlParser.translate_time_to_human_readable ts_end, true