sensible-cinema 0.10.2 → 0.11.0

data/README

@@ -1,5 +1,5 @@
 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.
+or "bleep out" scenes) on arbitrary media players like netflix online, vlc (for DVD's), etc.
 
 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, 

data/TODO

@@ -1,5 +1,6 @@
 == medium ==
 
+  amazon player
 
 == probably next up/low prio ==
 
@@ -22,10 +23,15 @@
 
 == 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). ==
 
+some real GUI...then I can have an 'edit preferences' button et al.
+
+"sav-ize"
+VLC can play from a playlist or batch file or multiples on command line or what not.
+  VLC can save from said playlist to a single edited file.
+
 "ripperzy-ize"
-  can rip from DVD
-    and edit that
-      mplayer?
+  can rip from DVD and then edit that
+     mplayer?
   can rip from screen
     windows 7 only for now (?)
     VLC to rip?
@@ -36,12 +42,18 @@
     and then able to edit that...
       remove commercials?
 
+dvd-rip:
+  VobBlanker for DVD's?
+
+blanker: allow for one side of the screen or another...
+
 PISH
   release it with both until scared (?)
   split projects when scared (editor versus normal)/make projects work with direct editing, et al...
     split online from DVD, et al
+  Note: get the whole thing working then release it all :P
 
-check that youtube is working well again for all...
+check that youtube is working well again for all screen resolutions...
 
 run it off a normal person (hulu, DVD). rinse and repeat
 

data/VERSION

@@ -1 +1 @@
-0.10.2
+0.11.0

data/lib/overlayer.rb

@@ -6,12 +6,6 @@ require_relative 'muter'
 require_relative 'blanker'
 require 'pp' # for pretty_inspect
 
-class Time
-  def self.now_f
-    now.to_f
-  end
-end
-
 class OverLayer
   
   def muted?
@@ -136,7 +130,7 @@ class OverLayer
     # 3600 => "1:00:00"
     out = ''
     hours = seconds.to_i / 3600
-    out << "%d" % hours 
+    out << "%d" % hours
     out << ":"
     seconds = seconds - hours*3600
     minutes = seconds.to_i / 60
@@ -379,3 +373,9 @@ class OverLayer
   end
   
 end
+
+class Time
+  def self.now_f
+    now.to_f
+  end
+end

data/lib/vlc_programmer.rb

