sensible-cinema 0.14.3 → 0.14.4

data/ChangeLog

@@ -1,3 +1,7 @@
+== 0.14.4 ==
+
+Add a progress bar.
+
 == 0.14.{2,3} ==
 
 Minor changes.

data/Rakefile

@@ -8,13 +8,12 @@ Jeweler::Tasks.new do |s|
     s.authors = ["Roger Pack"]
     s.add_dependency 'sane', '>= 0.22.0'
     s.add_dependency 'rdp-win32screenshot', '>= 0.0.7.3'
-    s.add_dependency 'mini_magick' # for ocr...
+    s.add_dependency 'mini_magick', '>= 3.1' # for ocr...
     s.add_dependency 'jruby-win32ole'
     s.add_dependency 'rdp-ruby-wmi'
-    s.add_dependency 'ffi'
+    s.add_dependency 'ffi' # mouse, etc.
     s.add_development_dependency 'rspec' # prefer rspec 2 I guess...
     s.add_development_dependency 'jeweler'
-    s.add_development_dependency 'rdp-rmagick'
     s.add_development_dependency 'hitimes' # now jruby compat. yea!
     s.extensions = ["ext/mkrf_conf.rb"]
 end

data/TODO

@@ -1,24 +1,21 @@
 == medium ==
 
-
 == probably next up+low prio ==
 
   better timing for the saver-er...
     match better
     merge better
   speed up unit tests
-  add a progress bar for encoding
 
 == slightly lower than that even ==
 
-auto-select EDL
-
 == slightly lower than that ==
 
+  auto-select EDL
+
   can parse IMDB (require they put in the URL by hand fer now)
     add stuffs to imdb hmmm
     IMDB easy mapping
-  screencast of things helpful (use, creation...).
   unit test the GUI
   can have collaborators re-selling EL's
     good license for their stuff like "public domain" or what not :P
@@ -36,7 +33,8 @@ auto-select EDL
   partner (Jon, Karlie if interested...give beta)
   survey/beta release
   a certified clean list (?)
-== DVD backlog ==
+
+== DVD backlog (unordered) ==
 
 some way to choose between x,y,z when auto-select sees several
 careful phrasing "if you can't afford it..."
@@ -49,8 +47,6 @@ the authors of the program might not be liable for damages.  We don't feel disho
 we own the DVD and have it with us when we watch the edited version.
 blu-ray support somehow (real-time? rip?)
 
-prototypes of the experimental stuff.
-
 some type of one click installer that can setup the registry...
 auto-assignment of EDL's to media:
   auto-play option for DVD's (auto-start?)
@@ -62,6 +58,15 @@ instructions on how to do their own (private) or do one and submit it (public),
 
 == random 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). ==
 
+screencast of things helpful (use, creation...).
+tune up the levels...
+prototypes of the experimental stuff (overlay, track time while recording -> map file, specifiable levels, more?)
+
+the overlayer "freeze frames" in vista
+
+0:01:01.9 next will be at 0:01:02.0s (r [or q to quit]):
+0:01:04.0 next will be at 0:01:06.5s (blanked) (r [or q to quit]): "warning--unable to track screen time for some reason" # *of course you can't track it now!*
+
 byu.tv descriptor
 youtube non full screen: work with all browsers
 easier "here's how on the command line, BTW"

data/VERSION

@@ -1 +1 @@
-0.14.3
+0.14.4

data/bin/sensible-cinema

@@ -25,8 +25,9 @@ module SensibleSwing
      jlabel.set_bounds(44,44,136,14)
      panel.add jlabel
      b = JButton.new( "Play Hulu, Youtube, or a DVD (Tracking)" ).on_clicked {
+      Thread.new { go_sc } # needs to be in its own thread becuase it blocks,
+      # so "this thread" is the uni-swing thread, gets blocked, and the overlayer can't repaint
       self.close
-      go_sc
      }
      button_width = 230
      b.set_bounds(44,120,button_width,23)
@@ -57,8 +58,12 @@ module SensibleSwing
       eval File.read(__FILE__), nil, __FILE__
       p 're-evaled it'
      }
-     reload.set_bounds(44,280,200,23)
+     reload.set_bounds(44,300,200,23)
      panel.add reload if ARGV.find{|a| a == '--test'}
