sensible-cinema 0.7.1 → 0.7.2

data/README

@@ -40,7 +40,7 @@ Next install the gem by either opening up the command window or hitting windows+
        C:\> jruby -S gem install sensible-cinema 
 
   it's jruby only currently (since jruby allows for proper thread concurrency, has an easy GUI, and feels actually sane on windows).
-  It could theoretically be ported to MRI 1.9.x, if anybody wanted to do so.
+  It could theoretically be ported to MRI 1.9.2, if anybody wanted to do so.
   Also if anybody would be interested in porting this to Linux I'd be happy to collaborate.
   
 You can test that it's installed by running it (see above) and selecting the "example_scene_list.yml", and 
@@ -48,9 +48,9 @@ choosing the hulu player.
 
 It will proceed do a few "demo" mutes and blank outs.
 
-== How to use ==
+== How to Program ==
 
-To use it, first watch an DVD/online movie you'd like to create a scene-list for.  
+To program sensible-cinema to play what you'd like, first "preview" the on-computer movie you'd like to create a scene-list for.  
 As questionable scenes occur, jot down their start and end times somewhere.
 Then create an Edit Decision List (EDL) file that looks like this:
 
@@ -95,13 +95,17 @@ A. Not yet. Well maybe.  Currently you'll either need to attach your computer to
 Q. What movies are available to watch online?
 
 A. Not many are available free (hulu, youtube have a few), but Netflix has quite a few.  Plus you can watch your DVD's
-   on your computer monitor.
+   on your computer monitor, or rent or borrow them.
 
 Q. Why does my mouse bounce up and down while this thing is playing?
 
 A. This enables you to keep your on screen tracker visible, which allows sensible-cinema to track where you're at.
    Message me if this bugs you too much and we'll see what we can do for it.
 
+Q. Why does it seem really laggy at screen detection at the beginning?
+
+A. It takes it awhile to warm up.  Ping me if you want this fixed.
+
 == Thanks ==
 
 Thanks to Jarmo for the win32-screenshot gem, and the mini_magick gem authors, jruby guys, etc.  

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/ocr.rb

@@ -2,12 +2,11 @@ im_path = File.expand_path(File.dirname(__FILE__) + "/../vendor/imagemagick") #
 ENV['PATH'] = im_path + ';' + ENV['PATH']
 
 require 'mini_magick'
-require 'open3'
 
 # 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:/ ")
+  GOCR = File.expand_path(File.dirname(__FILE__) + "/../vendor/gocr048.exe -C 0-9:/S ")
   
   CACHE = {}
   
@@ -15,31 +14,26 @@ module OCR
   def identify_digit memory_bitmap, options = {}
     if CACHE[memory_bitmap]
       return CACHE[memory_bitmap]
-    else
     end
-    might_be_colon = options[:might_be_colon]
-    should_invert = options[:should_invert]
-    if might_be_colon
+    if options[:might_be_colon]
       # do processing in-line <sigh>
       total = (memory_bitmap.scan /\x00{5}+/).length
       if total >= 3 # really should be 4 for VLC
-        # it had some dots...must have been a colon!
+        # it had some darkness...therefore have been a colon!
+        CACHE[memory_bitmap] = ":"
+        return ":"
       end
-      CACHE[memory_bitmap] = ":"
-      return ":"
     end
     image = MiniMagick::Image.from_blob(memory_bitmap)
     image.format(:pnm) # expensive, requires convert.exe in path...
-    if should_invert # mogrify calls it negate...
+    if options[:should_invert] 
+      # mogrify calls it negate...
       image.negate 
     end
     for level in [130, 100] # 100 for hulu...
-      input, output, error, thread_if_on_19 = Open3.popen3 GOCR + " -l #{level} -"
-      input.write image.to_blob
-      input.close
-      a = output.read
-      output.close
+      a = `#{GOCR} -l #{level} #{image.path} 2>NUL`
       a.strip!
+      a = '3' if a == 'S' # sigh
       if a =~ /[0-9]/
         a = a.to_i
         CACHE[memory_bitmap] = a

data/spec/ocr.spec.orb

@@ -16,6 +16,9 @@ describe OCR do
       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
       end
     end
@@ -23,6 +26,7 @@ describe OCR do
   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 == ":"
   end
   

data/spec/overlayer.spec.rb

