sensible-cinema 0.26.2 → 0.26.3

data/lib/gui/sensible-cinema-normal.rb

@@ -142,10 +142,10 @@ module SensibleSwing
     def parse_edl path
       EdlParser.parse_file path
     end
+    
     def get_freespace path
       JFile.new(File.dirname(path)).get_usable_space
     end
-
     
     def get_title_track descriptors, use_default_of_one = true
       given = descriptors["dvd_title_track"] 
@@ -184,7 +184,6 @@ module SensibleSwing
       end
     end
 
-
     def get_drive_with_most_space_with_slash
       DriveInfo.get_drive_with_most_space_with_slash
     end
@@ -333,8 +332,14 @@ module SensibleSwing
         else
           disk = opticals[selected_idx]
           out = show_non_blocking_message_dialog "calculating current disk's unique id...if this pauses more than 10s then clean your DVD..."
-          dvd_id = DriveInfo.md5sum_disk(disk.MountPoint)
-          out.dispose
+          begin
+		    dvd_id = DriveInfo.md5sum_disk(disk.MountPoint)
+          rescue Exception => e
+		    show_blocking_message_dialog e.to_s # todo a bit ugly...
+			raise
+		  ensure
+		    out.dispose
+		  end
           @_choose_dvd_drive_or_file = [disk.MountPoint, opticals[selected_idx].VolumeName, dvd_id]
           return @_choose_dvd_drive_or_file
         end

data/lib/muter.rb

@@ -18,7 +18,7 @@ This file is part of Sensible Cinema.
 require 'rubygems' # ugh
 require 'ffi'
 require 'sane'
-require_relative 'mouse'
+require_relative 'jruby-swing-helpers/mouse'
 require_relative 'play_audio'
 
 module Muter

data/lib/subtitle_profanity_finder.rb

@@ -57,14 +57,33 @@ module SubtitleProfanityFinder
 
 
 
-  def self.edl_output incoming_filename, extra_profanity_hash = {}, subtract_from_each_beginning_ts = 0, add_to_end_each_ts = 0
-    edl_output_from_string File.read(incoming_filename), extra_profanity_hash, subtract_from_each_beginning_ts, add_to_end_each_ts
+  def self.edl_output incoming_filename, extra_profanity_hash = {}, subtract_from_each_beginning_ts = 0, add_to_end_each_ts = 0, beginning_srt = "00:00", beginning_actual_movie = "00:00", ending_srt = "10:00:00", ending_actual = "10:00:00"
+    edl_output_from_string File.read(incoming_filename), extra_profanity_hash, subtract_from_each_beginning_ts, add_to_end_each_ts, beginning_srt, beginning_actual_movie, ending_srt, ending_actual
   end
   
-  def self.edl_output_from_string subtitles, extra_profanity_hash, subtract_from_each_beginning_ts, add_to_end_each_ts
+  def self.edl_output_from_string subtitles, extra_profanity_hash, subtract_from_each_beginning_ts, add_to_end_each_ts, starting_timestamp_given_srt, starting_timestamp_actual, ending_srt, ending_actual
      subtitles.gsub!("\r\n", "\n")
      raise if subtract_from_each_beginning_ts < 0 # these have to be positive...in my twisted paradigm
      raise if add_to_end_each_ts < 0
+
+     starting_timestamp_given_srt = EdlParser.translate_string_to_seconds(starting_timestamp_given_srt)
+     starting_timestamp_actual = EdlParser.translate_string_to_seconds(starting_timestamp_actual)
+     ending_srt = EdlParser.translate_string_to_seconds(ending_srt)
+     ending_actual = EdlParser.translate_string_to_seconds ending_actual
+
+     # accomodate for both styles of rewrite, except it messes up the math, so just leave it separate:
+     # difference = starting_timestamp_given_srt - starting_timestamp_actual
+     # subtract_from_each_beginning_ts += difference
+     # add_to_end_each_ts -= difference
+
+#     you minus the initial srt time... (given)
+#     ratio = (end actual - init actual/ end given - init given)*(how far you are past the initial srt) plus initial actual
+     multiply_by_this_factor = (ending_actual - starting_timestamp_actual)/(ending_srt - starting_timestamp_given_srt)
+
+     multiply_proc = proc {|you|
+      ((you - starting_timestamp_given_srt) * multiply_by_this_factor) + starting_timestamp_actual
+    }  
+
 
 
 
