nofxx-subtitle_it 0.6.1 → 0.6.3

data/Manifest.txt

@@ -6,6 +6,8 @@ README.markdown
 README.txt
 Rakefile
 bin/subtitle_it
+blu.rsb
+blua.rsb
 config/hoe.rb
 config/requirements.rb
 lib/subtitle_it.rb
@@ -15,6 +17,8 @@ lib/subtitle_it/formats/srt.rb
 lib/subtitle_it/formats/sub.rb
 lib/subtitle_it/formats/xml.rb
 lib/subtitle_it/formats/yml.rb
+lib/subtitle_it/movie.rb
+lib/subtitle_it/movie_hasher.rb
 lib/subtitle_it/subline.rb
 lib/subtitle_it/subtime.rb
 lib/subtitle_it/subtitle.rb

data/bin/subtitle_it

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
+#  SubtitleIt
 #
 #  Created on 2008-9-4.
 #  Copyright (c) 2008. All rights reserved.
-
+#
 begin
   require 'rubygems'
 rescue LoadError
@@ -13,10 +14,9 @@ require 'optparse'
 require 'subtitle_it'
 
 include SubtitleIt
-# NOTE: the option -p/--path= is given as an example, and should probably be replaced in your application.
 
 OPTIONS = {
- # :path     => '~',
+  :force    => false,
   :format   => nil,
   :delay    => nil
 }
@@ -30,26 +30,32 @@ Usage: #{File.basename($0)} [options] file_in [file_out]
 
 Options are:
   -c FORMAT --convert=FORMAT  Format to convert to: yml, srt or sub.
+      You don`t need to use this if fileout contains a extension.
+  
+  -f  --force     Force overwrite.
        
   -d DELAY --delay=DELAY  Fix the delay of the file.
   
+  -h  --help      Show this.
+  
+  -v  --version   Program version.
 BANNER
   opts.separator ""
-  # opts.on("-p", "--path=PATH", String,
-  #         "The root path for selecting files",
-  #         "Default: ~") { |OPTIONS[:path]| }
-          
+
   opts.on("-c", "--convert=FORMAT", String,
           "Format to convert to") { |OPTIONS[:format]| }
           
   opts.on("-d", "--delay=DELAY", Float,
           "Delay to add/remove") { |OPTIONS[:delay]| }
           
+  opts.on("-f", "--force", "Force overwrite") { OPTIONS[:force] = true }          
+          
   opts.on("-h", "--help",
           "Show this help message.") { puts opts; exit }          
-
+          
+  #FIXME: I gave up... I cant acess the version var from here... missing something.
   opts.on("-v", "--version",
-          "Show program version") { OPTIONS[:version] = true }          
+          "Show program version") {   puts 'SubtitleIt v0.6.3'; exit }          
           
   opts.parse!(ARGV)
 
@@ -57,12 +63,6 @@ BANNER
     puts opts; exit
   end
 end
-    t = Time.now
-if OPTIONS[:version]
-  include SubtitleIt
-  puts a
-  exit
-end    
 
 if ARGV.empty?
   puts parser.banner
@@ -71,45 +71,37 @@ end
 
 filein, filein_ext = ARGV[0].split('.')
 fileout, fileout_ext = ARGV[1] ? ARGV[1].split('.') : [filein, filein_ext]
-
-if File.exists?(ARGV[0])
+t = Time.now
+if File.exists?(ARGV[0]) && ( ARGV[1] || OPTIONS[:format] )
   content = File.open(ARGV[0], 'r')
   if OPTIONS[:delay]
     ARGV[1] ||= ARGV[0] + "_new"
     SubtitleIt.srt_delay(ARGV[0],ARGV[1])  
   else
-    include SubtitleIt
     puts "Working on file #{filein}..."
     sub = Subtitle.new(content, filein_ext) 
     format = OPTIONS[:format]
     format ||= fileout_ext unless fileout_ext == filein_ext
-    out = case format
-    when 'yml' then sub.to_yml
-    when 'sub' then sub.to_sub
-    when 'srt' then sub.to_srt
-    else
-      puts "Dunno what to do with this file!"
-      exit
-    end
+    out = sub.send :"to_#{format}" 
+    #TODO: rescue format not found....
   end 
 else
+  format = 'rsb'
   out = <<GEN
-header:
-  title: #{ARGV[0]}
-  authors: FIXME    
-  version: FIXME
-  
-lines:
-  - ['00:05:26.5', '2', 'worth killing for...']
+- title: #{ARGV[0]}
+- authors: FIXME 
+- version: FIXME
+00:05:26.500 => 00:05:28.500 == worth killing for...
+00:06:00.400 => 00:06:03.400 == worth dying for...
+00:07:00.300 => 00:07:03.300 == worth going to the hell for...
 GEN
-  OPTIONS[:format] = 'rsb'
 end
 
-fout = "#{fileout}.#{OPTIONS[:format]}"
+fout = "#{fileout}.#{format}"
 
-if File.writable?(fout)
-  File.open(fout, 'w') {|f| f.write(out) }  
-  puts "Done. Total time: #{Time.now - t}"
+if File.exists?(fout) && !OPTIONS[:force] 
+    puts "File exists. #{fout}"
 else
-  puts "Can`t write to #{fout}"
-end
+  File.open(fout, 'w') {|f| f.write(out) }  
+  puts "Done. Wrote: #{fout} in #{Time.now - t}s."
+end

