sensible-cinema 0.7.7 → 0.9.3

data/README

@@ -1,14 +1,15 @@
 Sensible-cinema is a program that allows you to do pre-programmed scene selection (i.e. "mute out" 
 or "bleep out" scenes) on arbitrary media players like netflix online, vlc, etc.
 
-Currently it takes as input a list of known "skip-worthy" scenes.
+  
+Currently it takes as input a list of "skippable" scenes, and a player description.
 It then tracks whichever player you are using, and mutes or blanks out the system appropriately, 
 during the scenes specified.
 
 It works out of the box with the hulu and VLC players on windows.  It isn't hard to 
 add new players, and probably wouldn't be too hard to add more operating systems.
 
-== How to use ==
+== How to Use ==
 
 Start playing your movie in its respective player, then startup sensible-cinema from
 the command line thus:
@@ -66,11 +67,11 @@ To create it, basically you notice something you want to add to the list, add it
 in your media player, and it should now be muted/blanked out automatically.
 
 So here is a way to create your scene descriptions file.
-First create a new file [2], and select it in sensible-cinema (even though it's still blank).
-Now use sensible-cinema and select the new file you just created.
-Now "preview" the movie, and as you do, you're going scenes to the file, and then test your additions.
-As you watch and hit a questionable scene, go back to several seconds before it using your player's 
-controls.  When you encounter the scene again, track its beginning and ending time.  One way to do this
+First create a new file [2], and now select it for use in sensible-cinema (even though it's still blank).
+Now "preview" your movie.  As you do, you're going to add scenes to that file, and then test your additions.
+
+So as you watch when you encounter a questionable scene, go back several seconds using your player's 
+controls.  When you encounter it again, track its beginning and ending time.  One way to do this
 is to, just before and just after the scene, hit the space bar *in the sensible-cinema window*.  
 Hitting the space bar outputs the current time.  If you hit it twice, once before and once after, 
 you should now have two reasonably accurate "timestamps" displayed.
@@ -82,9 +83,11 @@ Once you're done then you can contribute your scene descriptions file if desired
 
 [1] http://github.com/rdp/sensible-cinema/issues
 [2] The easiest way to do this is to start sensible-cinema, then instead of choosing an existing file,
-right click and choose "New -> Text Document" Now rename it (leaving it as .txt).
-"Right click -> Open" to open it in an editor.  Now also select that same file in sensible-cinema.
-Another easy way is to "right drag" an existing file then rename it and edit that one.
+"right click" on the existing file "example_scene_list.yml" and choose "Copy"
+now right click below the list of files and choose "paste"
+This will create the file "example_scene_list Copy.yml"
+Right click on it, choose rename, and give it a better name.
+Now "right click -> Open" to open it in an editor (recommend installing notepad++ and using that).  
 
 == FAQ ==
 
@@ -96,7 +99,7 @@ A. Not yet. And maybe.  Currently you'll either need to attach your computer to
    could run an ethernet cable from your computer, as well [1].
    I'd be happy to do a linux port of sensible-cinema if anybody requests it for their dedicated TV computer.
    There has also been some work toward getting your computer to stream "live" to your wii/ps3/xbox.
-   github message me if you're interested in trying it out!
+   github message me if you're interested in trying it out (testers wanted)!   
 
 Q. What movies does this work with?
 

data/TODO

@@ -2,46 +2,43 @@
 
 == low but actually want to do eventually (me) low prio: just do these...==
 
-  release ruby-y-y why not, it's interesting
-    "Linux compat anyone?"
-  utube nuki (somewhere with a real sound card...which would be the home comp)
   generations the first profanidade...
-  
-== random backlog ... based on user request..remember:  just local files for my own needs...==
 
-just plow forward, to "grab" available ideas...
+== random backlog ... based on user request..remember:  just local files for my own needs...==
+note: just plow forward, to "grab" available ideas...
+  except that for now, just what *I* plan on needing for myself.
 
-make it "quieter" at certain parts, arbitrarily...
+refactor: "screen time change", order should be swapped in bin/x
 
-release a zip file that they can just click on something to run it...self-extractor yeah.
+auto-play on youtube when it comes up...hmm... (detect)
 
-snag the close captioning for a profanity filter?
+able to make it "quieter" at certain parts, arbitrarily...
 
-make it able to use multiple players so I can maximize VLC...
+easier installer for windows: release a zip file that they can just click on a .bat file to run it
+  later: it installs/uninstalls appropo
+    suggestion: self-extractor
 
-blank overlay "and you are one awesome klingon"
+snag the close captioning as a profanity filter?
 
-screencast of something helpful (use, creation).
+make it able to use multiple players so I can maximize VLC...
 
-optimize (tell them) imdb: http://www.imdb.com/board/bd0000042/thread/58361958?d=58361958, english friendlier url's
+blank overlay text like "and you are one awesome klingon"
 
-bundle fewer imagemagick binaries
+screencast of things helpful (use, creation).
 
 TSR that monitors "oh you're opening a VLC? you're playing the E drive? That's bob's big plan? You're maximized? Full screened? watching x on hulu?"
 
-netflix player
+a netflix online player description
   
-add my own stuff to imdb...
-antz to imdb...
+add my stuff to imdb...
 
-imdb parser...somehow
+an imdb parser?
 
-make it into a real live full functional app...like fully fully functional and good (for use, not editing), mostly with the drop down lists uh guess.
+user customizable levels...
+  maybe even "I don't like ones that are x, y, z", or "boring level x"
 
 make a redcar installer for their use...
 
-PISH
-
 can overlay with a "fuzzer-outer" for specific coordinates somehow or other...
 
 advertise like to lay men, to try to popularize
@@ -54,16 +51,17 @@ overlay with wav file (would work for VLC, could also "click to mute" for the ot
 
 fix any pending tests...
 
-can black out certain coords to keep things pretty...
+can black out certain coords to keep things prettier...
 
 allow x2,y2 for player descriptions...
 
 Linux port (call that good enough for usability on TV's...) between that and a VLC version...
 
 a web runnable? Why not?
-  click here to watch your favorite film edited!
+  click here to watch your favorite film edited! Just click!
 
-blank out with a user specifiable color (?)
+blank out with specifiable color
+  better default color?
 
 Auto mute/blank commercials?
 
@@ -78,37 +76,34 @@ control volume programmatically (using mouse) on the player itself.
 control mute programmatically (using mouse) on the player itself.
 control location programmatically (using mouse) on the player itself.
 
-compare labyrinth timings with a real DVD player...
+compare timings with a real DVD player...
 
-overlay with alpha transparent pic
+overlay with an alpha transparent pic
 
 Have a "list of all known movies (url's)" and be able to open (IE et al) to the correct part, and start playing them, and they work...
 
-magnify video parts (?)
-
-user customizable levels...
-  maybe even "I don't like ones that are x, y, z", or "boring level x"
-
 user-assignable "confidence" (how much time to 'wrap' surround the mutes, etc. to accomodate for slow computers/laggy internet/different players/poor input)
 
-
+does my sweet heart have any suggestions?
 
 auto-assignment of EDL's to media:
-  DVD's (right click...)
+  DVD's (right click on DVD player, play with scene-skipper?)
   web browser plugin?
   auto start on DVD insertion (?)
     and show appropriate scene-lists available based on title/md5 of something?
 
 Programmatically do all of the above, by driving a player with its real API.
   VLC
-    Allow it to record to mp4's somewhere.
-    See if burnable to DVD/CD ...
-    (use web interface?)
+    Allow it to record to mp4's somewhere (recordable)
+     burnable to DVD/CD ...
+     (use VLC's web interface?)
     
-never do unless paid:
+use spiffy differentiation for DVD's on windows
 
 super easy streamer windows -> {XBOX360, wii, etc..} basically like playon, which appears to have no free equivalent, I guess, though you can 
   save the files somewhere and stream them (and stream DVD's [?]) using tversity...maybe some other things...hmm...but no netflix!
   so currently they basically need to run a cable from laptop to PC, for me.  windows laptop, for netflix, though a dedicated box could run things like boxee.
   so I could create something that's basically windows -> ??? (ushare).  
-  For now it's either a cable, a computer (with its cable), or pay.
+  For now it's either a cable, a computer (with its cable), or pay.
+  todo: make a VLC wrapper so it works *if your soundcard supports it*
+    after: make the same work awesome on doze 7 without soundcard support :)

data/VERSION

@@ -1 +1 @@
-0.7.7
+0.9.3

data/bin/sensible-cinema

@@ -1,3 +1,4 @@
+puts 'Welcome to Sensible Cinema...'
 require 'rubygems'
 require 'sane'
 
@@ -36,43 +37,58 @@ else
   scene_list = ARGV.shift
 
   if scene_list == 'test'
-    puts 'warning--only doing screen dump in 4s...'
     overlay = nil
-    $VERBOSE = 1 # that's what they wanted...
-    sleep 4
+    p 'got test...just doing screen dump'
+    $VERBOSE=true # some extra output
   else
     if !File.exist? scene_list.to_s
+      puts 'Select Scene Descriptions file'
       scene_list = FileChooser.choose_file("SELECT SCENE DESCRIPTIONS FILE", __dir__  + "/../zamples/scene_lists")
     end
+    
     unless scene_list
-        puts "error: have to specify a scene descriptions file\n    or specify \"test\" on the command line if you just want to snapshot your player"
-        exit 1
+      puts "error: have to specify a scene descriptions file\n    or specify \"test\" on the command line if you just want to snapshot your player"
+      exit 1
     end
-    puts 'Selected scene descriptions file ' + File.basename(scene_list) + " (#{scene_list})", ''
-    overlay = OverLayer.new(scene_list)    
+    puts 'Selected scene descriptions file ' + File.basename(scene_list) + "\n\t(#{scene_list})"
+    Blanker.startup
+    
   end
   
   player_description = ARGV.shift.to_s
   if !File.exist?(player_description)    
-    player_description = FileChooser.choose_file("SELECT PLAYER (optional)", __dir__ + "/../zamples/players")
+    puts 'Please Select Computer Player'
+    player_description = FileChooser.choose_file("SELECT COMPUTER PLAYER", __dir__ + "/../zamples/players")
   end
   
+  # start it late as it has an annoying startup blip
+  overlay = OverLayer.new(scene_list)
+  
   if File.exist? player_description.to_s
-    # this one doesn't use file updates, so pass it the string
-    Mouse.jitter_forever_in_own_thread
-    puts 'Selected player ' + File.basename(player_description) + " (#{player_description})", ''
+    puts 'Selected player ' + File.basename(player_description) + "\n\t(#{player_description})"
+    # this one doesn't use any updates, so just pass in file contents, not filename
     screen_tracker = ScreenTracker.new_from_yaml File.binread(player_description), overlay
-    screen_tracker.dump_bmp if $VERBOSE
+    Mouse.jitter_forever_in_own_thread # when this ends you know the snapshot was taken...
+    
     # exit early if we just wanted a screen dump...a little kludgey...
-    exit 1 unless overlay
+    unless overlay
+      puts 'warning--only doing screen dump in T-minus 4s...'      
+      sleep 4
+      screen_tracker.dump_bmp
+      exit 1
+    end
     screen_tracker.process_forever_in_thread
   else
     puts 'warning--not using any screen tracking...'
   end
+  OCR.unserialize_cache_from_disk # do this every time so we don't delete it if they don't have one...
 
+  puts "Opening the curtains... (please play in player now)"
   overlay.start_thread true
   key_input = KeyboardInput.new overlay
   key_input.start_thread # status thread
   key_input.handle_keystrokes_forever # when this method exits, we want to exit fully...
-
+  Blanker.shutdown # lodo move this and the 'q' key to within overlayer
+  OCR.serialize_cache_to_disk
+  
 end

data/ext/mkrf_conf.rb

@@ -1,7 +1,8 @@
 raise 'must be using jruby to be able to run this...at least for now' unless RUBY_PLATFORM =~ /java/
 
-require 'win32/registry'
-
+# reset the OCR cache...
+require File.dirname(__FILE__) +  '/../lib/ocr'
+OCR.clear_cache!
 
 f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w") # create dummy rakefile to indicate success
 f.write("task :default\n")

data/lib/blanker.rb

@@ -1,54 +1,50 @@
-
-
-class Blanker 
+if RUBY_PLATFORM !~ /java/
+  require_relative 'fake_blanker'
+else
   
-  if RUBY_PLATFORM =~ /java/
-    require 'java'
-    JFrame = javax.swing.JFrame
-    JPanel = javax.swing.JPanel
+  require 'java'
   
-    def self.blank_full_screen!
-        # a new screen each time as other jruby doesn't terminate as gracefully as we would like...
-        frame = JFrame.new("blanked section") # ltodo pass in param
-        frame.default_close_operation = JFrame::EXIT_ON_CLOSE
-        frame.set_location(0,0)
-        frame.set_size(2000, 2000) # ltodo better coords...
-        frame.show
-        # lodo on top?
-        
-        fr = frame
-        fr.set_resizable(false)
-        
-        fr.set_undecorated(true) unless fr.is_displayable
-        
-        # probably unnecessary
-        panel = JPanel.new
-        frame.add(panel)
-        # frame.set_background()
-        panel.repaint
-        panel.revalidate
-        # too heavy!
-        # gd = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice()
-        # gd.set_full_screen_window(fr)
-        @fr = fr
-        @fr.set_visible(true)
-    end
-  else
-    # MRI fake blanker :)
-    def self.blank_full_screen!
-      puts 'the screen is now...blank!'      
+  class Blanker 
+    JFrame = javax.swing.JFrame
+    JLabel = javax.swing.JLabel
+
+    def self.startup
+      @fr = JFrame.new("blanked section")
+      @fr.default_close_operation = JFrame::EXIT_ON_CLOSE
+      @fr.set_size(2000, 2000) # ltodo better size coords ?
+      
+      @label = JLabel.new("  Blank section")
+      @fr.add(@label)
+      @label.repaint
+      @label.revalidate
+      
+      @fr.set_resizable(false)
+      @fr.set_visible(true) # have to do this once, to ever see the thing
+      # lodo does this really speed things up to pre-create it? that icon is a bit ugly...
+      unblank_full_screen! # and hide it to start
     end
-  
-  end
-  
-  def self.unblank_full_screen!
-    if RUBY_PLATFORM =~ /java/
-      if @fr
-        @fr.dispose
+
+    def self.blank_full_screen! seconds
+      if seconds
+        @label.set_text "   #{seconds} s" 
+      else
+        @label.set_text "  Blank section"
       end
-    else
-      puts 'the screen is now...visible!'
+      # somewhat hacky work around for doze: http://www.experts-exchange.com/Programming/Languages/Java/Q_22977145.html
+      @fr.setAlwaysOnTop(false) 
+      @fr.setAlwaysOnTop(true)
+      @fr.set_location(0,0)
+    end
+    
+    def self.unblank_full_screen!
+      # off screen...
+      @fr.set_location(-2100, -2100)
+    end
+    
+    def self.shutdown
+      @fr.dispose
     end
+    
   end
   
 end

data/lib/fake_blanker.rb

@@ -0,0 +1,18 @@
+puts 'warning--using fake blanker'
+
+class Blanker 
+  
+  def self.startup
+  end
+  def self.shutdown
+  end
+  
+  def self.blank_full_screen! text
+      puts 'the screen is now...blank!'
+  end
+  
+  def self.unblank_full_screen!
+      puts 'the screen is now...visible!'
+  end
+  
+end

data/lib/file_chooser.rb

@@ -13,10 +13,10 @@ module FileChooser
       fc.setDirectory(dir) 
     end
     # lodo allow for a FileFilter, too...
-    Thread.new { sleep 2; fc.to_front } # it gets hidden, unfortunately
+    Thread.new { sleep 2; fc.to_front } # it gets hidden, unfortunately, so try and bring it again to the front...
     fc.show
     if fc.get_file
-      out = fc.get_directory + '\\' + fc.get_file
+      out = fc.get_directory + fc.get_file
     end
     fc.remove_notify # allow out app to exit
     out

data/lib/ocr.rb

@@ -1,23 +1,23 @@
 im_path = File.expand_path(File.dirname(__FILE__) + "/../vendor/imagemagick") # convert.exe wants to only be chosen from here...
 ENV['PATH'] = im_path + ';' + ENV['PATH']
 
-require 'mini_magick'
-
 # helper for OCR'ing single digits that were screen captured
 module OCR
   
-  GOCR = File.expand_path(File.dirname(__FILE__) + "/../vendor/gocr048.exe -C 0-9:/S ")
+  GOCR = File.expand_path(File.dirname(__FILE__) + "/../vendor/gocr048.exe -C 0-9:/ ")
   
   CACHE = {}
   
   # options are :might_be_colon, :should_invert
   def identify_digit memory_bitmap, options = {}
-    if CACHE[memory_bitmap]
-      return CACHE[memory_bitmap]
+    require 'mini_magick' # installation woe, but actually pretty fast
+
+    if CACHE.has_key?(memory_bitmap)
+      return CACHE[memory_bitmap] unless (defined?($OCR_NO_CACHE) && $OCR_NO_CACHE)
     end
     if options[:might_be_colon]
       # do processing in-line <sigh>
-      total = (memory_bitmap.scan /\x00{5}+/).length
+      total = (memory_bitmap.scan(/\x00{5}+/)).length
       if total >= 3 # really should be 4 for VLC
         # it had some darkness...therefore have been a colon!
         CACHE[memory_bitmap] = ":"
@@ -25,21 +25,30 @@ module OCR
       end
     end
     image = MiniMagick::Image.from_blob(memory_bitmap)
-    image.format(:pnm) # expensive, requires convert.exe in path...
+    # any operation on image is expensive, requires convert.exe in path...
     if options[:should_invert] 
+      # hulu wants negate
+      # but doesn't want sharpen, for whatever reason...
       # mogrify calls it negate...
       image.negate 
+    else
+      # youtube wants sharpen...
+      image.sharpen(2)
     end
-    for level in [130, 100] # 100 for hulu...
+
+    image.format(:pnm)
+    for level in [130, 100, 0] # 130 for vlc, 100 for hulu, 0 for some youtube
       a = `#{GOCR} -l #{level} #{image.path} 2>NUL`
-      a.strip!
-      a = '3' if a == 'S' # sigh
+      # a can be like "_1_\n"
       if a =~ /[0-9]/
+        a.strip!
+        a.gsub!('_', '')
         a = a.to_i
         CACHE[memory_bitmap] = a
         return a
       end
     end
+    # don't cache it...could use up too much space on accident.
     nil
   end
   
@@ -47,6 +56,24 @@ module OCR
     `#{GOCR} -h 2>&1`
   end
   
+  def clear_cache!
+    CACHE.clear
+    File.delete CACHE_FILE if File.exist?(CACHE_FILE)
+  end
+  
+  CACHE_FILE = File.expand_path('~/.sensible-cinema-ocr.marshal')
+  
+  def serialize_cache_to_disk
+    File.binwrite(CACHE_FILE, Marshal.dump(CACHE))
+  end
+  
+  def unserialize_cache_from_disk  
+    if File.exist? CACHE_FILE
+      CACHE.merge!(Marshal.load File.binread(CACHE_FILE))
+    end
+    
+  end
+  
   extend self
   
 end

data/lib/overlayer.rb

@@ -34,9 +34,9 @@ class OverLayer
     Muter.unmute! unless defined?($AM_IN_UNIT_TEST)
   end
   
-  def blank!
+  def blank! seconds
     @am_blanked = true
-    Blanker.blank_full_screen!
+    Blanker.blank_full_screen! seconds
   end
   
   def unblank!
@@ -58,7 +58,7 @@ class OverLayer
   
   def reload_yaml!
     @all_sequences = OverLayer.translate_yaml(File.read(@filename))
-    puts '(re) loaded mute sequences from ' + File.basename(@filename) + ' as', pretty_sequences.pretty_inspect, "" unless $AM_IN_UNIT_TEST
+    puts '(re) loaded mute sequences from ' + File.basename(@filename) + ' as', pretty_sequences.pretty_inspect, "" unless defined?($AM_IN_UNIT_TEST)
     signal_change
   end  
   
@@ -116,11 +116,11 @@ class OverLayer
         end
         
         if start2 == endy2 || endy2 < start2
-          p 'warning--found a line that had poor interval', start, endy, type unless $AM_IN_UNIT_TEST
+          p 'warning--found a line that had poor interval', start, endy, type unless defined?($AM_IN_UNIT_TEST)
           next
         end
         if(endy2 > 60*60*3)
-          p 'warning--found setting past 3 hours [?]', start, endy, type unless $AM_IN_UNIT_TEST
+          p 'warning--found setting past 3 hours [?]', start, endy, type unless defined?($AM_IN_UNIT_TEST)
         end
         new[start2] = endy2
       }
@@ -189,7 +189,7 @@ class OverLayer
       end
     end
     check_reload_yaml
-    time + state + "(r,d,v,q to quit): "
+    time + state + "(r,d,v, or q to quit): "
   end
 
   def keyboard_input char
@@ -211,7 +211,7 @@ class OverLayer
         p 'set debug to', $DEBUG
         return
       when ' ' then
-        puts cur_english_time
+        puts 'timestamp:' + cur_english_time
         return
       when 'r' then
         reload_yaml!
@@ -335,8 +335,10 @@ class OverLayer
   end  
   
   def display_change change
-    puts ''
-    puts change + ' at ' + cur_english_time if $VERBOSE unless $DEBUG # too chatty for unit tests
+    puts '' unless defined?($AM_IN_UNIT_TEST)
+    if $VERBOSE
+      puts change + ' at ' + cur_english_time
+    end    
   end
   
   def set_states!
@@ -344,7 +346,6 @@ class OverLayer
     
     if should_be_muted && !muted?
       mute!
-      puts ''
       display_change 'muted'
     end
     
@@ -354,7 +355,7 @@ class OverLayer
     end
     
     if should_be_blank && !blank?
-      blank!
+      blank! "%.02f" % (next_point - cur_time)
       display_change 'blanked'
     end
 

data/lib/screen_tracker.rb

@@ -38,6 +38,7 @@ class ScreenTracker
     raise 'poor width or wrong window' if @x2 > max_x  || @x2 == x
     raise 'poor height or wrong window' if @y2 > max_y || @y2 == y
     @digits = digits
+    @displayed_warning = false
     pps 'using x',@x, 'from x', x, 'y', @y, 'from y', y,'x2',@x2,'y2',@y2,'digits', @digits if $VERBOSE
   end
   
@@ -61,15 +62,18 @@ class ScreenTracker
 
   end
   
+  # gets the snapshot of "all the digits together"
   def get_bmp
     # Note: we no longer bring the window to the front tho...which it needs to be in both XP and Vista to work...sigh.
     Win32::Screenshot::BitmapMaker.capture_area(@hwnd,@x,@y,@x2,@y2) {|h,w,bmp| return bmp}
   end
   
+  # gets snapshot of the full window
   def get_full_bmp
-    Win32::Screenshot.hwnd(@hwnd, 0) {|h,w,bmp| return bmp}
+     Win32::Screenshot::BitmapMaker.capture_all(@hwnd) {|h,w,bmp| return bmp}
   end
-  
+
+  # writes out all screen tracking info to various files in the current pwd
   def dump_bmp filename = 'dump.bmp'
     File.binwrite filename, get_bmp
     File.binwrite 'all.' + filename, get_full_bmp
@@ -78,9 +82,12 @@ class ScreenTracker
   
   def dump_digits
     if @digits
+      @digit_count ||= 1
+      @digit_count += 1
       for type, bitmap in get_digits_as_bitmaps
-        File.binwrite type.to_s + '.bmp', bitmap
+        File.binwrite type.to_s + '.' + @digit_count.to_s + '.bmp', bitmap
       end
+      print 'wrote digits:', @digit_count, "\n"
     end
   end
   
@@ -118,57 +125,66 @@ class ScreenTracker
       current = get_bmp
       if current != original
         if @digits
-          return attempt_to_get_time_from_screen
+          got = attempt_to_get_time_from_screen
+          if @displayed_warning && got
+            # reassure user :)
+            p 'tracking it successfully again' 
+            @displayed_warning = false
+          end
+          return got
         else
           puts 'screen time change only detected...'
+          return
         end
-        return
       end
       sleep 0.02
       if(Time.now - time_since_last > 5)
-        p 'warning--unable to track for some reason--may need to restart sensible-cinema'
+        p 'warning--unable to track screen time for some reason' unless @displayed_warning
         time_since_last = Time.now
-        # reget it, just in case...
+        @displayed_warning = true
+        # reget window, just in case that's the problem...
         get_hwnd
       end
     }
   end
   
   def attempt_to_get_time_from_screen
-          out = {}
-          dump_digits if $DEBUG            
-          digits = get_digits_as_bitmaps # 0.08s [!] not too accurate...
-          start = Time.now
-          DIGIT_TYPES.each{|type|
-            if digits[type]
-              digit = identify_digit(digits[type])
-              unless digit
-                if $DEBUG || $VERBOSE
-                  @a ||= 1
-                  @a += 1
-                  p 'unable to identify digit!' + type.to_s + @a.to_s
-                  File.binwrite("bad_digit#{@a}#{type}.bmp", digits[type]) unless type == :hours
-                end
-                if type == :hours
-                  digit = 0 # this one can fail in VLC
-                else
-                  # early return
-                  p 'identity failure' if $VERBOSE
-                  return
-                end
-              end
-              out[type] = digit
-            else
-              # there isn't one on screen, so probably zero...
-              out[type] = 0
+    out = {}
+    dump_digits if $DEBUG            
+    digits = get_digits_as_bitmaps # 0.08s [!] not too accurate...ltodo
+    start = Time.now
+    DIGIT_TYPES.each{|type|
+      if digits[type]
+        digit = identify_digit(digits[type])
+        unless digit
+          if $DEBUG || $VERBOSE
+            @a ||= 1
+            @a += 1
+            @already_wrote ||= {}
+            unless @already_wrote[digits[type]]
+              p 'unable to identify capture!' + type.to_s + @a.to_s
+              File.binwrite("bad_digit#{@a}#{type}.bmp", digits[type]) unless type == :hours
+              @already_wrote[digits[type]] = true
             end
-          }
-          out = "%d:%d%d:%d%d" % DIGIT_TYPES.map{|type| out[type]}
-          p 'got new screen time ' + out + " delta:" + (Time.now - start).to_s if $VERBOSE
-          # if the window was in the background it will be all zeroes, so nil it out
-          out = nil unless out =~ /[1-9]/
-          return out, Time.now-start
+          end
+          if type == :hours
+            digit = 0 # this one can fail in VLC
+          else
+            # early return
+            p 'identity failure ' + type.to_s if $VERBOSE
+            return
+          end
         end
+        out[type] = digit
+      else
+        # there isn't one specified as being on screen, so assume it is always zero (like youtube hour)...
+        out[type] = 0
+      end
+    }
+    out = "%d:%d%d:%d%d" % DIGIT_TYPES.map{ |type| out[type] }
+    puts '', 'got new screen time ' + out + " tracking delta:" + (Time.now - start).to_s if $VERBOSE
+    return out, Time.now-start
+  end
   
   def process_forever_in_thread
     Thread.new {

data/spec/blanker.spec.rb

@@ -2,16 +2,24 @@ require File.dirname(__FILE__) + '/common'
 require_relative '../lib/blanker.rb'
 
 describe Blanker do
+
+  before(:each) do
+    Blanker.startup  
+  end
   
+  after(:each) do
+    Blanker.shutdown
+  end
+
   it "should be able to blank then unblank" do
-    Blanker.blank_full_screen!
-    sleep 3
+    Blanker.blank_full_screen! "2.000"
+    sleep 2
     Blanker.unblank_full_screen!
   end
   
   it "should be able to blank several times" do
     3.times {
-      Blanker.blank_full_screen!
+      Blanker.blank_full_screen! ''
       Blanker.unblank_full_screen!
     }
   end
@@ -26,7 +34,7 @@ describe Blanker do
     
     it "should be able to blank certain coords"
     
-    it "should have a color optionally"
+    it "should have a background color optionally"
     
     it "should have a picture optionally"
     

data/spec/ocr.spec.rb

@@ -1,5 +1,8 @@
 require File.dirname(__FILE__) + '/common'
 require_relative "../lib/ocr"
+require 'benchmark'
+
+$OCR_NO_CACHE = true
 
 describe OCR do
   
@@ -7,31 +10,80 @@ describe OCR do
     OCR.version.should_not be_blank
   end
   
-  it "should be able to grab some digits" do
-    success = true
-    for file in Dir['images/*[0-9].bmp']
+  Dir['images/*[0-9].bmp'].each{ |file|
+    it "should be able to OCR #{file}" do
       options = {}
       options[:should_invert] = true if file =~ /hulu/
       file =~ /(.)\.bmp/
       expected_digit = $1.to_i
       if OCR.identify_digit(File.binread(file), options) != expected_digit
         p "fail:" + file
-        require 'ruby-debug'
-        debugger
-        OCR.identify_digit(File.binread(file), options)
-        success = false
+        begin
+          require 'ruby-debug'
+          debugger
+          OCR.identify_digit(File.binread(file), options)
+        rescue LoadError
+          puts 'unable to load ruby-debug'
+        end
+        fail
       end
     end
-    fail unless success
-  end
+  }
   
   it "should be able to grab a colon" do
-    pending "caring about colons"
-    OCR.identify_digit(File.binread("images/colon.bmp"), :might_be_colon => true).should == ":"
+    pending "caring about colons" do
+      OCR.identify_digit(File.binread("images/colon.bmp"), :might_be_colon => true).should == ":"
+    end
+  end
+  
+  def read_digit
+    OCR.identify_digit(File.binread("images/youtube_3_0.bmp"))
   end
   
   it "should return nil if it can't identify a digit" do
     OCR.identify_digit(File.binread("images/black.bmp")).should be_nil
   end
   
+  context "cache" do
+  
+   before do
+     OCR.clear_cache!
+     $OCR_NO_CACHE = false
+   end
+  
+   after do
+     $OCR_NO_CACHE = true
+   end
+  
+    it "should cache results from one time to the next" do
+      original_time = Benchmark.realtime { read_digit }
+      new_time = Benchmark.realtime { 3.times { read_digit } }
+      new_time.should be < original_time
+    end
+    
+    it "should not cache results for failed reads" do
+      original_time = Benchmark.realtime { OCR.identify_digit(File.binread("images/black.bmp")) }
+      new_time = Benchmark.realtime { 3.times { OCR.identify_digit(File.binread("images/black.bmp"))} }
+      new_time.should be > original_time
+    end    
+    
+    it "should serialize creating a cache file" do
+      Pathname.new(OCR::CACHE_FILE).should_not exist
+      OCR.serialize_cache_to_disk
+      Pathname.new(OCR::CACHE_FILE).should exist
+    end
+    
+    it "should use the cache file to speed things up on startup" do
+      long = Benchmark.realtime { read_digit }
+      OCR.serialize_cache_to_disk
+      OCR::CACHE.clear
+      long2 = Benchmark.realtime { read_digit }
+      OCR.unserialize_cache_from_disk
+      short = Benchmark.realtime { 3.times { read_digit } }
+      long.should be > short
+      long2.should be > short
+    end
+    
+  end
+  
 end

data/spec/overlayer.spec.rb

@@ -22,11 +22,13 @@ describe OverLayer do
   before do
     File.write 'temp.yml', YAML.dump({:mutes => {2.0 => 4.0}} )
     @o = OverLayer.new('temp.yml')
+    Blanker.startup
   end
 
   after do
     Thread.join_all_others
     File.delete 'temp.yml'
+    Blanker.shutdown
   end
 
   def start_good
@@ -131,7 +133,7 @@ describe OverLayer do
   end
 
   it 'should have key list output on screen' do
-    @o.status.should include("r,d,v,q to quit")
+    @o.status.should include("q to quit")
   end
 
   it 'should allow for yaml input and parse it appropo' do
@@ -407,7 +409,7 @@ describe OverLayer do
 
     it "should not fail with verbose on, after it's past next states" do
       at(500_000) do
-        @o.status.should == "Current time: 138:53:20.0 no more actions after this point...(r,d,v,q to quit): "
+        @o.status.should == "Current time: 138:53:20.0 no more actions after this point...(r,d,v, or q to quit): "
       end
     end
 

data/spec/screen_tracker.spec.rb

@@ -18,8 +18,7 @@ describe ScreenTracker do
         rescue
           silence = File.expand_path("./silence.wav").gsub("/", "\\")
           Dir.chdir("/program files/VideoLan/VLC") do; IO.popen("vlc.exe #{silence}").pid; end # work around for jruby...
-          sleep 4
-          
+          sleep 4          
           $pid1 = GetPid.get_process_id_from_window(Win32::Screenshot::Util.window_hwnd(SILENCE)) # more jruby work-arounds...
         end
       end
@@ -165,7 +164,7 @@ describe ScreenTracker do
       context "using OCR" do
 
         before do
-          @a = ScreenTracker.new_from_yaml File.read("../zamples/players/total_length_under_an_hour/vlc_non_full_screened.yml"), nil
+          @a = ScreenTracker.new_from_yaml File.read("../zamples/players/vlc/non_full_screened_total_length_under_an_hour.yml"), nil
         end
 
         it "should be able to disk dump snapshotted digits" do
@@ -217,7 +216,7 @@ describe ScreenTracker do
           output[0].should_not be_nil
           old_handle.should_not == @a.hwnd
         end
-
+        
       end
 
       def kill_vlc

data/zamples/players/youtube/full_screened_1024x768.yml

@@ -0,0 +1,17 @@
+name: desktop
+x: 77
+y : 745
+width: 28
+height: 12
+digits:
+      :hours:
+      :minute_tens:
+      :minute_ones:
+      - 77
+      - 8
+      :second_tens:
+      - 88
+      - 8
+      :second_ones:
+      - 96
+      - 8

data/zamples/players/youtube/full_screened_1152x864.yml

@@ -0,0 +1,17 @@
+name: desktop
+x: 85
+y : 839
+width: 31
+height: 17
+digits:
+      :hours:
+      :minute_tens:
+      :minute_ones:
+      - 86
+      - 11
+      :second_tens:
+      - 99
+      - 9
+      :second_ones:
+      - 108
+      - 9 

data/zamples/players/youtube/full_screened_1680x1050.yml

@@ -0,0 +1,17 @@
+name: desktop
+x: 125
+y : -37
+width: 46
+height: 19
+digits:
+      :hours:
+      :minute_tens:
+      :minute_ones:
+      - 127
+      - 13
+      :second_tens:
+      - 145
+      - 12
+      :second_ones:
+      - 158
+      - 11   

data/zamples/scene_lists/gummy_bear_song_youtube.yml

@@ -0,0 +1,8 @@
+mutes:
+  # none
+blank_outs:
+  "0:01:02" : "0:01:06" # bum waggin'
+  
+title: The Gummy Bear Song - Long English Version (probably works with other languages')
+source: youtube
+url: http://www.youtube.com/watch?v=astISOttCQ0

data/zamples/scene_lists/nuki_song_youtube.yml

@@ -0,0 +1,9 @@
+mutes:
+  # none
+blank_outs:
+  # bum wigglin'
+  "00:46.5" : "00:48.5" 
+  "02:18.5" : "02:20"
+title: Nuki Song
+source: youtube
+url: http://www.youtube.com/watch?v=xd12hR68sWM

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 7
-  version: 0.7.7
+  - 9
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Roger Pack
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 -06:00
+date: 2010-08-18 00:00:00 -06:00
 default_executable: sensible-cinema
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,6 +133,7 @@ files:
 - ext/mkrf_conf.rb
 - gplv3.txt
 - lib/blanker.rb
+- lib/fake_blanker.rb
 - lib/file_chooser.rb
 - lib/keyboard_input.rb
 - lib/mouse.rb
@@ -165,12 +166,25 @@ files:
 - spec/images/vlc_6.bmp
 - spec/images/vlc_9.bmp
 - spec/images/vlc_colon.bmp
+- spec/images/youtube_0.bmp
+- spec/images/youtube_1.bmp
+- spec/images/youtube_2_0.bmp
+- spec/images/youtube_2_5.bmp
+- spec/images/youtube_2_6.bmp
+- spec/images/youtube_3_0.bmp
+- spec/images/youtube_4.bmp
+- spec/images/youtube_4_0.bmp
+- spec/images/youtube_5.bmp
+- spec/images/youtube_6.bmp
+- spec/images/youtube_small_0.bmp
+- spec/images/youtube_small_2.bmp
+- spec/images/youtube_small_2_0.bmp
+- spec/images/youtube_small_4.bmp
 - spec/keyboard_input.spec.rb
 - spec/mouse.spec.rb
 - spec/mouse_forever.rb
 - spec/muter.spec.rb
 - spec/ocr.spec.rb
-- spec/open.bat
 - spec/overlayer.spec.rb
 - spec/screen_tracker.spec.rb
 - spec/silence.wav
@@ -199,17 +213,21 @@ files:
 - vendor/imagemagick/msvcr90.dll
 - vendor/imagemagick/vcomp90.dll
 - zamples/players/how_to_create_a_new_player_description.txt
-- zamples/players/sample_snapshots/utube.JPG
-- zamples/players/sample_snapshots/youtube full screen big screen.jpg
-- zamples/players/total_length_over_an_hour/hulu_full_screened.yml
-- zamples/players/total_length_over_an_hour/vlc_full_screened.yml
-- zamples/players/total_length_over_an_hour/vlc_windowed.yml
-- zamples/players/total_length_under_an_hour/vlc_non_full_screened.yml
-- zamples/scene_lists/categories.yml
+- zamples/players/hulu/total_length_over_an_hour.yml
+- zamples/players/vlc/full_screened_total_length_over_an_hour.yml
+- zamples/players/vlc/non_full_screened_total_length_under_an_hour.yml
+- zamples/players/vlc/vlc_windows_total_length_over_an_hour.yml
+- zamples/players/youtube/full_screened_1024x768.yml
+- zamples/players/youtube/full_screened_1152x864.yml
+- zamples/players/youtube/full_screened_1680x1050.yml
+- zamples/players/youtube/note_these_assume_less_than_10_minutes_length.txt
+- zamples/scene_lists/category descriptions.yml
 - zamples/scene_lists/disney_cars.yml
 - zamples/scene_lists/example_scene_list.yml
+- zamples/scene_lists/gummy_bear_song_youtube.yml
 - zamples/scene_lists/happy_feet_dvd.yml
 - zamples/scene_lists/labyrinth.yml
+- zamples/scene_lists/nuki_song_youtube.yml
 - zamples/scene_lists/star_trek_generations_hulu.yml
 has_rdoc: true
 homepage: http://github.com/rdp

data/spec/open.bat

@@ -1 +0,0 @@
-"/program files/VideoLan/VLC/vlc.exe" silence.wav