@@ -181,10 +200,12 @@ module SubtitleProfanityFinder
             ts_begin = "#{$2}.#{$3}"
             ts_begin = EdlParser.translate_string_to_seconds ts_begin
             ts_begin  -= subtract_from_each_beginning_ts
+            ts_begin = multiply_proc.call(ts_begin)
             ts_begin = EdlParser.translate_time_to_human_readable ts_begin, true
             ts_end = "#{$4}.#{$5}"
             ts_end = EdlParser.translate_string_to_seconds ts_end
             ts_end += add_to_end_each_ts
+            ts_end = multiply_proc.call(ts_end)
             ts_end = EdlParser.translate_time_to_human_readable ts_end, true
             unless output.contain? ts_begin
               output += %!"#{ts_begin}" , "#{ts_end}", "profanity", "#{sanitized.gsub(/[\[\]]/, '').strip}", "#{sanitized_glop.strip}",\n!

data/spec/dragon.srt

@@ -23,7 +23,7 @@
 
 6
 00:00:55,068 --> 00:00:59,164
-<i>We have our nordic gods, hunting</i>
+<i>We study the nordic gods</i>
 <i>and a charming view of the sunsets.</i>
 
 7

data/spec/edl_parser.spec.rb

@@ -182,13 +182,21 @@ describe EdlParser do
     translate("1:01:01").should == 60*61+1
   end
   
+  it "should translate subtitle type timestamps" do
+    translate("00:00:34,451").should == 34.451
+  end
+  
+  it "should disallow malformed" do
+    proc {translate("00:00:34,45a")}.should raise_exception
+  end
+  
   it "should translate ints to english timestamps well" do
     english(60).should == "01:00"
-    english(60.1).should == "01:00.100"
+    english(60.1).should == "01:00.10"
     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.100"
+    english(3660 + 0.1).should == "1:01:00.10"
   end
   
   it "should auto-select a (nested) EDL if it matches a DVD's id" do

data/spec/notes

@@ -4,8 +4,10 @@ curious george 2 http://movies.netflix.com/WiPlayer?trkid=805148&movieid=7013048
 
 == netflix upscale notes ==
 
- :width=>657 for "HD" that said it was playing in HD, eh? ... hmm...
+  netflix :width=>657 for "HD" that said it was playing in HD, eh? ... hmm...
 
+ at home: never says playing in HD, but lines look really good full screen...hmm...
+  
  hulu has "up to 480p" as options...hmm...
   360p speedracer displays as {:start_x=>535, :start_y=>328, :width=>542, :height=>410}
   480p speedracer displays as {:start_x=>524, :start_y=>331, :width=>550, :height=>408} (same)

data/spec/subtitle_profanity_finder.spec.rb

@@ -28,7 +28,7 @@ describe SubtitleProfanityFinder do
 
     describe "he.." do
       it "should include the bad line with timestamp" do
-        output.should match(/0:00:54.929.*"he\.\."/)
+        output.should match(/0:00:54.93.*"he\.\."/)
       end
     
       it "should include the description in its output" do
@@ -65,13 +65,13 @@ describe SubtitleProfanityFinder do
       end
       
       it 'should parse them at EOL' do
-        output2.should include '0:00:55.069' # EOL
-        output2.should include "0:00:55.071" # full line...
-        output2.should include '0:00:55.066' # BOL
+        output2.should include '0:00:55.07' # EOL
+        output2.should include "0:00:55.07" # full line...
+        output2.should include '0:00:55.07' # BOL TODO fix spec :P
       end
       
       it 'should replace l for i' do
