sensible-cinema 0.18.0 → 0.18.1

data/Rakefile

@@ -63,21 +63,27 @@ task 'bundle_dependencies' => 'gemspec' do
    dependencies = spec.runtime_dependencies
    dependencies = (dependencies + get_transitive_dependencies(dependencies)).uniq
    Gem.loaded_specs.select{|name, spec| name == 'os'}
-   FileUtils.rm_rf 'vendor/cache'
-   Dir.mkdir 'vendor/cache'
+   Dir['vendor/cache/**/*'].each{|f|
+     FileUtils.rm_rf f unless f =~ /jruby.*jar/ # that one takes too long to download...
+   }
+   FileUtils.mkdir_p 'vendor/cache'
    Dir.chdir 'vendor/cache' do
      dependencies.each{|d|
        system("#{Gem.ruby} -S gem unpack #{d.name}")
      }
-     puts 'downloading in jruby-complete.jar file' 
-     # jruby complete .jar file
-     Net::HTTP.start("jruby.org.s3.amazonaws.com") { |http|
-       resp = http.get("/downloads/1.5.6/jruby-complete-1.5.6.jar")
-       puts 'copying it... '
-       open("jruby-complete-1.5.5.jar", "wb") { |file|
-         file.write(resp.body)
-       }
-     }
+     to_here = "jruby-complete-1.5.5.jar"
+     unless File.exist? to_here
+       url = "/downloads/1.5.6/jruby-complete-1.5.6.jar"
+       puts 'downloading in jruby-complete.jar file '  + url
+       # jruby complete .jar file
+       Net::HTTP.start("jruby.org.s3.amazonaws.com") { |http|
+         resp = http.get(url)
+         puts 'copying it... '
+        open(to_here, "wb") { |file|
+           file.write(resp.body)
+        }
+      }
+     end
      # create a shunt win32ole file, so that require 'win32ole' will work.
      Dir.mkdir 'lib'
      File.write('lib/win32ole.rb', 'require "jruby-win32ole"')

data/TODO

@@ -5,6 +5,7 @@
   realtime
     mplayer EDL...
       test...
+        out of order ok?
   
   simplify/de-bugify
   

data/VERSION

@@ -1 +1 @@
-0.18.0
+0.18.1

data/bin/sensible-cinema

@@ -72,10 +72,12 @@ module SensibleSwing
 
     def initialize
       super "Sensible-Cinema"
-      if !Storage['main_license_accepted']
+      version = File.read(File.dirname(__FILE__) + "/../VERSION")
+      p version
+      if !(Storage['main_license_accepted'] == version)
         show_blocking_license_accept_dialog 'Sensible Cinema', 'gplv3', 'http://www.gnu.org/licenses/gpl.html'
         show_blocking_license_accept_dialog 'Sensible Cinema', 'LICENSE file', File.expand_path(File.dirname(__FILE__) + "/../LICENSE.TXT"), 'LICENSE file', 'I acknowledge that I have read the LICENSE file.'
-        Storage['main_license_accepted'] = true
+        Storage['main_license_accepted'] = version
       end
 
       setDefaultCloseOperation JFrame::EXIT_ON_CLOSE
@@ -95,8 +97,6 @@ module SensibleSwing
 
       @create = new_jbutton( "Create edited copy of DVD on Your Hard Drive, from a DVD", false )
       @create.on_clicked {
-        get_user_input('a', 'b')
-
         do_copy_dvd_to_hard_drive false
       }
 
@@ -304,12 +304,7 @@ EOL
     
     include_class javax.swing.UIManager
     def get_user_input(message, default = '')
-      require "_dbg"
-          UIManager.put("OptionPane.noButtonText", "Non");
-    UIManager.put("OptionPane.okButtonText", "D'accord");
-    UIManager.put("OptionPane.yesButtonText", "Oui");
-      
-     start_time = JOptionPane.showInputDialog(message, default)
+      start_time = JOptionPane.showInputDialog(message, default)
     end
 
     def do_copy_dvd_to_hard_drive should_prompt_for_start_and_end_times, want_full_list = false
@@ -372,7 +367,7 @@ EOL
       DriveInfo.get_drive_with_most_space_with_slash
     end
     
-    def get_mencoder_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track
+    def get_mencoder_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track, should_prompt_for_start_and_end_times
       MencoderWrapper.get_bat_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track
     end
 

data/lib/mencoder_wrapper.rb

@@ -15,10 +15,6 @@ This file is part of Sensible Cinema.
     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
-if $0 == __FILE__
-  require 'rubygems'
-  require 'sane'
-end
 
 require_relative 'vlc_programmer'
 

data/lib/mplayer_edl.rb

@@ -19,13 +19,16 @@ require_relative 'overlayer'
 
 class MplayerEdl
   def self.convert_to_edl specs
-    out = ""
+    out = []
     for type, metric in {"mutes" => 1, "blank_outs" => 0}
       specs[type].each{|start, endy, other|
-      out += "#{OverLayer.translate_string_to_seconds start} #{OverLayer.translate_string_to_seconds endy} #{metric}\n"
-    }
+        out << [OverLayer.translate_string_to_seconds(start), OverLayer.translate_string_to_seconds(endy), metric]
+      }
     end
-    out
-    
+    real_out = ''
+    out.sort.each{|start, endy, metric|
+      real_out += "#{start} #{endy} #{metric}\n"
+    }
+    real_out
   end
 end

data/sensible-cinema.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.18.0"
+  s.version = "0.18.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]

data/spec/mplayer_edl.spec.rb

@@ -25,9 +25,9 @@ describe MplayerEdl do
     a = MplayerEdl.convert_to_edl({ "mutes"=>{105=>145, "46:33.5"=>2801}, "blank_outs" => {6 => 7} } )
     # 0 for skip, 1 for mute
     a.should == <<EOL
+6.0 7.0 0
 105.0 145.0 1
 2793.5 2801.0 1
-6.0 7.0 0
 EOL
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 18
-    - 0
-  version: 0.18.0
+    - 1
+  version: 0.18.1
 platform: ruby
 authors: 
   - Roger Pack