+     @p = JProgressBar.new(0, 100)
+     @p.set_value 0
+     @p.set_bounds(44,280,button_width,23)
+     panel.add @p
      @buttons = [b,c,d,@exit]
     
    end
@@ -87,37 +92,45 @@ module SensibleSwing
       bat_file_or_xspf = VLCProgrammer.convert_to_full_xspf(descriptors, save_to, drive, dvd_title_track)
       temp_dir = Dir.tmpdir
       if should_save_file
-        temp_file = temp_dir + '/' + 'convert_it.bat'
-        File.write(temp_file, bat_file_or_xspf)
         # allow our popups to still be serviced while it is running
         Thread.new {
-          run_copy_commands temp_file, save_to
+          run_copy_commands bat_file_or_xspf, save_to
         }
       else
         temp_file = temp_dir + '/' + 'vlc.xspf'
         File.write(temp_file, bat_file_or_xspf)
         command = "vlc \"#{temp_file.to_filename}\" vlc://quit"
         p 'running', command
-        system(c) # blocks the current window while running...
+        system(commands) # blocks the current window while running...
       end
       # TODO warn if they don't have VLC installed, with instructions...
       # LODO warn if they will overwrite a file in the end
    end
   
-   def run_copy_commands temp_file, save_to
+   def run_copy_commands batch_file, save_to
       popup = ModeLessDialog.new("Running the encoding in the background...\n" +
         "This could take quite awhile, and will prompt you when it is done.\n" +
         "It may also cause small popup ballon dialogs to appear.")
-      p 'running', temp_file, 'to ' + save_to + '.ps'
+      p 'saving to ' +  save_to + '.ps'
       @buttons.each{|b| b.set_enabled false}
-      success = system(temp_file) unless ARGV.find{|a| a == '--test'} 
+      success = true
+      lines = batch_file.lines.to_a
+      total_size = lines.length.to_f
+      lines.each_with_index{|l, idx|
+        if success
+          p 'running', l, 'percent', idx/total_size
+          success = system(l) unless ARGV.find{|a| a == '--test'} # doesn't seem to cancel out early for some reason..
+          @p.set_value(idx/total_size*100)
+          sleep 1
+        end
+      }
+      @p.set_value(0)
       @buttons.each{|b| b.set_enabled true}
       popup.dispose
       if success
         JOptionPane.showMessageDialog(nil, " Done--you may now watch file #{save_to}.ps in VLC player", "Done!", JOptionPane::INFORMATION_MESSAGE)
         show_file = "explorer /e,/select,\"#{File.expand_path(save_to).to_filename}.ps\""
         system show_file
-        File.delete temp_file
         self.close
       else
         JOptionPane.showMessageDialog(nil, " Failed--please examine #{temp_file} and screen output and report back!", "Failed", JOptionPane::ERROR_MESSAGE)

data/bin/sensible-cinema-cli

@@ -10,10 +10,10 @@ for file in ['overlayer', 'keyboard_input', 'screen_tracker', 'mouse', 'file_cho
 end
 
 
-def go_sc(args=ARGV)
+def go_sc(args)
   
   $VERBOSE = 1 if args.delete('-v')
-  $TEST = 1 if args.delete('-t')  
+  $DEBUG = 1 if args.delete('-d')
   if args.delete('--clear-cache')
     OCR.clear_cache! 
     puts 'cleared cache'
@@ -96,12 +96,13 @@ def go_sc(args=ARGV)
       Blanker.shutdown # lodo move this and the 'q' key to within overlayer
       OCR.serialize_cache_to_disk
     }
-    key_input.handle_keystrokes_forever # when this method exits, we want to exit fully...
+    puts 'syntax from command line: ' + player_description + ' ' + scene_list
+    key_input.handle_keystrokes_forever # blocking...
     
   end
 end
 
 if __FILE__ == $0
  puts 'Welcome to Sensible Cinema...'
- go_sc
+ go_sc ARGV
 end

data/lib/blanker.rb

@@ -13,10 +13,10 @@ else
       @fr.default_close_operation = JFrame::EXIT_ON_CLOSE
       @fr.set_size(2000, 2000) # ltodo better size ?
       cp = @fr.getContentPane
-      cp.setBackground(java.awt.Color.black);
-      
+      cp.setBackground(java.awt.Color.black);      
       
       @label = JLabel.new
+      @label.set_text 'blanked'
       @fr.add(@label)
       @label.setForeground(java.awt.Color.white);
       @label.repaint