@@ -1,3 +1,9 @@
+# avoid full loading if testing impossible
+if RUBY_VERSION < '1.9.2' && RUBY_PLATFORM !~ /java/
+  puts 'not compatible to MRI < 1.9.2'
+  exit 0 # this isn't a real error...
+end
+
 require File.expand_path(File.dirname(__FILE__) + '/common')
 require_relative '../lib/overlayer'
 
@@ -128,7 +134,7 @@ describe OverLayer do
   end
 
   it 'should have key list output on screen' do
-    @o.status.should include("MmSs")
+    @o.status.should include("r,d,v,q to quit")
   end
 
   it 'should accept h for console help'

data/spec/screen_tracker.spec.rb

@@ -34,7 +34,7 @@ describe ScreenTracker do
     it "should loop if unable to find the right window" do
       proc {
         Timeout::timeout(1) do
-          ScreenTracker.new("unknown window",10,10,20,20)
+          ScreenTracker.new("this is supposed to be not running",10,10,20,20)
         end
       }.should raise_error(Timeout::Error)
     end
@@ -154,12 +154,10 @@ describe ScreenTracker do
       context "using OCR" do
 
         before do
-          # vlc_non_full_screened_under_an_hour.yml
-          @a = ScreenTracker.new("silence.wav", -111, -16, 86, 13,
-          {:hours => nil, :minute_tens => [-90,7], :minute_ones => [-82, 7], :second_tens => [-72, 7], :second_ones => [-66, 7]} )
+          @a = ScreenTracker.new_from_yaml File.read("../zamples/players/vlc_non_full_screened_and_total_length_under_an_hour.yml"), nil
         end
 
-        it "should be able to snapshot digits" do
+        it "should be able to disk dump snapshotted digits" do
           @a.dump_bmp
           Pathname.new('minute_tens.bmp').should exist
           Pathname.new('minute_tens.bmp').size.should be > 0

data/zamples/scene_lists/example_scene_list.yml

@@ -3,16 +3,17 @@ source: Hulu
 version: 0.4.8
 mutes:
   2.0 : 3.0 # comments can go after the # on each line
-  4.0 : 5.0
-  9.0 : 13.0
+  4.0 : 5.0 # mute from second 4 to second 5
+  9.0 : 13.0 # mute from second 9 to second 13
   44.0 : 50.0 # mute for 6 seconds starting at second 44
-  # This next actually means one minute to one minute one second
-  "1:00.0" : "1:01.0"
-  # one hour one minute and a half second to one hour one minute and 1.5s
-  "01:01:00.5" : "01:01:01.5"
-  # NB that if you want to use minutes with decimals, you'll need to put them in quotes
-  # 01:01:01.05 does not work
+  # This next means mute from one minute to one minute one second
+  1:00 : 1:01
+  10:01 : 10:02 # mute from ten minutes, one second to ten minutes, 2 seconds
+  # if you use decimals, you'll have to put them in quotes
+  # 01:01:01.05 (for one hour, one minute, one second and a half) does not work
   # "01:01:01.05" does
+  "01:01:00.5" : "01:01:01.5" # mute from one hour one minute and a half second to one hour one minute and 1.5s
+  
 blank_outs:
-  "00:15" : "00:18"
-  "01:01" : "01:02.0"  # blank from one minute one second to one minute two seconds
+  "00:15" : "00:18" # blank from second 15 to 18
+  01:01 : "01:02.0" # blank from one minute one second to one minute two seconds, etc.

data/zamples/scene_lists/star_trek_generations.yml

@@ -1,7 +1,8 @@
 source: "hulu"
 mutes:
-  08:55 : "08:56.0" # ??
-  10:50 : "10:51" # durn
-  11:23 : "11:24" # what the he...
-  "01:15:39.5" : "01:15:41.5" # Data "oh sh...."
-  # several onyx at beginning
+  # these aren't actually accurate yet, except for Data's one
+  08:55 : 08:56 # what the he...
+  10:50 : 10:51 # durn
+  11:23 : "11:24" # ?
+  "01:15:39.5" : "01:15:41.5" # Data "oh s...."
+  # two onyx at beginning

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 7
-    - 1
-  version: 0.7.1
+    - 2
+  version: 0.7.2
 platform: ruby
 authors: 
   - Roger Pack