data/lib/subtitle_it/formats/xml.rb

@@ -39,8 +39,8 @@ module SubtitleIt
     def xml_lines
       @lines.inject([]) do |i,l| 
         toff = l.text_off - l.text_on
-        i << "<p begin=\"#{l.text_on}\" dur=\"#{toff}\">#{l.text}</p>"
-      end
+        i << "      <p begin=\"#{l.text_on}\" dur=\"#{toff}\">#{l.text}</p>"
+      end.join("\n")
     end
         
     def to_xml
@@ -48,17 +48,17 @@ module SubtitleIt
 <?xml version="1.0" encoding="UTF-8"?>
 <tt xml:lang="en" xmlns="http://www.w3.org/2006/04/ttaf1"  xmlns:tts="http://www.w3.org/2006/04/ttaf1#styling">
   <head>
-    <styling>
-      #{@style}
+    <styling>#{@style + "\n" if @style}
     </styling>
   </head>
   <body>
     <div xml:lang="en">
-      #{xml_lines}                
+#{xml_lines}                
     </div>
   </body>
 </tt>
 XML
+    out.chomp
     end    
   end
 end

data/lib/subtitle_it/movie.rb

@@ -0,0 +1,25 @@
+# downsub - github.com/johanlunds/downsub
+require 'down_sub/movie_hasher'
+
+module SubtitleIt
+  class Movie
+    EXTS = %w(3g2 3gp 3gp2 3gpp 60d ajp asf asx avchd avi bik bix box cam dat divx dmf dv dvr-ms evo flc fli flic flv flx gvi gvp h264 m1v m2p m2ts m2v m4e m4v mjp mjpeg mjpg mkv moov mov movhd movie movx mp4 mpe mpeg mpg mpv mpv2 mxf nsv nut ogg ogm omf ps qt ram rm rmvb swf ts vfw vid video viv vivo vob vro wm wmv wmx wrap wvx wx x264 xvid)
+
+    attr_reader :filename
+    attr_accessor :info
+
+    def initialize(filename)
+      @filename = filename
+      @hash = nil
+      @info = {}
+    end
+
+    def hash
+      @hash ||= MovieHasher::compute_hash(@filename)
+    end
+
+    def size
+      File.size(@filename)
+    end
+  end
+end

data/lib/subtitle_it/movie_hasher.rb

@@ -0,0 +1,30 @@
+# downsub - github.com/johanlunds/downsub
+module SubtitleIt
+  module MovieHasher
+
+    CHUNK_SIZE = 64 * 1024 # in bytes
+
+    def self.compute_hash(filename)
+      filesize = File.size(filename)
+      hash = filesize
+
+      # Read 64 kbytes, divide up into 64 bits and add each
+      # to hash. Do for beginning and end of file.
+      File.open(filename, 'rb') do |f|    
+        # Q = unsigned long long = 64 bit
+        f.read(CHUNK_SIZE).unpack("Q*").each do |n|
+          hash = hash + n & 0xffffffffffffffff # to remain as 64 bit number
+        end
+
+        f.seek([0, filesize - CHUNK_SIZE].max, IO::SEEK_SET)
+
+        # And again for the end of the file
+        f.read(CHUNK_SIZE).unpack("Q*").each do |n|
+          hash = hash + n & 0xffffffffffffffff
+        end
+      end
+
+      sprintf("%016x", hash)
+    end
+  end
+end

data/lib/subtitle_it/subtime.rb