-        output2.should include "065" # implies it got the substutition right...
+        output2.should include "07" # implies it got the substutition right...
       end
       
       it 'should keep apostrophes' do
@@ -88,32 +88,82 @@ describe SubtitleProfanityFinder do
   
   it 'should add to begin, end' do
     out = SubtitleProfanityFinder.edl_output 'dragon.srt', {'word' => 'word'}, 1, 1.5
-    out.should include "45.460"
-    out.should include "51.589"
+    out.should include "45.46"
+    out.should include "51.59"
   end
   
   it "should accomodate lesser profanities" do
-    out = SubtitleProfanityFinder.edl_output_from_string <<-EOL, {}, 0, 0
+    out = SubtitleProfanityFinder.edl_output_from_string <<-EOL, {}, 0, 0, 1.0
 6
 00:00:55,068 --> 00:00:59,164
 a butt
 
     EOL
     out.should include "55.0"
+
   end
   
   describe "it should take optional user params" do
     output = SubtitleProfanityFinder.edl_output 'dragon.srt', {'word' => 'word'}
     
     it "should parse out the word word" do
-      output.should match(/0:00:50.089.*"word"/)
+      output.should match(/0:00:50.09.*"word"/)
     end
     
     it "should parse out and replace with euphemism" do
       output = SubtitleProfanityFinder.edl_output 'dragon.srt', {'word' => 'w...'}
-      output.should match(/0:00:50.089.*In a \[w\.\.\.\]/)
+      output.should match(/0:00:50.09.*In a \[w\.\.\.\]/)
     end
     
   end
+
+  S = SubtitleProfanityFinder
+
+  describe "it should let you re-factor the timestamps on the fly if desired"  do
+
+#  def self.edl_output_from_string subtitles, extra_profanity_hash, subtract_from_each_beginning_ts, add_to_end_each_ts, starting_timestamp_given, starting_timestamp_actual, ending_timestamp_given, ending_timestamp_actual^M
+
+    it "should subtract from beginning etc. etc." do
+       normal = S.edl_output 'dragon.srt'
+       normal.should =~ /0:00:50.23/
+       normal.should =~ /0:00:54.93/
+       subtract = S.edl_output 'dragon.srt', {}, 1.0
+       subtract.should =~ /0:00:49.23/
+       normal.should =~ /0:00:54.93/
+       add = S.edl_output 'dragon.srt', {}, 0.0, 1.0
+       add.should =~ /0:00:55.93/
+       add.should =~ /0:00:50.23/
+    end
+
+    it "should compensate for differing start timestamps" do
+       starts_ten_later_than_srt = S.edl_output 'dragon.srt', {}, 0.0, 0.0, "00:10", "00:20"
+       starts_ten_later_than_srt.should =~ /0:01:00.23/
+       starts_ten_later_than_srt.should =~ /0:01:04.93/
+    end
+
+   it "should compensate for differing end timestamps with a multiple" do
+     lasts_longer = S.edl_output 'dragon.srt', {}, 0.0, 0.0, "00:00", "00:00", "01:00", "01:30" # actual ends 50% later
+     lasts_longer.should =~ /0:01:15.34/
+     lasts_longer.should =~ /0:01:22.39/
+   end
+
+    describe "combining different initial time offsets with total times" do
+
+     it "should combine different initial time offset with different total time" do
+      lasts_longer_with_initial_add =  S.edl_output 'dragon.srt', {}, 0.0, 0.0, begin_srt = "00:00", begin_actual = "00:10", end_srt = "00:55", end_actual = "00:55" 
+      # this one starts off weird, but then ends at almost exactly the same!
+      lasts_longer_with_initial_add.should =~ /0:00:51.10/
+      lasts_longer_with_initial_add.should =~ /0:00:54.94/ # note--almost on
+     end
+
+     it "should be ok if they line up perfectly with just an offset" do
+       plus_ten = S.edl_output 'dragon.srt', {}, 0.0, 0.0, begin_srt = "00:00", begin_actual = "00:10", end_srt = "00:55", end_actual = "01:05"
+       plus_ten.should =~ /0:01:00.23/
+       plus_ten.should =~ /0:01:04.93/
+     end
+
+    end
+
+  end
   
