sensible-cinema 0.17.0 → 0.18.0

data/lib/swing_helpers.rb

@@ -1,3 +1,20 @@
+=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 'java'
 module SensibleSwing 
  include_package 'javax.swing'

data/lib/vlc_programmer.rb

@@ -1,3 +1,20 @@
+=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_relative 'overlayer'
 
 class VLCProgrammer

data/preamble

@@ -0,0 +1,17 @@
+=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

data/sensible-cinema.gemspec

@@ -5,31 +5,32 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.17.0"
+  s.version = "0.18.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
-  s.date = %q{2010-12-08}
+  s.date = %q{2010-12-13}
   s.email = %q{rogerdpack@gmail.com}
   s.executables = ["sensible-cinema", "sensible-cinema-cli"]
   s.extensions = ["ext/mkrf_conf.rb"]
   s.extra_rdoc_files = [
     "ChangeLog",
-    "LICENSE",
+    "LICENSE.TXT",
     "README",
     "TODO"
   ]
   s.files = [
     "ChangeLog",
-    "LICENSE",
+    "LICENSE.TXT",
     "README",
     "RUN SENSIBLE CINEMA CLICK HERE.bat",
     "Rakefile",
     "TODO",
+    "USAGE_TERMS.TXT",
     "VERSION",
     "bin/sensible-cinema",
     "bin/sensible-cinema-cli",
-    "edit sensible cinema decision list files.bat",
+    "create new sensible cinema decision list files.bat",
     "experimental_readme.txt",
     "ext/mkrf_conf.rb",
     "gplv3.txt",
@@ -44,6 +45,7 @@ Gem::Specification.new do |s|
     "lib/mencoder_wrapper.rb",
     "lib/mouse.rb",
     "lib/mouse_forever.rb",
+    "lib/mplayer_edl.rb",
     "lib/muter.rb",
     "lib/ocr.rb",
     "lib/overlayer.rb",
@@ -52,6 +54,7 @@ Gem::Specification.new do |s|
     "lib/swing_helpers.rb",
     "lib/vlc_programmer.rb",
     "never_do",
+    "preamble",
     "sensible-cinema.gemspec",
     "spec/blanker.spec.rb",
     "spec/common.rb",
@@ -108,6 +111,7 @@ Gem::Specification.new do |s|
     "spec/keyboard_input.spec.rb",
     "spec/mencoder_wrapper.spec.rb",
     "spec/mouse.spec.rb",
+    "spec/mplayer_edl.spec.rb",
     "spec/muter.spec.rb",
     "spec/ocr.spec.rb",
     "spec/overlayer.spec.rb",
@@ -122,6 +126,7 @@ Gem::Specification.new do |s|
     "vendor/unzip.exe",
     "zamples/edit_decision_lists/category descriptions.txt",
     "zamples/edit_decision_lists/dvds/COOL_RUNNINGS.txt",
+    "zamples/edit_decision_lists/dvds/Harry Potter 2.txt",
     "zamples/edit_decision_lists/dvds/bob the builder pets in a pickle.txt",
     "zamples/edit_decision_lists/dvds/bobs_big_plan.txt",
     "zamples/edit_decision_lists/dvds/happiest baby on the block.txt",
@@ -132,6 +137,7 @@ Gem::Specification.new do |s|
     "zamples/edit_decision_lists/dvds/old_and_inaccurate/labyrinth.txt",
     "zamples/edit_decision_lists/dvds/old_and_inaccurate/making marriage work.txt",
     "zamples/edit_decision_lists/dvds/old_and_inaccurate/star_trek_generations_hulu.txt",
+    "zamples/edit_decision_lists/dvds/pack_wedding_2007-03-03.txt",
     "zamples/edit_decision_lists/example_edit_decision_list.txt",
     "zamples/edit_decision_lists/old_not_yet_update/youtube/gummy_bear_song_youtube.txt",
     "zamples/edit_decision_lists/old_not_yet_update/youtube/nuki_song_youtube.txt",
@@ -159,6 +165,7 @@ Gem::Specification.new do |s|
     "spec/keyboard_input.spec.rb",
     "spec/mencoder_wrapper.spec.rb",
     "spec/mouse.spec.rb",
+    "spec/mplayer_edl.spec.rb",
     "spec/muter.spec.rb",
     "spec/ocr.spec.rb",
     "spec/overlayer.spec.rb",

data/spec/blanker.spec.rb

@@ -1,3 +1,20 @@
+=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/blanker.rb'
 

data/spec/common.rb

@@ -1,3 +1,20 @@
+=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 'rubygems'
 begin
   require 'rspec' # rspec2

data/spec/convert_image.rb

@@ -1,3 +1,20 @@
+=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 'rubygems'
 require 'sane'
 require 'RMagick'

data/spec/drive_info.spec.rb

@@ -1,3 +1,20 @@
+=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.expand_path(File.dirname(__FILE__) + '/common')
 require_relative '../lib/drive_info'
 

data/spec/edl_parser.spec.rb

@@ -1,3 +1,20 @@
+=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.expand_path(File.dirname(__FILE__) + '/common')
 require_relative '../lib/edl_parser'
 

data/spec/keyboard_input.spec.rb

@@ -1,3 +1,20 @@
+=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.expand_path(File.dirname(__FILE__) + '/common')
 require_relative '../lib/keyboard_input'
 

data/spec/mencoder_wrapper.spec.rb

@@ -1,12 +1,34 @@
+=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/mencoder_wrapper'
 require_relative '../lib/edl_parser'
 
+# mpeg fulli_unedited one pass doesn't look "awful"
+# mp4 fulli_unedited default looks way granular
+# so could either attempt to re-encode at high cpu, possibly still lossy
+# or do the frame accurate splitter. Prefer the latter.
+
 describe MencoderWrapper do
 
   before do
-    FileUtils.rm 'to_here.fulli.tmp.avi.done' rescue nil
-    FileUtils.rm 'to_here.fulli.tmp.avi' rescue nil
+    FileUtils.rm 'to_here.fulli_unedited.tmp.mpg.done' rescue nil
+    FileUtils.rm 'to_here.fulli_unedited.tmp.mpg' rescue nil
     @a = EdlParser.parse_file "../zamples/edit_decision_lists/dvds/bobs_big_plan.txt"
     @out = MencoderWrapper.get_bat_commands @a, "e:\\", 'to_here'
   end
@@ -19,31 +41,39 @@ describe MencoderWrapper do
   it "should have what looks like a working mencoder grab command" do
     @out.should match(/mencoder dvdnav:/)
     @out.should match(/dvdnav.*lavcopt.*keyint=1/)
-    @out.should match(/dvdnav.*lavcopt.*mpeg2video/)
+    use_mpg2_fulli_unedited = true
+    if use_mpg2_fulli_unedited
+      @out.should match(/dvdnav.*lavcopt.*mpeg2video/)
+      @out.should match(/autoaspect/) # try to preserve aspect
+    end
   end
   
   it "should avoid subtitles" do
     @out.should match(/-sid 1000/)
   end
   
+  it "should default to english" do
+    @out.should match(/-alang en/)
+  end
+  
   it "should create a .done file after ripping" do
-    @out.should include("&& echo got_file > to_here.fulli.tmp.avi.done")
+    @out.should include("&& echo got_file > to_here.fulli_unedited.tmp.mpg.done")
   end
   
   def go
     @out = MencoderWrapper.get_bat_commands @a, "e:\\", 'to_here'
   end
     
-  it "should not rip it again if the .done file exists and the original file exist" do
+  it "should not grab it again if the .done file exists and the original file exist" do
     go
-    @out.should include(" -o to_here.fulli.tmp.avi")
+    @out.should include(" -o to_here.fulli_unedited.tmp.mpg")
     
-    FileUtils.touch 'to_here.fulli.tmp.avi.done'
+    FileUtils.touch 'to_here.fulli_unedited.tmp.mpg.done'
     go
-    @out.should include(" -o to_here.fulli.tmp.avi")
-    FileUtils.touch 'to_here.fulli.tmp.avi'
+    @out.should include(" -o to_here.fulli_unedited.tmp.mpg")
+    FileUtils.touch 'to_here.fulli_unedited.tmp.mpg'
     go
-    @out.should match(/@rem.*-o to_here.fulli.tmp.avi/)  
+    @out.should match(/@rem.*-o to_here.fulli_unedited.tmp.mpg/)  
   end
   
   it "should raise if the output file is held by some other process" do
@@ -107,12 +137,22 @@ describe MencoderWrapper do
     @out.should match(/del to_here.1.avi/)
   end
   
-  it "should rm partial files before writing each one" do
-    @out.should match(/del to_here.3.avi$/)
+  it "should rm the files in the code, not the batch commands" do
+    FileUtils.touch 'to_here.3.avi'
+    File.exist?('to_here.3.avi').should be true
+    out = MencoderWrapper.get_bat_commands @a, "e:\\", 'to_here'
+    out.should_not match(/del to_here.3.avi$/)
+    File.exist?('to_here.3.avi').should be false
+  end
+  
+  it "should echo that it is done, and with the right filename" do
+    @out.should match(/echo wrote.*to_here.avi/)
   end
   
-  it "should echo that it is done, with the right filename" do
-    @out.should include("echo wrote to to_here.avi")
+  it "should accept audio_code" do
+    settings = {"audio_codec"=>"pcm"}
+    out = MencoderWrapper.get_bat_commands settings, "e:\\", 'to_here.avi'
+    out.should include("-oac pcm")
   end
   
   def setup
@@ -135,14 +175,14 @@ describe MencoderWrapper do
   
   it "should lop off a fraction of a second per segment, as per wiki instructions" do
     setup
-    @out.should match(/-t 0.999/)
+    @out.should match(/0.999/)
   end
   
   it "should not have doubled .avi.avi's" do
     setup  
-    # lodo cleanup this ugliness
-    @out.scan(/-i.*-t.*to_here.avi.1.avi/).length.should == 1
-    @out.scan(/-i.*-t.*to_here.avi.2.avi/).length.should == 1
+    # lodo cleanup this ugliness [.avi.1.avi]...
+    @out.scan(/(ffmpeg|mencoder).*to_here.avi.1.avi/).length.should be >= 1
+    @out.scan(/(ffmpeg|mencoder).*to_here.avi.2.avi/).length.should be >= 1
   end
   
   context 'pinpointing sections' do
@@ -151,7 +191,7 @@ describe MencoderWrapper do
      @out = MencoderWrapper.get_bat_commands settings, "e:\\", 'to_here.avi', '00:14', '00:25'  
     end
     
-    it "should always somewhat rip the whole thing" do
+    it "should always somewhat grab the whole thing, no endpos" do
       @out.should_not match(/mencoder dvd.*endpos/)
     end
     
@@ -160,8 +200,8 @@ describe MencoderWrapper do
      @out.should include("14.0")
      @out.should_not include("99999")
      @out.should include(" 0 ") # no start at 0 even
-     @out.should include("-ss 14.0 -t 0.999")
-     @out.should include("-ss 15.0 -t 4.999")
+     @out.should match(/-ss 14.0.*0.999/)
+     @out.should match(/-ss 15.0.*4.999/)
   end
   
   it "should allow you to play something even if there's no edit list, just for examination sake" do

data/spec/mouse.spec.rb

@@ -1,3 +1,20 @@
+=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.expand_path(File.dirname(__FILE__) + '/common')
 require_relative '../lib/mouse'