@@ -9,6 +9,9 @@ module SubtitleIt
       parse_subtime(sym)    
     end
         
+    # parses string like '00:00:00,000'
+    # as well as an integer, representanting 
+    # the time in ms. 
     def parse_subtime(sym)
       if sym.kind_of?(Numeric)
         @hrs = sym / 3600000
@@ -33,13 +36,15 @@ module SubtitleIt
         raise "Wrong time format"
       end
     end
-       
-    def to_s
-      "%02d:%02d:%02d.%s" % [@hrs, @min, @sec, ("%03d" % @ms) ]
+    
+    # to_s(separator) => to_s(",") => 00:00:00,000
+    def to_s(sep='.')
+      "%02d:%02d:%02d#{sep}%03d" % [@hrs, @min, @sec,  @ms]
     end
     
+    # return time as a total in ms
     def to_i
-      to_s.to_msec
+      ( @hrs * 3600 + @min * 60 + @sec ) * 1000 + @ms
     end
     
     def +(other)

data/lib/subtitle_it/version.rb

@@ -2,7 +2,7 @@ module SubtitleIt
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 6
-    TINY  = 1
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/subtitle_it.rb

@@ -13,34 +13,4 @@ class Numeric
   def reduce
     self / ( 10 ** Math::log10(self).to_i)
   end
-end
-
-class String 
-  def to_msec
-    # convert string in time format to milli sec format 
-    # "12:23:34,567" => "12*60*60*1000 + 23*60*1000 + 34 *1000 + 567"
-    time_list = self.split(/:/)
-    sec, msec = time_list.pop().split(/,|\./) 
-    time_list.push(sec)
-    p time_list if $DEBUG
-    msecs = msec.to_i
-    time_list.reverse!
-    time_list.each_with_index { |x,i| msecs += x.to_i * 60**i * 1000 }
-    p msecs if $DEBUG
-    msecs#.to_s
-  end
-end
-
-class Fixnum
-  def to_time()
-    # convert millisec to standard time format
-    # 3600 * 1000 = ,000
-    time = self
-    msec = "%.3d" % (time % 1000)
-    time /= 1000
-    time_list = []
-    3.times { time_list.unshift( "%.2d"% (time%60) ) ; time /= 60 }
-    p time_list if $DEBUG
-    [ time_list.join(':'),msec ].join(',')
-  end
 end

data/spec/subtitle_it/formats/xml_spec.rb

@@ -40,7 +40,21 @@ describe Formats, ".xml" do
     end
     
     it "should equal..." do