@@ -0,0 +1,110 @@
+require_relative 'overlayer'
+
+class VLCProgrammer
+
+  def self.to_english s
+    @overlayer ||= OverLayer.allocate
+    @overlayer.translate_time_to_human_readable s
+  end
+
+  def self.convert_to_full_xspf incoming
+
+    mutes = incoming["mutes"] || {}
+    blanks = incoming["blank_outs"] || {}
+    mutes = mutes.map{|k, v| [OverLayer.translate_string_to_seconds(k), OverLayer.translate_string_to_seconds(v), :mute]}
+    blanks = blanks.map{|k, v| [OverLayer.translate_string_to_seconds(k), OverLayer.translate_string_to_seconds(v), :blank]}
+
+    combined = (mutes+blanks).sort
+
+    combined.each{|s, e, t|
+      puts 'warning--detected an end before a start' if e < s
+    }
+
+    # a = VLCProgrammer.convert_to_full_xspf({ "mutes" => {5=> 7}, "blank_outs" => {6=>7} } )
+    # should mute 5-6, skip 6-7
+    combined.each_with_index{|(start, endy, type), index|
+      next if index == 0 # nothing to do there..
+      previous = combined[index-1]
+      previous_end = previous[1]
+      previous_type = previous[2]
+      previous_start = previous[0]
+      if type == :blank
+        raise 'no overlap like that allowed as of yet' unless previous_end <= endy
+        if previous_type == :mute && previous_end > start
+          previous[1] = start # make it end when we start...
+        end
+      elsif type == :mute
+        if previous_end > start
+          
+          if previous_end >= endy
+            combined[index] = [nil] # null it out...it's a mute subsumed by a blank apparently...
+            if previous_type == :mute
+               raise 'overlapping mute?'
+            end
+          else
+             # start mine when the last one ended...
+             combined[index] = [previous_end, endy, type]
+          end
+
+        end
+     
+      else
+        raise 'unexpected'
+      end
+    }
+
+    out = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+    <playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\" xmlns:vlc=\"http://www.videolan.org/vlc/playlist/ns/0/\">
+    <title>Playlist</title>
+    <!--location>c:\\installs\\test.xspf</location--> 
+    <trackList>"
+
+    previous_end = 0
+    idx = 0
+
+    combined.each{|start, endy, type|
+      next unless start
+      next if endy <= start # ignore mutes wholly contained within blanks
+
+      if previous_end != start
+        # play up to next "questionable section"
+        out += get_section("#{to_english previous_end} to #{to_english start} (clean)", previous_end, start, idx += 1)
+      end
+      # now play through the muted section...
+      if type == :mute
+        out += get_section "#{to_english start}s to #{to_english endy}s muted", start, endy, idx += 1, "no-audio"
+      end
+      previous_end = endy
+    }
+
+    # now play the rest of the movie...
+    out += get_section to_english(previous_end) + " to end of film", previous_end, 1_000_000, idx += 1
+    out += get_section("Done", 0, 0, idx += 1, "", "vlc://quit")
+    # and close the xml...
+    out += "</trackList></playlist>"
+  
+  end
+
+  def self.get_section title, start, stop, idx, extra_setting = "", location = nil
+          "<track>
+          <title>#{title}</title>
+          <extension application=\"http://www.videolan.org/vlc/playlist/0\">
+            <vlc:id>#{idx}</vlc:id>
+            <vlc:option>start-time=#{start}</vlc:option>
+            <vlc:option>#{extra_setting}</vlc:option>
+            <vlc:option>stop-time=#{stop}</vlc:option>
+          </extension>
+          <location>#{location ? location : "dvd://e:\@1"}</location>
+          </track>"
+  end
+end
+
+# 1.8.7 compat...
+
+class Symbol
+  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Symbol.html]
+  def <=>(with)
+    return nil unless with.is_a? Symbol
+    to_s <=> with.to_s
+  end unless method_defined? :"<=>"
+end

data/spec/common.rb

@@ -16,6 +16,7 @@ require 'fileutils'
 require 'pathname'
 
 Dir.chdir File.dirname(__FILE__) # always run from the right dir...
+autoload :YAML, 'yaml'
 
 begin
   require 'hitimes'

data/spec/vlc_pre_programmed.spec.rb