@@ -25,24 +25,27 @@ else
       @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...
+      @fr.repaint
       unblank_full_screen! # and hide it to start
     end
 
     def self.blank_full_screen! seconds
+      # 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)
+      @fr.repaint # early paint, just in case that helps it pop up faster :)
       if seconds
         @label.set_text "   #{seconds} s" 
       else
         @label.set_text "  Blank section"
       end
-      # 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...
+      # move it off screen...
       @fr.set_location(-2100, -2100)
+      @fr.repaint 0
     end
     
     def self.shutdown

data/lib/ocr.rb

@@ -1,10 +1,10 @@
 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']
+#ENV['PATH'] = im_path + ';' + ENV['PATH']
 
 # 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/gocr049.exe -C 0-9:/ ")
   
   CACHE = {}
   
@@ -26,7 +26,7 @@ module OCR
         return ":"
       end
     end
-    image = MiniMagick::Image.from_blob(memory_bitmap)
+    image = MiniMagick::Image.read(memory_bitmap)
     # any operation on image is expensive, requires convert.exe in path...
     if options[:should_invert] 
       # hulu wants negate
@@ -36,15 +36,17 @@ module OCR
     end
 
     image.format(:pnm)
+    # I think it's VLC full screen that wants sharpening...
     image.sharpen(2) if options[:sharpen] # hulu does *not* want sharpen, though I haven't checked it too closely...
 
     previous = nil
     p options if $DEBUG
     raise 'you must pass in OCR levels in the player description' unless options[:levels]
     for level in options[:levels]
-      a = `#{GOCR} -l #{level} #{image.path} 2>NUL`
+      command = "#{GOCR} -l #{level} #{image.path} 2>NUL"
+      a = `#{command}`
       if a =~ /[0-9]/
-        # it can be like "_1_\n"
+        # it might be funky like "_1_\n"
         a.strip!
         a.gsub!('_', '')
         a = a.to_i
@@ -74,8 +76,7 @@ module OCR
   def unserialize_cache_from_disk  
     if File.exist? CACHE_FILE
       CACHE.merge!(Marshal.load(File.binread(CACHE_FILE)))
-    end
-    
+    end    
   end
   
   extend self

data/lib/overlayer.rb

@@ -192,7 +192,7 @@ class OverLayer
       end
     end
     check_reload_yaml
-    time + state + "(r [or q to quit]): "
+    time + state + "(r [or ctrl+c to quit]): "
   end
 
   def keyboard_input char

data/lib/screen_tracker.rb

@@ -39,7 +39,7 @@ class ScreenTracker
       raise 'poor height or wrong window' 
     end
     @digits = digits
-    @displayed_warning = false
+    @previously_displayed_warning = false
     @dump_digit_count = 1
     pps 'using x',@x, 'from x', x, 'y', @y, 'from y', y,'x2',@x2,'y2',@y2,'digits', @digits if $VERBOSE
   end
@@ -82,18 +82,20 @@ class ScreenTracker
   def dump_bmp filename = 'dump.bmp'
     File.binwrite filename, get_bmp
     File.binwrite 'all.' + filename, get_full_bmp
-    dump_digits get_digits_as_bitmaps if @digits
+    dump_digits(get_digits_as_bitmaps, 'dump_bmp') if @digits
   end
   
-  def dump_digits digits
-      for type, bitmap in get_digits_as_bitmaps
-        File.binwrite type.to_s + '.' + @dump_digit_count.to_s + '.bmp', bitmap
-      end
-      print 'debug dumped digits that Im about to parse:', @dump_digit_count, "\n"
-      @dump_digit_count += 1
+  def dump_digits digits, message
+    p "#{message} dumping digits to dump no: #{@dump_digit_count} #{Time.now.to_f}"
+    for type, bitmap in digits
+      File.binwrite type.to_s + '.' + @dump_digit_count.to_s + '.bmp', bitmap    
+    end
+    File.binwrite @dump_digit_count.to_s + '.mrsh', Marshal.dump(digits)
+    @dump_digit_count += 1
   end
   
   DIGIT_TYPES = [:hours, :minute_tens, :minute_ones, :second_tens, :second_ones]
+  
   # returns like {:hours => nil, :minutes_tens => raw_bmp, ...
   def get_digits_as_bitmaps
     # @digits are like {:hours => [100,5], :minute_tens => [x, width], :minute_ones, :second_tens, :second_ones}