-      @sub.to_xml.should eql("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<tt xml:lang=\"en\" xmlns=\"http://www.w3.org/2006/04/ttaf1\"  xmlns:tts=\"http://www.w3.org/2006/04/ttaf1#styling\">\n  <head>\n    <styling>\n      \n    </styling>\n  </head>\n  <body>\n    <div xml:lang=\"en\">\n      <p begin=\"00:05:26.500\" dur=\"00:00:02.000\">worth killing for...</p><p begin=\"00:06:00.400\" dur=\"00:00:03.000\">worth dying for...</p><p begin=\"00:07:00.300\" dur=\"00:00:03.000\">worth going to the hell for...</p><p begin=\"00:07:00.300\" dur=\"00:00:03.000\">worth going a | line...</p>                \n    </div>\n  </body>\n</tt>\n")
+      @sub.to_xml.should eql("<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<tt xml:lang=\"en\" xmlns=\"http://www.w3.org/2006/04/ttaf1\"  xmlns:tts=\"http://www.w3.org/2006/04/ttaf1#styling\">
+  <head>
+    <styling>
+    </styling>
+  </head>
+  <body>
+    <div xml:lang=\"en\">
+      <p begin=\"00:05:26.500\" dur=\"00:00:02.000\">worth killing for...</p>
+      <p begin=\"00:06:00.400\" dur=\"00:00:03.000\">worth dying for...</p>
+      <p begin=\"00:07:00.300\" dur=\"00:00:03.000\">worth going to the hell for...</p>
+      <p begin=\"00:07:00.300\" dur=\"00:00:03.000\">worth going a | line...</p>                
+    </div>
+  </body>
+</tt>")
     end
   end
 end

data/subtitle_it.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{subtitle_it}
-  s.version = "0.6.1"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini", "Warlley Rezende"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email = ["x@nofxx.com"]
   s.executables = ["subtitle_it"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "README.markdown"]
-  s.files = [".autotest", "History.txt", "License.txt", "Manifest.txt", "README.markdown", "README.txt", "Rakefile", "bin/subtitle_it", "config/hoe.rb", "config/requirements.rb", "lib/subtitle_it.rb", "lib/subtitle_it/formats/ass.rb", "lib/subtitle_it/formats/rsb.rb", "lib/subtitle_it/formats/srt.rb", "lib/subtitle_it/formats/sub.rb", "lib/subtitle_it/formats/xml.rb", "lib/subtitle_it/formats/yml.rb", "lib/subtitle_it/subline.rb", "lib/subtitle_it/subtime.rb", "lib/subtitle_it/subtitle.rb", "lib/subtitle_it/version.rb", "script/console", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/fixtures/godfather.srt", "spec/fixtures/huge.ass", "spec/fixtures/movie.xml", "spec/fixtures/movie.yml", "spec/fixtures/pseudo.rsb", "spec/fixtures/pulpfiction.sub", "spec/fixtures/sincity.yml", "spec/spec.opts", "spec/spec_helper.rb", "spec/subtitle_it/formats/ass_spec.rb", "spec/subtitle_it/formats/rsb_spec.rb", "spec/subtitle_it/formats/srt_spec.rb", "spec/subtitle_it/formats/sub_spec.rb", "spec/subtitle_it/formats/xml_spec.rb", "spec/subtitle_it/formats/yml_spec.rb", "spec/subtitle_it/subline_spec.rb", "spec/subtitle_it/subtime_spec.rb", "spec/subtitle_it/subtitle_spec.rb", "spec/subtitle_it_spec.rb", "subtitle_it.gemspec", "tasks/deployment.rake", "tasks/environment.rake", "tasks/rspec.rake"]
+  s.files = [".autotest", "History.txt", "License.txt", "Manifest.txt", "README.markdown", "README.txt", "Rakefile", "bin/subtitle_it", "blu.rsb", "blua.rsb", "config/hoe.rb", "config/requirements.rb", "lib/subtitle_it.rb", "lib/subtitle_it/formats/ass.rb", "lib/subtitle_it/formats/rsb.rb", "lib/subtitle_it/formats/srt.rb", "lib/subtitle_it/formats/sub.rb", "lib/subtitle_it/formats/xml.rb", "lib/subtitle_it/formats/yml.rb", "lib/subtitle_it/movie.rb", "lib/subtitle_it/movie_hasher.rb", "lib/subtitle_it/subline.rb", "lib/subtitle_it/subtime.rb", "lib/subtitle_it/subtitle.rb", "lib/subtitle_it/version.rb", "script/console", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/fixtures/godfather.srt", "spec/fixtures/huge.ass", "spec/fixtures/movie.xml", "spec/fixtures/movie.yml", "spec/fixtures/pseudo.rsb", "spec/fixtures/pulpfiction.sub", "spec/fixtures/sincity.yml", "spec/spec.opts", "spec/spec_helper.rb", "spec/subtitle_it/formats/ass_spec.rb", "spec/subtitle_it/formats/rsb_spec.rb", "spec/subtitle_it/formats/srt_spec.rb", "spec/subtitle_it/formats/sub_spec.rb", "spec/subtitle_it/formats/xml_spec.rb", "spec/subtitle_it/formats/yml_spec.rb", "spec/subtitle_it/subline_spec.rb", "spec/subtitle_it/subtime_spec.rb", "spec/subtitle_it/subtitle_spec.rb", "spec/subtitle_it_spec.rb", "subtitle_it.gemspec", "tasks/deployment.rake", "tasks/environment.rake", "tasks/rspec.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/nofxx/subtitle_it}
   s.post_install_message = %q{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-subtitle_it
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -53,6 +53,8 @@ files:
 - README.txt
 - Rakefile
 - bin/subtitle_it
+- blu.rsb
+- blua.rsb
 - config/hoe.rb
 - config/requirements.rb
 - lib/subtitle_it.rb
@@ -62,6 +64,8 @@ files:
 - lib/subtitle_it/formats/sub.rb
 - lib/subtitle_it/formats/xml.rb
 - lib/subtitle_it/formats/yml.rb
+- lib/subtitle_it/movie.rb
+- lib/subtitle_it/movie_hasher.rb
 - lib/subtitle_it/subline.rb
 - lib/subtitle_it/subtime.rb
 - lib/subtitle_it/subtitle.rb