@@ -0,0 +1,113 @@
+require File.dirname(__FILE__) + "/common"
+require_relative '../lib/vlc_programmer'
+
+
+describe 'VLC Programmer' do
+
+  it "should be able to convert" do
+  
+    a = YAML.load_file "../zamples/scene_lists/dvds/happy_feet_dvd.yml"
+    out = VLCProgrammer.convert_to_full_xspf(a)
+    out.length.should_not == 0
+    out.should include("playlist")
+    out.scan(/vlc:id/).length.should be > 0
+    
+=begin
+<?xml version=”1.0″ encoding=”UTF-8″?>
+<playlist version=”1″ xmlns=”http://xspf.org/ns/0/” xmlns:vlc=”http://www.videolan.org/vlc/playlist/ns/0/”>
+<title>Playlist</title>
+<location>c:\installs\test.xspf</location>
+<trackList>
+<track>
+<title>Track 1</title>
+…
+<extension application=”http://www.videolan.org/vlc/playlist/0″>
+<vlc:id>0</vlc:id>
+<vlc:option>start-time=42</vlc:option>
+<vlc:option>stop-time=45</vlc:option>
+</extension>
+<location>dvd://e:\@1</location>
+</track>
+<track>
+<title>Track 2</title>
+=end        
+    
+  end
+
+  before do
+   @a = VLCProgrammer.convert_to_full_xspf({ "mutes"=>{105=>145, "46:33.5"=>2801} } )
+  end
+
+  it "should convert mutes and blanks apropo" do
+    @a.scan(/<vlc:id>/).length.should == 5 # should mute and play each time...
+    @a.scan(/start-time=0/).length.should == 1 # should start
+    @a.scan(/stop-time=1000000/).length.should == 1 # should have one to "finish" the DVD
+    @a.scan(/<\/playlist/).length.should == 1
+  end
+
+  it "should have pretty english titles" do
+    @a.scan(/ to /).length.should == 2*2+1
+    @a.scan(/clean/).length.should be > 0
+    @a.scan(/2:25/).length.should == 2
+    @a.scan(/no-audio/).length.should be > 0
+  end
+
+  it "should handle blank outs, too" do
+    # shouldn't have as many in the case of blanks...
+    a = VLCProgrammer.convert_to_full_xspf({ "blank_outs" => {63=>64} } )
+    a.should include("63")
+    a.should include("64")
+    a.scan(/ to /).length.should == 2
+  end
+
+  it "should handle combined blank and audio well" do
+    # currently it handles blanks as skips...
+    # possibly someday we should allow for blanks as...blanks?  blank-time somehow, with the right audio?
+    # for now, skip for blanks, mute for mutes...
+
+    a = VLCProgrammer.convert_to_full_xspf({ "mutes" => {5=> 7}, "blank_outs" => {6=>7} } )
+    # should mute 5-6, skip 6-7
+    a.scan(/no-audio/).length.should == 1
+    a.scan(/ to /).length.should == 3 # 0->5, 5->6, 7-> end
+    a.scan(/=5/).length.should == 2
+    a.scan(/=6/).length.should == 1
+    a.scan(/=7/).length.should == 1
+    
+    a = VLCProgrammer.convert_to_full_xspf({ "mutes" => {6=> 7}, "blank_outs" => {5=>7} } )
+    a.scan(/=6/).length.should == 0
+    a.scan(/no-audio/).length.should == 0
+    a.scan(/ to /).length.should == 2 # 0->5, 7-> end
+
+    a = VLCProgrammer.convert_to_full_xspf({ "mutes" => {6=> 7}, "blank_outs" => {5=>6.5} } )
+    # should skip 5 => 6.5, mute 6.5 => 7
+
+    a.scan(/no-audio/).length.should == 1
+    a.scan(/ to /).length.should == 3 # 0->5, 6.5 => 7, 7 -> end
+    a.scan(/=5/).length.should == 1
+    a.scan(/=6.5/).length.should == 1
+    a.scan(/=7/).length.should == 2
+
+
+    a = VLCProgrammer.convert_to_full_xspf({ "mutes" => {6=> 7}, "blank_outs" => {6=>7} } )
+    # should ignore mutes here
+    a.scan(/ to /).length.should == 2 # 0->6, 7 -> end
+
+    a = VLCProgrammer.convert_to_full_xspf({ "mutes" => {6.5=> 7}, "blank_outs" => {6=>7} } )
+    # should ignore mutes here
+    a.scan(/ to /).length.should == 2 # 0->6, 7 -> end
+
+  end
+
+  it "should not try to save it to a file from within the xml" do
+    a = VLCProgrammer.convert_to_full_xspf({ "mutes" => {6=> 7} } )
+    a.scan(/sout=.*/).length.should  == 0
+  end
+
+  it "should have a workable usable VLC file" do
+    a = VLCProgrammer.convert_to_full_xspf({ "mutes" => {5=> 10} } )
+    a.scan(/vlc:\/\/quit/).length.should == 1
+    File.write('mute5-10.xspf', a)
+    puts 'run it like $ vlc mute5-10.xspf --sout=file/ps:go.mpg --sout-file-append vlc://quit'
+  end
+  
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 10
-  - 2
-  version: 0.10.2
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Roger Pack
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 -06:00
+date: 2010-11-15 00:00:00 -07:00
 default_executable: sensible-cinema
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,6 +141,7 @@ files:
 - lib/ocr.rb
 - lib/overlayer.rb
 - lib/screen_tracker.rb
+- lib/vlc_programmer.rb
 - never_do
 - spec/blanker.spec.rb
 - spec/common.rb
@@ -200,6 +201,7 @@ files:
 - spec/screen_tracker.spec.rb
 - spec/silence.wav
 - spec/test_yaml.yml
+- spec/vlc_pre_programmed.spec.rb
 - vendor/gocr048.exe
 - vendor/imagemagick/CORE_RL_Magick++_.dll
 - vendor/imagemagick/CORE_RL_bzlib_.dll
@@ -287,3 +289,4 @@ test_files:
 - spec/ocr.spec.rb
 - spec/overlayer.spec.rb
 - spec/screen_tracker.spec.rb
+- spec/vlc_pre_programmed.spec.rb