sensible-cinema 0.16.2 → 0.16.3

data/Rakefile

@@ -106,5 +106,5 @@ end
 desc 'j -S rake bundle_dependencies create_distro_dir ... (releases with clean cache dir, which we need now)'
 task 'full_release' => [:bundle_dependencies, :create_distro_dir, :build] do # :release sigh
   system("#{Gem.ruby} -S gem push #{Dir['pkg/*.gem'][-1]}") 
-  puts "don't forget to blog about it..."
+  puts "don't forget to blog about it...and upload .zip of it..."
 end

data/VERSION

@@ -1 +1 @@
-0.16.2
+0.16.3

data/bin/sensible-cinema

@@ -42,7 +42,7 @@ module SensibleSwing
      c.set_bounds(44,120,button_width,23)
      panel.add c
     
-     b = JButton.new("Watch current DVD unedited")
+     b = JButton.new("Watch ripped version of DVD unedited")
      b.on_clicked {
        ENV['PATH'] = ENV['PATH'] + ";d:\\Program Files\\SMPlayer;c:\\Program Files\\SMPlayer"
        path = RubyWhich.new.which('smplayer')
@@ -53,14 +53,14 @@ module SensibleSwing
          (though VLC only has approximate timings).", "Lacking dependency", JOptionPane::ERROR_MESSAGE)      
          system("start http://smplayer.sourceforge.net/downloads.php")
        else
-         #drive, volume, md5 = choose_dvd_drive
-         command = "smplayer dvd://"
+         wrote_to_here_fulli = do_copy_dvd_to_hard_drive false, true
+         command = "smplayer #{wrote_to_here_fulli}"
          puts command
          system(command)
        end 
      }
      b.set_bounds(44,150,button_width,23)
-     panel.add b
+     panel.add b if ARGV.index("--create-mode") # LODO allow end users to play it from here?
     
      d = JButton.new( "Preview edited section of current DVD" )
      d.on_clicked {
@@ -108,7 +108,7 @@ module SensibleSwing
      @progress_bar.set_bounds(44,280,button_width,23)
      @progress_bar.visible = false
      panel.add @progress_bar
-     @buttons = [b,c,d,e,reload,@exit]
+     @buttons = [b,c,d,e,f,reload,@exit]
      check_for_dependencies
    end
   
@@ -161,7 +161,7 @@ module SensibleSwing
     }
     if matching.length == 1
       file = matching[0]
-      p "selecting the one matching file #{file}"
+      p "selecting the one matching file #{file} #{md5}"
       file
     else
       nil
@@ -174,8 +174,9 @@ module SensibleSwing
     generate_and_run_bat_file *Storage['last_params']
   end
   
-  def do_copy_dvd_to_hard_drive should_prompt_for_start_and_end_times
+  def do_copy_dvd_to_hard_drive should_prompt_for_start_and_end_times, want_full_list = false
       drive, dvd_volume_name, md5sum = choose_dvd_drive
+      p drive, dvd_volume_name, md5sum
       edit_list_path = single_edit_list_matches_dvd(md5sum)
       if !edit_list_path
         fc = FileDialog.new(self)
@@ -192,25 +193,34 @@ module SensibleSwing
       
       if should_prompt_for_start_and_end_times
         JOptionPane.showMessageDialog(nil, "Ok, let's preview just a portion of it. \nNote that you'll want to preview a section that wholly includes an edit decision in it\n For example, if it mutes from second 1 to second 10, you'll want to play from 00:00 to 00:12 or what not.\nAlso note that the first time you preview a section of a video, it will take like 20 minutes as it sets up the video for previewing.\nSubsequent previews will be faster, though, as long as you use the same filename.", "Preview!", JOptionPane::INFORMATION_MESSAGE)