-end
+end

data/todo.inventionzy.txt

@@ -11,7 +11,11 @@
       with several, or start one, end one, etc.
 	    allow for extra start time offset for videos, if netflix instant has any
     a way to integrate with cable TV, ex: "this show we know started at 1:01, and its offsets should be this after that point"
-    it can "infer" where the thumb slider would be, and "drag" it to where it infers the new timestamp location shoudl be.
+    it can query the currently open browser window, check to see which movie it's playing, and auotmatically spawn off a correct player instance with EDL for that movie
+      based on title or url.
+    netflix "try this srt, does it match?" no "what about this one, now?"
+    it can "infer" where the thumb slider would be, and "drag" it to where it infers the new timestamp location should likely be, for skipping et al.
+    I can imagine a system that scans incoming audio, does voice recognition sofware analysis on it, search for (angry tones, profanities, "questionable" tones/text like making love), and excludes them from output [search forward, skip forward, just display nothing, either one, mute audio, decrease audio et al].
     make an API web service that can search for EDL's
 	  or with youtube, use the api to fast forwarrd there
 	    and if it isn't already loaded, display an extra notice "forwarding" or what not.

data/todo.subtitle

@@ -1,5 +1,5 @@
 
-ask mplayer "can you use accurate rounding with lanczos? I don't think you can..."
+handle gates of hell...
 
 http://en.gentoo-wiki.com/wiki/DVD_to_MP4 mentions "subtitle ripper"
 avidemux can apparently do it, too
@@ -9,13 +9,9 @@ somehow map DVD's to the "subdownloader" style subtitles?
 
 don't use as many..uh...large of spaces for mutes that was way wide...is that safe though?
 
-
-it can use "two" .srt files [user generated versus original] and combine them both [?]
-
 is there a way to double check your .srt file is accurate?
-  describe it...
   
 somehow interface with md5/opensubtitles or someone else?  hmm..
 
 Don't mute the whole line if not needed? [just end of it, etc...?]
-allow them to enter whatever they want as arbitrary search...
+allow them to enter whatever they want as arbitrary search profanities, search for them...

data/todo.upconvert

@@ -1,5 +1,8 @@
 == dvd upconvert ==
 
+
+ask mplayer "can you use accurate rounding with lanczos? I don't think you can..."
+
 compare with powerdvd/ffdshow
 
 compare (DVD) various computers/monitors...

data/zamples/edit_decision_lists/dvds/muppet_treasure_island.txt

@@ -0,0 +1,21 @@
+# comments can go after a # on any line, for example this one.
+"name" => "muppet treasure island",
+
+"mutes" => [
+  "4254.7", "4275.9", "the red gates of he.. are waiting for you...and beg for deliverance from [da..]ation",
+  "5383.4", "5386.0", "profanity", "aww [he..] Jim",
+
+],
+
+"blank_outs" => [
+],
+
+"volume_name" => "MUPPET_TREASURE_ISLAND",
+"disk_unique_id" => "aac1bc79|734cd8e4",
+"dvd_title_track" => "1", # the "show DVD info" button will tell you title lengths (typically longest title is the title track)
+"dvd_title_track_length" => "5977.666", # length, on the DVD, of dvd_title_track (use the show DVD info button to get this number).
+# "subtitle_url" => "1234567",
+# "not edited out stuff" => "some...",
+"closing thoughts" => "lacks some references to bloody...",
+# In mplayer, the DVD timestamp "resets" to zero for some reason, so you need to specify when if you want to use mplayer DVD realtime playback, or use mencoder -edl to split your file.  See http://goo.gl/yMfqX
+"mplayer_dvd_splits" => [],

data/zamples/edit_decision_lists/netflix_instant/avatar-last-air-bender-movie.txt

@@ -7,6 +7,7 @@
 "blank_outs" => [
 ],
 
-"name" => "The Last Airbender", # TODO english name?
+"name" => "The Last Airbender", 
 "url" => "http://movies.netflix.com/WiMovie/The_Last_Airbender/70119441?trkid=496624",
-"subtitle_url" => "http://www.engsub.net/97528/",  # TODO rename...
+"subtitle_url" => "http://www.engsub.net/97528/", 
+"tenseness_metric" => "99"

data/zamples/edit_decision_lists/netflix_instant/wrinkle-in-time.txt

@@ -0,0 +1,23 @@
+"mutes" => [
+
+"0:27:07.75" , "0:27:08.88", "profanity", "goodness", "DANA Oh [goodness] If I can find it",
+"0:55:08.08" , "0:55:11.32", "profanity", "goodness", "Who the heck do you think you are [goodness]'s gift to cockroaches",
+"1:18:44.60" , "1:18:45.94", "profanity", "goodness", "[goodness] I'm sorry",
+"1:18:59.63" , "1:19:02.34", "profanity", "goodness", "My [goodness] You've gotten so tall",
+"2:01:17.96" , "2:01:18.93", "profanity", "goodness", "Oh [goodness]",
+"2:01:31.39" , "2:01:33.66", "profanity", "goodness", "Oh my [goodness]",
+"2:01:37", "2:01:42", "profanity", "goodness",
+#"0:08:43.01" , "0:08:45.18", "profanity", "moron", "Hey [moron]",
+#"0:16:07.71" , "0:16:09.27", "profanity", "idiot", "He's an [idiot]",
+#"0:24:26.51" , "0:24:28.00", "profanity", "idiot", "My [idiot] brother",
+#"1:03:45.55" , "1:03:47.79", "profanity", "dumb", "It looks [dumb]",
+
+
+],
+
+"blank_outs" => [
+],
+
+"name" => "A Wrinkle in Time",
+"url" => "http://movies.netflix.com/WiMovie/A_Wrinkle_in_Time/70011945?trkid=496624",
+#"subtitle_url" => "", 

data/zamples/edit_decision_lists/old_not_yet_updated/example_edit_decision_list.txt

@@ -1,40 +1,14 @@
-# comments can go after a # on each line.
-
-"mutes" => [
-  "00:00:01", "00:00:02", # mute from second 1 to second 2
-  # so an example would be:  
-  "00:00:01", "00:00:02", "profanity", "dang",
-  "01:01:00", "01:02:00"  # another example:mute from one hour one minute to one hour two minutes
-],
-
-# So it would like like this:
-
-"mutes" => [
-  "00:00:01", "00:00:02", 
-  "00:00:01", "00:00:02", "profanity", "dang",
-  "01:01:00", "01:02:00" 
-],
-  
-# note: items can be out of chronological order, that's ok
-
-# you can also have blank outs
-# example:
-
-"blank_outs" => [
-  # this first one blanks (by overlaying *over* the video, a black window)
-  # from one hour one minute to one hour two minutes, like:
-  "01:01:00" , "01:02:00", "nudity", "...",
-  # you can also always optionally use decimals, like 3 minutes 3 seconds and a half to 3 minutes 4 seconds and a half (one second blank out):
-  "00:03:03.5", "00:03:04.5",
-],
-  
-# you can also add other notes, too, like title, source, whatever you want
-# these are basically free form and not used for anything else yet
-"missing_content" => "this doesn't list some mild name calling",
-"title" => "Forever Strong",
-"source" => "Hulu",
-"url" => "http://www.byutv.org/watch/1790-100",
-"whatever_else_you_want" => "this is the old version of the film",
-"disk_unique_id" => "1234|4678", # allow DVD's to be able to differentiate (and auto select) themselves.
-
-# NB that you have to put commas just about everywhere. That might help...
+# prototype file, don't use this, see the other examples
+# {
+#    "dvd_title_track":1,
+#    "title":"Bob's Big Plan",
+#    "blank_outs":[
+# 
+#    ],
+#    "other notes":"could use more nit-picking of the
+# song, as some parts seem all right in the end"
+# }
+
+#29:00 30:00 blank # {"category":"profanity","details":"beaver darn","level":3,"type":"da..","category":"profanity"}
+
+{"category":"profanity","details":"beaver darn","start":"29:00","level":3,"end":"30:00","type":"da..","category":"profanity","style":"blank"}

