sensible-cinema 0.22.1 → 0.23.0

data/change_log_with_feature_list.txt

@@ -1,3 +1,13 @@
+== 0.23.0 ==
+
+OS X compatibility.  Though not heavily used it might work.
+
+Subtitle parser/scanner: now it can scan for "complete" words (e.g. hello is no longer considered a profanity)
+even if they complete words are at the end of lines, middle, beginning, or the entire line.  With unit tests.
+
+Added a "play unedited with smplayer/mplayer" buttons that work better now.  These are useful for
+double checking the timestamps of subtitle files for accuracy.
+
 == 0.22.1 ==
 
 Test release for automated sourceforge build system

data/development.txt

@@ -29,14 +29,23 @@ Currently it's windows only, ping me if you want that changed.
 
 Note: you transfer (c) to copyrighted published of sensible cinema when you submit patches.
 
-Note that there are batch files to more easily run SC in normal, create, and/or "realtime OCR track" mode.
+To run:
+$ jruby bin/sensible-cinema # DVD output "parser/cutter"
+$ jruby bin/sensible-cinema --create-mode # DVD output "parser/cutter" create mode [advanced]
+$ jruby bin/sensible-cinema-cli # the experimental OCR tracker for arbitrary online/local/internet players.
+
+See also the rake file for ability to bundle/run all the specs.
 
 All feedback/contribution welcome :)
 
+== mac os x developers ==
+
+You'll have to install a few dependencies.  It will tell you which, or you can discover them by running lib/check_installed_xxx.rb
+
 == 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
+C:\sensible-cinema-git-clone>jruby bin\sensible-cinema-cli --help

data/go.bat

@@ -1,2 +1,2 @@
 @rem NB that you can call it like go --debug
-call j %* bin\sensible-cinema || call jruby %* bin\sensible-cinema
+call j %* bin\sensible-cinema

data/go.sh

@@ -0,0 +1 @@
+jruby bin/sensible-cinema $1 $2 $3 $4 $5 # --create-mode

data/go_ocr_tracker.bat

@@ -1 +1 @@
-call j bin\sensible-cinema-cli %* || call jruby bin\sensible-cinema-cli %*
+call j bin\sensible-cinema-cli %*

data/goc.bat

@@ -0,0 +1 @@
+call j %* bin\sensible-cinema --create-mode

data/lib/auto_convert.rb

@@ -1,4 +1,5 @@
-seconds = (ARGV[0] || 1000).to_f
+seconds = eval(ARGV[0] || "1000").to_f
 p 'syntax: second to convert, first conversion ratio, second conversation ratio'
-p 'converted value is', seconds * (ARGV[1] ||29.97/30).to_f
-p 'another converted value is', seconds* (ARGV[2] ||29.97/30).to_f
+twentyNinePointNineSeven =  30000/1001.0
+p 'converted value is', seconds * (ARGV[1] || twentyNinePointNineSeven/30).to_f
+p 'another converted value is', seconds* (ARGV[2] || 30/twentyNinePointNineSeven).to_f

data/lib/check_installed_mac.rb

@@ -0,0 +1,40 @@
+require 'rubygems'
+require 'os'
+success = true
+
+# MPlayer OSX Extended instead of smplayer... ?
+module CheckInstalledMac
+ def self.check_for_installed name
+  if name == 'mencoder'
+    output = `mencoder --fail 2>&1`
+    if output =~ /mencoder/i
+      # success, it is installed
+      return true
+    else
+      # fall through
+    end
+  end
+
+  command = {"gocr" => "gocr --help", "convert" => "convert --help", 
+    "mplayer" => "mplayer", "mencoder" => "fakey", "ffmpeg" => "ffmpeg -version"}[name]
+
+  raise 'unknown ' + name unless command # double check
+
+  unless system(command + " 1> " + OS.dev_null + " 2>" + OS.dev_null)
+     name = 'ImageMagick' if name == 'convert' # special case...
+     puts 'lacking dependency! Please install ' + name + ' by running $ sudo port install ' + name
+     false
+  else
+    true
+  end
+
+ end
+end
+
+if $0 == __FILE__
+  for name in ['gocr', 'convert', 'mplayer', 'ffmpeg'] do
+    if CheckInstalledMac.check_for_installed name
+      puts 'has dep:' + name
+    end
+  end
+end

data/lib/drive_info.rb

@@ -16,51 +16,63 @@ This file is part of Sensible Cinema.
     along with Sensible Cinema.  If not, see <http://www.gnu.org/licenses/>.
 =end
 require 'digest/md5'
+require 'rubygems'
 require 'sane'
 require 'ostruct'
 
 class DriveInfo
 
  def self.md5sum_disk(dir)
-  digest = Digest::MD5.new()
-  files  = Dir[dir + "VIDEO_TS/*.IFO"]
-  files.sort.each{|f| # sort tends to not do anything...
-    digest << File.binread(f) 
-  }
-  raise 'drive might not yet have disc in it? ' + dir unless files.length > 0
-  digest.hexdigest
+   if OS.mac?
+     output = `#{__DIR__}/../vendor/mac_dvdid/bin/dvdid #{dir}`
+   else
+     output = `#{__DIR__}/../vendor/dvdid.exe #{dir}`
+   end
+   puts 'dvdid command failed?' unless $?.exitstatus == 0 # hope this accomodates for it barfing...
+   output.strip
  end
 
  def self.get_dvd_drives_as_openstruct
    disks = get_all_drives_as_ostructs
-   disks.select{|d| d.Description =~ /CD-ROM/}.map{|d| d2 = OpenStruct.new; d2.VolumeName = d.VolumeName; d2.Name = d.Name; d2}
+   disks.select{|d| d.Description =~ /CD-ROM/}
  end
   
  def self.get_drive_with_most_space_with_slash
   disks = get_all_drives_as_ostructs
   most_space = disks.sort_by{|d| d.FreeSpace}[-1]
-  most_space.Name + "\\"
+  most_space.MountPoint + "/"
  end
 
  def self.get_all_drives_as_ostructs
   if OS.mac?
     require 'plist'
-    a = Dir['/Volumes/*'].map{|dir|
+    Dir['/Volumes/*'].map{|dir|
      parsed = Plist.parse_xml(`diskutil info -plist "#{dir}"`)
      d2 = OpenStruct.new
      d2.VolumeName = parsed["VolumeName"]
      d2.Name = dir # DevNode?
      d2.FreeSpace = parsed["FreeSpace"].to_i
-     d2.Description = parsed['Description'] # work ??
+     d2.Description = parsed['OpticalDeviceType']
+     d2.MountPoint = parsed['MountPoint']
+     if d2.MountPoint == '/'
+       d2.MountPoint = File.expand_path '~' # better ?
+     end
      d2
     }
-    a
   else
     require 'ruby-wmi'
     disks = WMI::Win32_LogicalDisk.find(:all)
-    disks.map{|d| d2 = OpenStruct.new; d2.Description = d.Description; d2.VolumeName = d.VolumeName; d2.Name = d.Name; d2.FreeSpace = d.FreeSpace.to_i; d2} 
+    disks.map{|d| d2 = OpenStruct.new; d2.Description = d.Description; d2.VolumeName = d.VolumeName; d2.Name = d.Name; 
+      d2.FreeSpace = d.FreeSpace.to_i
+      d2.MountPoint = d.Name[0..2]
+      d2
+    } 
   end
  end
 
 end
 
+if $0 == __FILE__
+  require 'pp'
+  p DriveInfo.get_dvd_drives_as_openstruct
+end

data/lib/edl_parser.rb

@@ -16,8 +16,6 @@ This file is part of Sensible Cinema.
     along with Sensible Cinema.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-require_relative 'overlayer'
-
 class EdlParser
 
   def self.parse_file filename, ignore_settings = false
@@ -203,4 +201,4 @@ end
 
 if RUBY_VERSION < '1.8.7'
   raise 'needs ruby 1.8.7 at least'
-end
+end

data/lib/mencoder_wrapper.rb

@@ -23,15 +23,20 @@ class MencoderWrapper
   end
   class << self
   
-    def get_header this_drive, these_settings
+    def get_header this_file, these_settings
       out = ''
       if File.exist?(@big_temp) && File.exist?(@big_temp + '.done')
-        out = '@rem '
+        out = '@rem ' # don't re-do this file if .done file already exists...
       end
       audio_codec = these_settings['audio_codec'] || 'mp3lame' # not copy...sniff...or you can't hear cars... LODO
-      # LODO do I need mp3lame for sintel, or can I get away with lavc?
-      video_opts = "-vf scale=720:480,harddup -ovc lavc -lavcopts vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=1:vstrict=0:acodec=ac3:abitrate=192:autoaspect -ofps 30000/1001"
-      out + "mencoder dvdnav://#{@dvd_title_track} -of mpeg -mpegopts format=dvd:tsaf -alang en -nocache -sid 1000 -oac #{audio_codec} #{video_opts} -o #{@big_temp} -dvd-device #{this_drive} && echo done_grabbing > #{@big_temp}.done\n"
+      # LODO do I need mp3lame for sintel, or can I get away with lavc? will it work overall currently?
+      # -vf pullup,softskip "fixes" freaky mixed DVD's, or so they tell me...
+      # harddup is "to create a DVD compliant" video which...I think I don't need...but DVD players require it...
+      #   "This will result in a slightly bigger file, but will not cause problems when demuxing or remuxing into other container formats." LODO no harddup ok ???
+      # lodo: can I use ffmpeg to unmux-ify/GOP'ify perhaps?
+      # LODO 24000/1001 ?
+      video_opts = "-vf scale=pullup,softskip,harddup -ovc lavc -lavcopts vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=1:vstrict=0:acodec=ac3:abitrate=192:autoaspect -ofps 30000/1001"
+      out += "mencoder \"#{this_file.gsub('"', '\\"')}\" -of mpeg -mpegopts format=dvd:tsaf -alang en -nocache -sid 1000 -oac #{audio_codec} #{video_opts} -o #{@big_temp} -dvd-device #{this_drive} && echo done_grabbing > #{@big_temp}.done\n"
     end
     
     def calculate_final_filename to_here_final_file
@@ -44,7 +49,7 @@ class MencoderWrapper
       @dvd_title_track = dvd_title_track
       assert dvd_title_track
       if start_here || end_here
-        raise 'need both' unless end_here && start_here
+        raise 'need end and start' unless end_here && start_here
         start_here = EdlParser.translate_string_to_seconds(start_here)
         end_here   = EdlParser.translate_string_to_seconds(end_here)
         combined.select!{|start, endy, type| start > start_here && endy < end_here }

data/lib/mouse.rb

@@ -144,4 +144,4 @@ module Mouse
   end
     
 end
-Mouse.total_movements = 0
+Mouse.total_movements = 0

data/lib/mplayer_edl.rb

@@ -16,7 +16,6 @@ This file is part of Sensible Cinema.
     along with Sensible Cinema.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-require_relative 'overlayer'
 require_relative 'edl_parser'
 
 class MplayerEdl
@@ -30,4 +29,4 @@ class MplayerEdl
     end
     out
   end
-end
+end

data/lib/ocr.rb

@@ -29,8 +29,13 @@ end
 
 # helper for OCR'ing single digits that were screen captured
 module OCR
-  
-  GOCR = File.expand_path(File.dirname(__FILE__) + "/../vendor/gocr049.exe -C 0-9:/ ")
+  if OS.windows? 
+    GOCR = File.expand_path(File.dirname(__FILE__) + "/../vendor/gocr049.exe -C 0-9:/ ")
+  else
+    require_relative 'check_installed_mac'
+    exit 1 unless CheckInstalledMac.check_for_installed 'gocr'
+    GOCR = "gocr"
+  end
   
   CACHE = {}
   
@@ -107,4 +112,4 @@ module OCR
   
   extend self
   
-end
+end

data/lib/subtitle_profanity_finder.rb

@@ -50,14 +50,15 @@ module SubtitleProfanityFinder
 
 
 
-    profanities = {'hell' => 'heck',
+    profanities = {'hell' => ['he..', true],
       'g' +
-      'o' + 100.chr => '...', 'g' +
+      'o' + 100.chr => 'deity', 'g' +
       111.chr + 
       100.chr +
-      's' => 'g...',
+      's' => 'deitys',
       'lord' => 'lo..', 'da' +
-      'mn' => 'da..', 'f' +
+      'mn' => 'da..', 
+      'f' +
       117.chr +
       99.chr +
       107.chr =>
@@ -65,10 +66,17 @@ module SubtitleProfanityFinder
       'bi' +
       'tc' + 104.chr => 'b.....',
       'bas' +
-      'tar' + 100.chr => 'ba.....',
-      ('a' +
-      's'*2) => 'a..',
-      'breast' => 'br....'
+      'ta' + 'r' + 100.chr => 'ba.....',
+      ((arse = 'a' +
+      's'*2)) => ['a..', true],
+      arse + 'h' +
+      'ole' => 'a..h...',
+      arse + 'wipe' => 'a..w....',
+      'breast' => 'br....',
+      'jesus' => 'jes..',
+      'chri' +
+      'st'=> ['chri..', true], # allow for christian [?]
+      'a realllly bad word' => ['test bad word', true]
     }
 
     incoming = File.read(args.shift)
@@ -79,35 +87,74 @@ module SubtitleProfanityFinder
       profanities[prof] = sanitized
     end
 
-    profanities = profanities.to_a.sort.reverse.map!{|profanity, sanitized| [Regexp.new(profanity, Regexp::IGNORECASE), sanitized]}
+    all_profanity_combinations = []
 
-    output = ''
-    for glop in incoming.scan(/\d\d:\d\d:\d\d.*?^\d+$/m)
+    profanities.to_a.sort.reverse.each{|profanity, sanitized|
+      as_regexp = Regexp.new(profanity, Regexp::IGNORECASE)
+      sanitized = Array(sanitized)
+      is_single_word_profanity = sanitized[1]
+      permutations = [profanity]
+      
+      if profanity =~ /l/
+        permutations << profanity.gsub(/l/i, 'i')
+      end
+      
+      if profanity =~ /i/
+        permutations << profanity.gsub(/i/i, 'l')
+      end
+      
+      for profanity in permutations
+        if is_single_word_profanity
+          # oh wow this is ughly...
+          sanitized_version = sanitized[0]
+          as_regexp = Regexp.new("\s" + profanity + "\s", Regexp::IGNORECASE)
+          all_profanity_combinations << [as_regexp, ' ' + sanitized_version + ' ']
+          as_regexp = Regexp.new("^" + profanity + "\s", Regexp::IGNORECASE)
+          all_profanity_combinations << [as_regexp, sanitized_version + ' ']
+          as_regexp = Regexp.new("\s" + profanity + "$", Regexp::IGNORECASE)
+          all_profanity_combinations << [as_regexp, ' ' + sanitized_version]
+          as_regexp = Regexp.new("^" + profanity + "$", Regexp::IGNORECASE)
+          all_profanity_combinations << [as_regexp, sanitized_version]
+        else
+          raise unless sanitized.length == 1 # that would be weird elsewise...
+          all_profanity_combinations << [as_regexp, sanitized[0]]
+        end
+      end
+    }
 
-      for profanity, sanitized in profanities
+    output = ''
+    # from a timestamp to a line with nothing :)
+    for glop in incoming.scan(/\d\d:\d\d:\d\d.*?^$/m)
+      for profanity, (sanitized, whole_word) in all_profanity_combinations
         # dunno if we should force words to just start with this or contain it anywhere...
         # what about 'g..ly' for example?
-        # or 'un...ly' ?
+        # or 'un...ly' ? I think we're ok there...
 
         if glop =~ profanity
           # create english-ified version
           # take out timing line, number line
-          sanitized_glop = glop.lines.to_a[1..-2].join('')
+          sanitized_glop = glop.lines.to_a[1..-1].join(' ')
           sanitized_glop.gsub!(/[\r\n]/, '') # flatten 3 lines to 1
-          sanitized_glop.gsub!(/<i>/, '') # oddity
-          sanitized_glop.gsub!(/[^a-zA-Z0-9]/, ' ') # kill weird stuff like ellipses
-
-
+          sanitized_glop.gsub!(/<(.|)(\/|)i>/i, '') # kill <i> 
+          sanitized_glop.gsub!(/[^a-zA-Z0-9'""]/, ' ') # kill weird stuff like ellipses
+          sanitized_glop.gsub!(/\W\W+/, ' ') # remove duplicate "  " 's
+          
           # sanitize
-          for (prof2, sanitized2) in profanities
-            sanitized_glop.gsub!(prof2, sanitized2)
+          for (prof2, (sanitized2, whole_word2)) in all_profanity_combinations
+            if sanitized_glop =~ prof2
+              require 'ruby-debug'
+              #debugger
+            end
+            if sanitized_glop =~ prof2
+              sanitized_glop.gsub!(prof2, sanitized2)
+            end
           end
 
           # extract timing info
           timing_line = glop.split("\n").first.strip
           timing_line =~ /((\d\d:\d\d:\d\d),(\d\d\d) --> (\d\d:\d\d:\d\d),(\d\d\d))/
           # "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
-          output += %!"#{$2}.#{$3}" , "#{$4}.#{$5}", "profanity", "#{sanitized}", "#{sanitized_glop.strip}",\n!
+          output += %!"#{$2}.#{$3}" , "#{$4}.#{$5}", "profanity", "#{sanitized.strip}", "#{sanitized_glop.strip}",\n!
         end
 
       end

data/lib/swing_helpers.rb

@@ -89,7 +89,7 @@ module SensibleSwing
   end
   
   class NonBlockingDialog < JDialog
-    def initialize title_and_display_text, close_button_text= 'Close'
+    def initialize title_and_display_text, close_button_text = 'Close'
       super nil
       lines = title_and_display_text.split("\n")
       set_title lines[0]

data/sensible-cinema.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.22.1"
+  s.version = "0.23.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
-  s.date = %q{2011-06-09}
+  s.date = %q{2011-06-27}
   s.email = %q{rogerdpack@gmail.com}
   s.executables = ["sensible-cinema", "sensible-cinema-cli"]
   s.extra_rdoc_files = [
@@ -31,8 +31,9 @@ Gem::Specification.new do |s|
     "development.txt",
     "experimental_ocr_readme.txt",
     "go.bat",
+    "go.sh",
     "go_ocr_tracker.bat",
-    "gocreatemode.bat",
+    "goc.bat",
     "gplv3.txt",
     "how_to_create_your_own_delete_lists.txt",
     "is_it_legal_to_copy_dvds.txt",
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
     "lib/add_any_bundled_gems_to_load_path.rb",
     "lib/auto_convert.rb",
     "lib/blanker.rb",
+    "lib/check_installed_mac.rb",
     "lib/count_down_timer_jruby_swing.rb",
     "lib/drive_info.rb",
     "lib/edl_converter.rb",
@@ -66,11 +68,12 @@ Gem::Specification.new do |s|
     "never_do",
     "ocr.todo_if_need_speed",
     "preamble",
-    "propaganda",
     "sensible-cinema.gemspec",
+    "spec/arse.srt",
     "spec/blanker.spec.rb",
     "spec/common.rb",
     "spec/convert_image.rb",
+    "spec/deity_end.srt",
     "spec/dragon.srt",
     "spec/drive_info.spec.rb",
     "spec/edl_parser.spec.rb",
@@ -96,23 +99,34 @@ Gem::Specification.new do |s|
     "todo.build_library.txt",
     "todo.inventionzy.txt",
     "todo.open_edl_list_org.txt",
+    "todo.propaganda",
     "todo.subtitle",
     "vendor/jruby-complete-1.6.2.jar",
+    "vendor/mac_dvdid/bin/dvdid",
+    "vendor/mac_dvdid/include/dvdid/dvdid.h",
+    "vendor/mac_dvdid/include/dvdid/dvdid2.h",
+    "vendor/mac_dvdid/include/dvdid/export.h",
+    "vendor/mac_dvdid/lib/libdvdid.0.dylib",
+    "vendor/mac_dvdid/lib/libdvdid.a",
+    "vendor/mac_dvdid/lib/libdvdid.dylib",
+    "vendor/mac_dvdid/lib/libdvdid.la",
     "vendor/monkey.png",
     "vendor/readme.txt",
     "www/index.html",
     "zamples/edit_decision_lists/category descriptions.txt",
     "zamples/edit_decision_lists/dvds/COOL_RUNNINGS.txt",
     "zamples/edit_decision_lists/dvds/Harry Potter 2.txt",
+    "zamples/edit_decision_lists/dvds/bambi.txt",
     "zamples/edit_decision_lists/dvds/big_buck_bunny_dvd.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/example_delete_list.txt",
-    "zamples/edit_decision_lists/dvds/example_delete_list_that_has_no_cuts_in_it.txt",
     "zamples/edit_decision_lists/dvds/happiest baby on the block.txt",
     "zamples/edit_decision_lists/dvds/how_to_train_your_dragon.txt",
+    "zamples/edit_decision_lists/dvds/kung_fu_panda_1.txt",
     "zamples/edit_decision_lists/dvds/legend_of_the_guardians_the_owls_of_gahoole.txt",
     "zamples/edit_decision_lists/dvds/making_marriage_work.txt",
+    "zamples/edit_decision_lists/dvds/narnia_voyage_of_the_dawn_treader.txt",
     "zamples/edit_decision_lists/dvds/old_and_inaccurate/White Christmas.txt",
     "zamples/edit_decision_lists/dvds/old_and_inaccurate/all_dogs_go_to_heaven.txt",
     "zamples/edit_decision_lists/dvds/old_and_inaccurate/cars_disney.txt",
@@ -124,6 +138,7 @@ Gem::Specification.new do |s|
     "zamples/edit_decision_lists/dvds/sintel_open_source_blender.txt",
     "zamples/edit_decision_lists/dvds/tron_legacy.txt",
     "zamples/edit_decision_lists/dvds/turn_around_alma_younger.txt",
+    "zamples/edit_decision_lists/dvds/zz_example_delete_list_that_has_no_cuts_in_it.txt",
     "zamples/edit_decision_lists/netflix/greatest_story_ever_told_netflix.txt",
     "zamples/edit_decision_lists/old_not_yet_updated/example_edit_decision_list.txt",
     "zamples/edit_decision_lists/old_not_yet_updated/youtube/gummy_bear_song_youtube.txt",