-        start_time = JOptionPane.showInputDialog("At what point in the video would you like to start your preview? (like 01:00 for starting at 1 minute)", Storage['start_time'])
-        Storage['start_time'] = start_time
-        end_time = JOptionPane.showInputDialog("At what point in the video would you like to finish your preview? (like 02:00 for ending at the 2 minute mark)", Storage['end_time'])
-        Storage['end_time'] = end_time
-        unless start_time and end_time
-          JOptionPane.showMessageDialog(nil, " Please choose start and end", "Failed", JOptionPane::ERROR_MESSAGE)
-          return
-        end
+          start_time = JOptionPane.showInputDialog("At what point in the video would you like to start your preview? (like 01:00 for starting at 1 minute)", Storage['start_time'])
+          Storage['start_time'] = start_time
+          end_time = JOptionPane.showInputDialog("At what point in the video would you like to finish your preview? (like 02:00 for ending at the 2 minute mark)", Storage['end_time'])
+          Storage['end_time'] = end_time
+          unless start_time and end_time
+            JOptionPane.showMessageDialog(nil, " Please choose start and end", "Failed", JOptionPane::ERROR_MESSAGE)
+            return
+          end
       end
       
       fc.set_title "Pick where to save #{dvd_title} edited to"
       
       save_to_file_name = dvd_title + ' edited copy'
-      save_to_file_name += ' single segment' if should_prompt_for_start_and_end_times
+      save_to_file_name += ' single segment' if should_prompt_for_start_and_end_times || want_full_list
       save_to_file_name=save_to_file_name.gsub(' ', '_').gsub( /\W/, '') # no punctuation for now...
       fc.setFile(DriveInfo.get_drive_with_most_space_with_slash + save_to_file_name)
       save_to = fc.go
       dvd_title_track = descriptors["dvd_title_track"]
+      # how does save_to map to fulli?
+      fulli = save_to + ".fulli.tmp.avi"
+      if want_full_list
+        if File.exist? fulli + ".done"
+          # just return the full path early...
+          return fulli
+        end
+      end
       generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track
+      fulli
    end
   
     def generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track
@@ -283,7 +293,8 @@ module SensibleSwing
     
     if selected_idx
       disk = opticals[selected_idx]
-      return names[selected_idx][0..2], opticals[selected_idx].VolumeName, DriveInfo.md5sum_disk(opticals[selected_idx].Name)
+      prefix = names[selected_idx][0..2] 
+      return prefix, opticals[selected_idx].VolumeName, DriveInfo.md5sum_disk(prefix)
     else
       puts 'did not select a drive...exiting'
       java.lang.System.exit 1      

data/lib/drive_info.rb

@@ -5,10 +5,11 @@ class DriveInfo
 
  def self.md5sum_disk(dir)
   digest = Digest::MD5.new()
-  
-  Dir[dir + "VIDEO_TS/*.IFO"].sort.each{|f|
+  files  = Dir[dir + "VIDEO_TS/*.IFO"]
+  files.sort.each{|f|
     digest << File.binread(f) 
   }
+  raise 'bad drive' unless files.length > 0
   digest.hexdigest
  end
 

data/sensible-cinema.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.16.2"
+  s.version = "0.16.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
-  s.date = %q{2010-12-03}
+  s.date = %q{2010-12-04}
   s.email = %q{rogerdpack@gmail.com}
   s.executables = ["sensible-cinema", "sensible-cinema-cli"]
   s.extensions = ["ext/mkrf_conf.rb"]

data/zamples/edit_decision_lists/dvds/bobs_big_plan.txt

@@ -1,7 +1,7 @@
 "title" => "Bob's Big Plan",
-"disk_unique_id" => "d41d8cd98f00b204e9800998ecf8427e",
 "dvd_title_track" => 1,
 "other notes" => "could use more nit-picking of the song, as some parts seem all right in the end",
+"disk_unique_id" => "259961ce38971cac3e28214ec4ec278b",
 
 "mutes" => [
   "00:03.8" , "01:03", "theme song is a bit raucous at times",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 16
-    - 2
-  version: 0.16.2
+    - 3
+  version: 0.16.3
 platform: ruby
 authors: 
   - Roger Pack
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 -07:00
+date: 2010-12-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency