sensible-cinema 0.25.1 → 0.25.2

data/bin/sensible-cinema-dependencies.rb

@@ -0,0 +1,15 @@
+require 'java'
+
+module SensibleSwing
+  
+  class MainWindow < javax.swing.JFrame
+    def self.download full_url, to_here
+      require 'open-uri'
+      require 'openssl'
+      eval("OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE")
+      writeOut = open(to_here, "wb")
+      writeOut.write(open(full_url).read)
+      writeOut.close
+    end
+  end
+end

data/change_log_with_feature_list.txt

@@ -1,3 +1,24 @@
+== 0.25.2 ==
+
+It tracks better now if the current OCR tracked player is paused, reverting back to its current timestamp.
+Added ability to "auto-select" based on the url of currently open browsers, the right EDL.
+Added ability to "auto-download" an EDL based on the current movie playing in the browser.  Video also shows
+retraining when window changes.
+Added ability to "auto-select" player based on what is running, browser windows up, crossed with movies running.
+Added the above, without file download (earlier commit could do them both however).
+Note that this also means that it can scan over several player descriptions to "pick the right one" automatically.
+
+Added a demo of VLC doing "transparent" and "opaque" overlays on another running image, based on timing.
+NB That I already have shown a demo of adjusting volume and/or overlaying new audio on top of existing
+media (a la rifftrax) previously.
+Added demo of merging two video clips, with or without opacity/user configurable locations/dynamic ok too.
+
+Added some demo commits showing how it could assign new/improved/user configurable/
+ratings to EDL's and/or pieces of them.
+
+Added ability to have one EDL "refer" to another..allowing multiple DVD's/dvd-id's to re-utilize the same EDL,
+and even add more settings of their own, if desired.
+
 == 0.25.1 ==
 
 Added ability to dynamically "find" which window contained the playing movie, and capture it, from desktop, 
@@ -5,6 +26,8 @@ for upscaling or capturing.
 
 added ability to "minimize" and "unminimize" a movie player window in order to "simulate" blanking.
 
+possible speedup for slower systems without upconversion
+
 == 0.25.0 ==
 
 Created my own directshow screen capture filter to go along with netflix instant upconvert, 
@@ -153,7 +176,7 @@ Also fixed up some unit tests.
 
 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)
+Subtitle parser/scanner: now it can scan for "complete" and "incomplete" 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

data/developer_how_to_contribute_to_the_project.txt

@@ -5,6 +5,7 @@ http://rogerdpack.t28.net/sensible-cinema/releases/dvd_isos has it and a few oth
 On windows daemon tools helps there, or "magic ISO" or the like.
 
 Or you could alternatively burn a copy of big buck bunny to DVD, then use that to test it against (a slightly more cross platform approach).
+Or http://rogerdpack.t28.net/sensible-cinema/releases/dvd_isos has an extra copy of the file and you can just use the "file based" options.
 
 Then rip it and use the output.
 

data/lib/auto_window_finder.rb