@@ -115,7 +117,6 @@ class ScreenTracker
     [@x,@y,@x2,@y2]
   end
   
-  # split out for unit testing purposes
   def identify_digit bitmap
     OCR.identify_digit(bitmap, @digits)
   end
@@ -132,66 +133,76 @@ class ScreenTracker
       if current != original
         if @digits
           got = attempt_to_get_time_from_screen time_before_scan
-          if @displayed_warning && got
+          if @previously_displayed_warning && got
             # reassure user :)
             p 'tracking it successfully again' 
-            @displayed_warning = false
+            @previously_displayed_warning = false
           end
           return got
         else
-          puts 'screen time change only detected... [unexpected]'
+          puts 'screen time change only detected... [unexpected]' # unit tests do this still
           return
         end
       else
         # no screen change detected ...
         sleep 0.02
-        if(Time.now - time_since_last_screen_change > 2)
+        if(Time.now - time_since_last_screen_change > 2.0)
           # display a warning
-          p 'warning--unable to track screen time for some reason'
-          @displayed_warning = true
-          time_since_last_screen_change = Time.now        
-          # also reget window hwnd, just in case that's the problem...(can be with VLC)
+          p 'warning--unable to track screen time for some reason [perhaps screen obscured or it\'s not playing yet?]'
+          @previously_displayed_warning = true
+          time_since_last_screen_change = Time.now
+          # also reget window hwnd, just in case that's the problem...(can be with VLC moving from title to title)
           get_hwnd
         end
       end
     }
   end
   
-  def attempt_to_get_time_from_screen start
+  def attempt_to_get_time_from_screen start_time
     out = {}
+    start = get_digits_as_bitmaps
+    dump_digits(start, 'started_as')
     # force it to have two matching snapshots in a row, to avoid race conditions grabbing the digits...
-    previous = nil # 0.08s [!] not too accurate...ltodo
-    until previous == (temp = get_digits_as_bitmaps)
-      previous = temp
-      sleep 0.05 # allow youtube to update (sigh) lodo just for utube
+    previous = nil 
+    current = start
+    until previous == (current)
+      previous = current
+      sleep 0.25 # allow youtube to update (sigh) lodo just for utube
+      current = get_digits_as_bitmaps
+      p previous == current
+      dump_digits(current, 'current is')
       # lodo it should probably poll *before* calling this, not here...maybe?
     end
-    assert previous == temp
-    digits = temp
+    assert previous == current
+    digits = current = previous
     
-    dump_digits(digits) if $DEBUG            
+    if $DEBUG         
+      dump_digits(digits, 'using digits')
+    end
     DIGIT_TYPES.each{|type|
       if digits[type]
         digit = identify_digit(digits[type])
         unless digit
-          if $DEBUG || $VERBOSE
+          bitmap = digits[type]
+          # unable to identify a digit?
+          if $DEBUG || $VERBOSE && (type != :hours)
             @a ||= 1
             @a += 1
             @already_wrote ||= {}
-            unless @already_wrote[digits[type]]
-              p 'unable to identify capture!' + type.to_s + @a.to_s + ' capture no:' + @dump_digit_count.to_s
-              File.binwrite("bad_digit#{@a}#{type}.bmp", digits[type]) unless type == :hours
-              @already_wrote[digits[type]] = true
+            unless @already_wrote[bitmap]
+              p 'unable to identify capture!' + type.to_s + @a.to_s + ' dump:' + @dump_digit_count.to_s
+              File.binwrite("bad_digit#{@a}#{type}.bmp", bitmap)
+              @already_wrote[bitmap] = true
             end
           end
           if type == :hours
             digit = 0 # this one can fail and that's ok in VLC bottom right
           else
-            # early failure return
-            return
+            # early (failure) return
+            return nil
           end
         else
-          p " got digit #{type} as #{digit} which was captured as #{@dump_digit_count} " if $DEBUG
+          p " got digit #{type} OCR as #{digit} which was captured to dump #{@dump_digit_count - 1} #{Time.now_f}" if $DEBUG
         end
         out[type] = digit
       else
@@ -200,8 +211,8 @@ class ScreenTracker
       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
+    puts '', 'got new screen time ' + out + " tracking delta:" + (Time.now - start_time).to_s if $VERBOSE
+    return out, Time.now-start_time
   end
   
   def process_forever_in_thread