sensible-cinema 0.11.0 → 0.12.0

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.12.0

data/lib/vlc_programmer.rb

@@ -7,8 +7,8 @@ class VLCProgrammer
     @overlayer.translate_time_to_human_readable s
   end
 
-  def self.convert_to_full_xspf incoming
-
+  def self.convert_to_full_xspf incoming, filename = nil
+    @filename = filename
     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]}
@@ -53,11 +53,7 @@ class VLCProgrammer
       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>"
+    out = get_header
 
     previous_end = 0
     idx = 0
@@ -72,35 +68,68 @@ class VLCProgrammer
       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"
+        out += get_section "#{to_english start}s to #{to_english endy}s muted", start, endy, idx += 1, true
       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>"
+    out += get_footer idx
   
   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>"
+  
+  def self.get_header
+    if !@filename
+      "<?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>"
+    else
+      ""
+    end
   end
-end
+  
+  def self.get_section title, start, stop, idx, no_audio = false
+    loc = "dvd://e:\@1"
+    if !@filename
+      "<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>noaudio</vlc:option>" if no_audio}
+        <vlc:option>stop-time=#{stop}</vlc:option>
+      </extension>
+      <location>#{loc}</location>
+      </track>"
+    else
+      "call vlc -I dummy #{loc} --start-time=#{start} --stop-time=#{stop} --sout=file/ps:#{@filename}.ps.#{idx} #{"--no-sout-audio" if no_audio} vlc://quit\n" # + 
+      #"call vlc #{@filename}.ps.#{idx}.tmp  --sout=file/ps:go.ps
+    end
+  end
+  
+  def self.get_footer idx
+   if !@filename
+    "</trackList></playlist>"
+   else
+    files = (1..idx).map{|n| "#{@filename}.ps.#{n}"}
+    # concat
+    line = 'type ' + files.join(' ')
+    line += " > #{@filename}.all.ps\n"
+    
+    line += "rm " + files.join(' ') + "\n"
+    line += "echo Done--you may now watch file #{@filename}.all.ps in VLC player"
+   end
+    
+  end
+  
 
-# 1.8.7 compat...
+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)

data/spec/{vlc_pre_programmed.spec.rb → vlc_programmer.spec.rb}

@@ -4,34 +4,12 @@ require_relative '../lib/vlc_programmer'
 
 describe 'VLC Programmer' do
 
-  it "should be able to convert" 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.should include("<title>Playlist</title>")
     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
@@ -49,7 +27,7 @@ describe 'VLC Programmer' 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
+    @a.scan(/noaudio/).length.should be > 0
   end
 
   it "should handle blank outs, too" do
@@ -67,7 +45,7 @@ describe 'VLC Programmer' do
 
     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(/noaudio/).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
@@ -75,13 +53,13 @@ describe 'VLC Programmer' do
     
     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(/noaudio/).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(/noaudio/).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
@@ -99,15 +77,25 @@ describe 'VLC Programmer' do
   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 = VLCProgrammer.convert_to_full_xspf({ "mutes" => {5=>10} } )
     a.scan(/sout=.*/).length.should  == 0
+    bat_file = VLCProgrammer.convert_to_full_xspf({ "mutes" => {5=>10} }, 'go' )
+    bat_file.scan(/sout=.*/).length.should be > 0
+    bat_file.scan(/playlist/i).length.should == 0
+    bat_file.scan(/--no-sout-audio/).length.should == 1
+    bat_file.scan(/\n/).length.should be > 2
+    bat_file.scan(/go.ps.1.* go.ps.2/).length.should == 2
+    bat_file.scan(/go.ps.4/).length.should == 0
+    bat_file.scan(/--start-time/).length.should == 3
+    bat_file.scan(/quit/).length.should == 3
+    bat_file.scan(/type/).length.should == 1
+    bat_file.scan(/rm go.ps.1/).length.should == 1
+    bat_file.scan(/echo/).length.should == 1
+    bat_file.scan(/dummy/i).length.should == 3
+    File.write('mute5-10.bat', bat_file)
+    puts 'run it like $ mute5-10.bat'
   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
+  it "should produce a workable non VLC playable file"
   
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 11
+  - 12
   - 0
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors: 
 - Roger Pack
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 -07:00
+date: 2010-11-17 00:00:00 -07:00
 default_executable: sensible-cinema
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -201,7 +201,7 @@ files:
 - spec/screen_tracker.spec.rb
 - spec/silence.wav
 - spec/test_yaml.yml
-- spec/vlc_pre_programmed.spec.rb
+- spec/vlc_programmer.spec.rb
 - vendor/gocr048.exe
 - vendor/imagemagick/CORE_RL_Magick++_.dll
 - vendor/imagemagick/CORE_RL_bzlib_.dll
@@ -289,4 +289,4 @@ test_files:
 - spec/ocr.spec.rb
 - spec/overlayer.spec.rb
 - spec/screen_tracker.spec.rb
-- spec/vlc_pre_programmed.spec.rb
+- spec/vlc_programmer.spec.rb