@@ -0,0 +1,41 @@
+require 'rautomation'
+require_relative 'edl_parser'
+
+class AutoWindowFinder
+  
+  # when they select a file, it contains a...url say...
+  # so look for that url, with "this" child window class [?]
+  # so basically, if a browser window is "open" to such and such a url
+  # and it is mentioned in a file
+  # it should find it
+  
+  def self.search_for_single_url_match regexp = /Chrome/
+    EdlParser.find_single_edit_list_matching(true) {|parsed|
+      if url = parsed["url"]
+        window = RAutomation::Window.new(:title => regexp)
+        if window.exist? 
+          if window.text =~ Regexp.new(Regexp.escape url.gsub(/http(s|):\/\//, ""))
+            p 'got match' + url
+            true
+          else
+            false
+          end
+        end
+      end
+    }
+  end
+  
+  def self.search_for_player_and_url_match player_root_dir
+    for filename in Dir[player_root_dir + '/*/*.txt']
+      settings = YAML.load_file filename
+      if regex = settings["window_title"] # assume regex :)
+        p 'searching for player regex', regex
+        if search_for_single_url_match regex # applies the regex X url
+          return filename
+        end
+      end
+    end
+    nil
+  end
+  
+end

data/lib/blanker.rb

@@ -48,7 +48,7 @@ else
     end
     
     @@use_mouse = false
-    @@use_foreground_window_minimize = true
+    @@use_foreground_window_minimize = false
     if @@use_foreground_window_minimize
       require 'win32/screenshot'
       SW_MINIMIZE = 6

data/lib/edl_parser.rb

@@ -15,18 +15,31 @@ This file is part of Sensible Cinema.
     You should have received a copy of the GNU General Public License
     along with Sensible Cinema.  If not, see <http://www.gnu.org/licenses/>.
 =end
+require 'sane'
 class EdlParser
 
-  # returns {"mutes" => [["00:00", "00:00", string1, string2], ...], "blank_outs" -> [...]}  
+  EDL_DIR = File.expand_path(__DIR__  + "/../zamples/edit_decision_lists/dvds")
+  
+  if File::ALT_SEPARATOR
+    EDL_DIR.gsub! File::SEPARATOR, File::ALT_SEPARATOR # to_filename...
+  end
+
+  # returns {"mutes" => [["00:00", "00:00", string1, string2, ...], ...], "blank_outs" -> [...], "url" => ...}  
   def self.parse_file filename
-    parse_string File.read(filename), filename, [] # LODO categories stuff out...
+    output = parse_string File.read(filename), filename, []
+    if relative = output["take_from_relative_file"]
+      new_filename = File.dirname(filename) + '/' + relative
+      new_input = parse_file new_filename
+      output.merge! new_input
+    end
+    output
   end
   
   private
   
-  # better eye-ball these before letting people run them, eh? XXXX
+  # better eye-ball these before letting people run them, eh? TODO
   # but I couldn't think of any other way to parse the files tho
-  def self.parse_string string, filename, ok_categories_array
+  def self.parse_string string, filename, ok_categories_array = []
     string = '{' + string + "\n}"
     if filename
      raw = eval(string, binding, filename)
@@ -187,7 +200,45 @@ class EdlParser
       out << "%06.3f" % seconds # man that is tricky...
     end
   end
-
+  
+  def self.all_edl_files_parsed use_all_not_just_dvds
+    dir = EDL_DIR
+    dir += "/.." if use_all_not_just_dvds
+    Dir[dir + '/**/*.txt'].map{|filename|
+        begin
+          parsed = parse_file(filename)
+          [filename, parsed]
+        rescue SyntaxError => e
+          # ignore poorly formed edit lists for the auto choose phase...
+          p 'warning, unable to parse a file:' + filename + " " + e.to_s
+          nil
+        end
+     }.compact
+  end
+  
+  # returns single matching filename
+  def self.find_single_edit_list_matching use_all = false
+    matching = all_edl_files_parsed(use_all).map{|filename, parsed|
+      yield(parsed) ? filename : nil
+    }.compact
+    if matching.length == 1
+      file = matching[0]
+      p "selecting the one only matching EDL: #{file}"
+      file
+    elsif matching.length > 1
+      p "found multiple matches for media? #{matching.inspect}"
+      nil
+    else
+      nil
+    end
+  end
+  
+  def self.single_edit_list_matches_dvd dvd_id
+    return nil unless dvd_id
+    find_single_edit_list_matching {|parsed|
+      parsed["disk_unique_id"] == dvd_id
+    }
+  end
 
   
 end
@@ -207,4 +258,4 @@ if $0 == __FILE__
   require 'rubygems'
   require 'sane'
   p EdlParser.parse_file(*ARGV)
-end
+end

data/lib/screen_tracker.rb

@@ -78,6 +78,7 @@ class ScreenTracker
       @hwnd = hwnd = Win32::Screenshot::BitmapMaker.desktop_window
       return
     else
+      raise if OS.mac?
       @hwnd = Win32::Screenshot::BitmapMaker.hwnd(@name_or_regex, @use_class_name)
     end
 
@@ -171,11 +172,11 @@ class ScreenTracker
     time_since_last_screen_change = Time.now
     loop {
       # save away the current time to try and be most accurate...
-      time_before_scan = Time.now
+      time_before_current_scan = Time.now
       current = get_bmp
       if current != original
         if @digits
-          got = attempt_to_get_time_from_screen time_before_scan
+          got = attempt_to_get_time_from_screen time_before_current_scan
           if @previously_displayed_warning && got
             # reassure user :)
             p 'tracking it successfully again' 
@@ -183,22 +184,24 @@ class ScreenTracker
           end
           return got
         else
-          puts 'screen time change only detected... [unexpected]' # unit tests do this still
+          puts 'screen time change only detected... [unexpected]' # unit tests do this still <sigh>
           return
         end
       else
-        # no screen change detected ...
-        sleep 0.02
         if(Time.now - time_since_last_screen_change > 2.0)
-          # display a warning
-          p 'warning--unable to track screen time for some reason [perhaps screen obscured or it\'s not playing yet, or paused?] ' + @hwnd.to_s
-          p Win32::Screenshot::Util.dimensions_for(hwnd)
-          @previously_displayed_warning = true
+          got_implies_able_to_still_ocr = attempt_to_get_time_from_screen time_before_current_scan
+          if got_implies_able_to_still_ocr
+            return got_implies_able_to_still_ocr
+          else
+            p 'warning--unable to track screen time for some reason [perhaps screen obscured or it\'s not playing yet?] ' + @hwnd.to_s
+            @previously_displayed_warning = true
+            # also reget window hwnd, just in case that's the problem...(can be with VLC moving from title to title)
+            get_hwnd_loop_forever
+          end
           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_loop_forever
         end
       end
+      sleep 0.02
     }
   end
   
@@ -262,4 +265,4 @@ class ScreenTracker
     }
   end
   
-end
+end

data/lib/subtitle_profanity_finder.rb

@@ -130,19 +130,19 @@ module SubtitleProfanityFinder
     bad_profanities.merge! extra_profanity_hash # LODO make easier to use...
 
     semi_bad_profanities = {}
-    ['bloody', 'moron', 'idiot', 'sex', 'genital', 'make love', 'suck', 
+    ['bloody', 'moron', 'breast', 'idiot', 
+      'sex', 'genital', 'make love', 
       'making love', 'love mak', 
-      'breast', 
+      'dumb', 'suck', 
       'piss'].each{|name|
       # butter?
       semi_bad_profanities[name] = name
     }
     semi_bad_profanities['crap'] = ['crap', :full_word]
-    semi_bad_profanities['crap'] = ['butt', :full_word]
+    semi_bad_profanities['butt'] = ['butt', :full_word]
 
     all_profanity_combinationss = [convert_to_regexps(bad_profanities), convert_to_regexps(semi_bad_profanities)]
     
-    
     output = ''
     for all_profanity_combinations in all_profanity_combinationss
       output += "\n"

data/play_with_inserted_scene.bat

@@ -0,0 +1,8 @@
+call vlc dvd://d:\@2 --start-time=10 --stop-time=15 vlc://quit
+call vlc dvd://d:\@1 --start-time=10 --stop-time=15 vlc://quit
+call vlc dvd://d:\@2 --start-time=15 --stop-time=20 vlc://quit
+call vlc dvd://d:\@1 --start-time=10 --stop-time=15 vlc://quit
+call vlc dvd://d:\@2 --start-time=35 --stop-time=40 vlc://quit @rem should have been 20
+call vlc  g:\downloads\big_buck_bunny_480p_h264.mov.crdownload --stop-time=4 vlc://quit
+
+

data/play_with_overlay.bat

@@ -0,0 +1,24 @@
+call vlc --sub-filter "logo{file='transparent.png,256'}" dvd://d:\@2 --stop-time=56 --start-time=45 vlc://quit
+call vlc --sub-filter "logo{file='cone.png,256'}" dvd://d:\@2 --start-time=56 --stop-time=57 vlc://quit
+call vlc --sub-filter "logo{file='transparent.png,256'}" dvd://d:\@2 --start-time=57 --stop-time=65 vlc://quit
+call vlc --sub-filter "logo{file='cone.png,256'}" dvd://d:\@2 --start-time=65 --stop-time=74.5 vlc://quit
+call vlc dvd://d:\@2 --start-time=74.5 vlc://quit
+
+
+  "00:00:56.0" , "00:00:57.0", "violence", "knife stabbing",
+  "00:01:05.0" , "00:01:14.5", "violence", "stab through",
+
+
+
+
+
+@rem working: -> vlc --sub-filter "logo{file='cone.png,5000,128;transparent.png,2000,128;cone.png,10000,256'}" dvd://d:\@2 --stop-time=30
+@rem vlc --sub-filter "logo{file='cone.png,500000,128;transparent.png,1000,128'}" dvd://d:\@2 --stop-time=30
+
+@rem dvd://d:\@2  :start-time=10 :stop-time=20 dvd://d:\@2  :start-time=20 :stop-time=25 :sub-filter=logo{file=g:\video\sintel_ntsc\cone.png,transparency=128} dvd://d:\@2 :start-time=25 :stop-time=30 vlc://quit
+
+
+
+
+@rem vlc dvd://d:\@2 :start-time=70 :stop-time=75 :sub-filter=logo{file=g:\video\sintel_ntsc\cone.png,transparency=128} 
+ 

data/spec/auto_window_finder.spec.rb

@@ -0,0 +1,65 @@
+=begin
+Copyright 2010, Roger Pack 
+This file is part of Sensible Cinema.
+
+    Sensible Cinema is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Sensible Cinema is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Sensible Cinema.  If not, see <http://www.gnu.org/licenses/>.
+=end
+require File.dirname(__FILE__) + "/common"
+require_relative '../lib/auto_window_finder'
+
+describe AutoWindowFinder do
+
+  EdlParser::EDL_DIR.gsub!(/^.*$/, 'files/edls')
+  
+  context "a browser window is open" do
+    before do
+      fake_window = ''
+      def fake_window.exist?
+        true
+      end
+      def fake_window.text
+        "www.youtube.com/watch?v=xd12hR68sWM"
+      end
+      RAutomation::Window.stub!(:new).and_return(fake_window)
+    end
+    
+    context "it is mentioned in a file" do
+      
+      before do
+        out =  "files/edls/auto_url.txt"
+        File.write out, %!"url" => "http://www.youtube.com/watch?v=xd12hR68sWM"!
+      end
+      
+      it "should connect the two automagically" do
+        AutoWindowFinder.search_for_single_url_match().should == "files/edls/../edls/auto_url.txt"
+      end
+      
+      it "should search automatically iff the player specifies it to" # ?
+      
+      it "should be able to find with browser and url" do
+        FileUtils.mkdir_p 'temp/players'
+        File.write('temp/players/go.txt', "window_title: !ruby/regexp /Chrome/")
+        AutoWindowFinder.search_for_player_and_url_match('temp').should == "temp/players/go.txt"
+        File.write('temp/players/go.txt', "window_title: !ruby/regexp /asdf/")
+        RAutomation::Window.unstub!(:new)
+        AutoWindowFinder.search_for_player_and_url_match('temp').should be nil
+      end
+      
+    end
+  
+  
+  end
+   
+  
+end

data/spec/edl_parser.spec.rb

@@ -27,7 +27,7 @@ describe EdlParser do
   end
   
   it "should get mutes and blank_outs" do
-   string = File.read(__dir__ + "/../zamples/edit_decision_lists/old_not_yet_updated/example_edit_decision_list.txt")
+   string = File.read(__DIR__ + "/../zamples/edit_decision_lists/old_not_yet_updated/example_edit_decision_list.txt")
    expected = 
    {
     "mutes"=>[["00:00:01", "00:00:02"], 
@@ -68,7 +68,7 @@ describe EdlParser do
   end
   
   it "should parse a real file" do
-   E.parse_file(File.expand_path(__dir__) + "/../zamples/edit_decision_lists/dvds/bobs_big_plan.txt").should ==
+   E.parse_file(File.expand_path(__DIR__) + "/../zamples/edit_decision_lists/dvds/bobs_big_plan.txt").should ==
      {"title"=>"Bob's Big Plan", "dvd_title_track"=>1, "other notes"=>"could use more nit-picking of the song, as some parts seem all right in the end", "mutes"=>[["00:03.8", "01:03", "theme song is a bit raucous at times"], ["28:13.5", "29:40", "theme song again"], ["48:46", "49:08", "theme song again"]], "blank_outs"=>[]}
   end
   
@@ -98,10 +98,6 @@ describe EdlParser do
     proc {E.parse_string '"mutes"=>["0:33", "0:34"]', 'filename'}.should_not raise_error
   end
   
-  it "should be able to optionally ignore settings" do
-    E.parse_string('"mutes"=>["0:33", "0:34"]', 'filename', [], true)['mutes'].should == []
-  end
-  
   it "should sort exactly overlapping segments" do
     proc { go({"mutes"=>{105=>145}, "blank_outs"=>{105=>145}})}.should raise_error(SyntaxError)
     proc { go({"mutes"=>{105=>145}, "blank_outs"=>{110=>130}})}.should raise_error(SyntaxError)
@@ -170,11 +166,56 @@ describe EdlParser do
   
   it "should translate ints to english timestamps well" do
     english(60).should == "01:00"
-    english(60.1).should == "01:00.1"
+    english(60.1).should == "01:00.100"
     english(3600).should == "1:00:00"
     english(3599).should == "59:59"
     english(3660).should == "1:01:00"
-    english(3660 + 0.1).should == "1:01:00.1"
-  end
-  
-end
+    english(3660 + 0.1).should == "1:01:00.100"
+  end
+  
+  it "should auto-select a EDL if it matches a DVD's title" do
+    EdlParser.single_edit_list_matches_dvd("deadbeef|8b27d001").should_not be nil
+  end
+  
+  it "should not auto-select if you pass it nil" do
+    EdlParser.single_edit_list_matches_dvd(nil).should be nil
+  end
+  
+
+  EdlParser::EDL_DIR.gsub!(/^.*$/, 'files/edls')
+
+  it "should not select a file if poorly formed" do
+    EdlParser.stub!(:parse_file) {
+      eval("a----")
+    }
+    EdlParser.single_edit_list_matches_dvd('fake md5') # doesn't choke
+  end
+  
+  it "should return false if two EDL's match a DVD title" do
+      begin
+        EdlParser.single_edit_list_matches_dvd("abcdef1234").should be nil
+        File.binwrite('files/edls/a.txt', "\"disk_unique_id\" => \"abcdef1234\"")
+        EdlParser.single_edit_list_matches_dvd("abcdef1234").should == "files/edls/a.txt"
+        File.binwrite('files/edls//b.txt', "\"disk_unique_id\" => \"abcdef1234\"")
+        EdlParser.single_edit_list_matches_dvd("abcdef1234").should be nil
+      ensure
+        FileUtils.rm_rf 'files/edls/a.txt'
+        FileUtils.rm_rf 'files/edls/b.txt'
+      end
+    end
+
+
+   it "should merge two files if one specifies another" do
+     begin
+       File.binwrite('files/edls/a.txt', %!"take_from_relative_file" => "b.txt"!)
+       File.binwrite('files/edls/b.txt', %!!) # empty to start out with ...nothing up my sleeve...
+       EdlParser.parse_file('files/edls/a.txt').should == {"take_from_relative_file" => "b.txt", "mutes" => [], "blank_outs" => []}
+       File.binwrite('files/edls/b.txt', %!"blank_outs" => ["00:01", "00:03", "violence"], "yo" => "33"!)
+       EdlParser.parse_file('files/edls/a.txt').should == {"take_from_relative_file" => "b.txt", "mutes" => [], "blank_outs" => [["00:01", "00:03", "violence"]], "yo" => "33"}
+     ensure
+       FileUtils.rm_rf 'files/edls/a.txt'
+       FileUtils.rm_rf 'files/edls/b.txt'
+     end
+   end
+  
+end