metadata

@@ -2,7 +2,7 @@
 name: sensible-cinema
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.26.2
+  version: 0.26.3
 platform: ruby
 authors: 
   - Roger Pack
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 Z
+date: 2011-09-15 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: os
@@ -252,7 +252,6 @@ files:
   - lib/check_installed_mac.rb
   - lib/convert_thirty_fps.rb
   - lib/count_down_timer_jruby_swing.rb
-  - lib/drive_info.rb
   - lib/edl_parser.rb
   - lib/eight_three.rb
   - lib/fake_blanker.rb
@@ -289,10 +288,8 @@ files:
   - spec/convert_image.rb
   - spec/deity_end.srt
   - spec/dragon.srt
-  - spec/drive_info.spec.rb
   - spec/edl_parser.spec.rb
   - spec/frame_accurate.spec.rb
-  - spec/go_line.bat
   - spec/keyboard_input.spec.rb
   - spec/media_info_parser.spec.rb
   - spec/mencoder_wrapper.spec.rb
@@ -353,14 +350,6 @@ files:
   - upconvert_netflix/record_screen/recording/9.png
   - upconvert_netflix/record_screen/recording/d.png
   - vendor/jruby-complete-1.6.2.jar
-  - vendor/mac_dvdid/bin/dvdid
-  - vendor/mac_dvdid/include/dvdid/dvdid.h
-  - vendor/mac_dvdid/include/dvdid/dvdid2.h
-  - vendor/mac_dvdid/include/dvdid/export.h
-  - vendor/mac_dvdid/lib/libdvdid.0.dylib
-  - vendor/mac_dvdid/lib/libdvdid.a
-  - vendor/mac_dvdid/lib/libdvdid.dylib
-  - vendor/mac_dvdid/lib/libdvdid.la
   - vendor/monkey.png
   - vendor/profs.png
   - vendor/readme.txt
@@ -390,6 +379,7 @@ files:
   - zamples/edit_decision_lists/dvds/kung_fu_panda_1.txt
   - zamples/edit_decision_lists/dvds/legend_of_the_guardians_the_owls_of_gahoole.txt
   - zamples/edit_decision_lists/dvds/making_marriage_work.txt
+  - zamples/edit_decision_lists/dvds/muppet_treasure_island.txt
   - zamples/edit_decision_lists/dvds/narnia_voyage_of_the_dawn_treader.txt
   - zamples/edit_decision_lists/dvds/pack_jackson_wedding_2007-03-03.txt
   - zamples/edit_decision_lists/dvds/sintel_open_source_blender_ntsc_dvd.txt
@@ -399,6 +389,7 @@ files:
   - zamples/edit_decision_lists/netflix_instant/avatar-last-air-bender-movie.txt
   - zamples/edit_decision_lists/netflix_instant/avatar-last-airbender-series.txt
   - zamples/edit_decision_lists/netflix_instant/greatest_story_ever_told_netflix.txt
+  - zamples/edit_decision_lists/netflix_instant/wrinkle-in-time.txt
   - zamples/edit_decision_lists/old_not_yet_updated/dvds/White Christmas.txt
   - zamples/edit_decision_lists/old_not_yet_updated/dvds/all_dogs_go_to_heaven.txt
   - zamples/edit_decision_lists/old_not_yet_updated/dvds/cars_disney.txt