nofxx-subtitle_it 0.7.5 → 0.7.6

data/History.txt

@@ -40,4 +40,8 @@
 
 * 2 major enhancement
   * Support multiple file downloads
-  * subtitle_it worker code rewritten 
+  * subtitle_it worker code rewritten 
+
+== 0.7.6 2008-09-17
+* 1 major enhancement:
+  * Fixes a bug (platform dependent end-of-line)

data/lib/subtitle_it/bin.rb

@@ -8,7 +8,7 @@ module SubtitleIt
       content = File.open(file, 'r')
       STDOUT.puts "Working on file #{file}..."
       sub = Subtitle.new({ :dump => content, :format => Bin.get_extension(file) })
-      dump = sub.send :"to_#{format}" 
+      dump = sub.send :"to_#{format}"
       Bin::write_out(Bin.swap_extension(file, format), dump)
     end
   end
@@ -58,7 +58,6 @@ module SubtitleIt
   end
 
   class Bin   
-
     def Bin.run! argv, format=nil, force=false, delay=nil
       raise unless argv
       @force = force
@@ -94,6 +93,13 @@ module SubtitleIt
       file.split(".").last
     end
     
+    def Bin.get_enc_platform(filename)
+      raise unless File.exist?(filename)
+      File.open(filename, 'r') do |fd| 
+        fd.gets =~ /\r\n/ ? "WIN" : "UNIX"
+      end
+    end
+
     def Bin.swap_extension(file,extension)
       f = file.dup
       f[-3..-1] = extension
@@ -109,4 +115,4 @@ module SubtitleIt
       end
     end
   end
-end
+end

data/lib/subtitle_it/formats/ass.rb

@@ -2,14 +2,12 @@
 #  ASS - http://en.wikipedia.org/wiki/SubStation_Alpha
 #  http://www.malakith.net/aegiwiki/ASS
 #
-module SubtitleIt
-  module Formats    
-    def parse_ass
+module Formats    
+  def parse_ass
 
-    end
-    
-    #not mine!
-    def to_ass
-    end    
   end
-end
+  
+  #not mine!
+  def to_ass
+  end    
+end

data/lib/subtitle_it/formats/mpl.rb

@@ -5,24 +5,25 @@
 #
 # Where N is sec * 10
 #
-module SubtitleIt
-  module Formats       
-    def parse_mpl
-      @raw.to_a.inject([]) do |i,l|
-  			line_data = l.scan(/^\[([0-9]{1,})\]\[([0-9]{1,})\](.+)$/)
-  			line_data = line_data.at 0
-  			time_on, time_off, text = line_data
-  			time_on, time_off = [time_on.to_i, time_off.to_i].map { |t| t.to_i * 1000 }	    
-        i << Subline.new(time_on, time_off, text.chomp)
-      end
+module Formats       
+  include PlatformEndLine
+  def parse_mpl
+    @raw.to_a.inject([]) do |i,l|
+		      line_data = l.scan(/^\[([0-9]{1,})\]\[([0-9]{1,})\](.+)$/)
+		      line_data = line_data.at 0
+		      time_on, time_off, text = line_data
+		      time_on, time_off = [time_on.to_i, time_off.to_i].map { |t| t.to_i * 1000 }	    
+      i << Subline.new(time_on, time_off, text.chomp)
     end
-        
-    def to_mpl
-      @lines.inject([]) do |i,l|
-        start = l.time_on.to_i / 100
-        stop = l.time_off.to_i / 100
-        i << "[%d][%d]%s" % [start, stop, l.text]
-      end.join("\n")
-    end    
-  end 
-end
+  end
+      
+  def to_mpl
+    endl = endline( @raw )
+    line_ary = []
+    @lines.each do |l|
+      start, stop = [l.time_on, l.time_off].map { |val| val.to_i / 100 }
+      line_ary << "[%d][%d]%s" % [start, stop, l.text]
+    end
+    return line_ary.join( endl ) + endl
+  end    
+end 

data/lib/subtitle_it/formats/rsb.rb

@@ -8,25 +8,30 @@
 #
 # Where N is the seconds to last.
 #
-module SubtitleIt
-  module Formats
-    def parse_rsb
-      inn = @raw.to_a
-      @title = inn.delete_at(0).split(':')[1] 
-      @authors = inn.delete_at(0).split(':')[1] 
-      @version = inn.delete_at(0).split(':')[1] 
-      inn.inject([]) do |final,line|
-        time_on,time_off = line.split('=>').map { |t| t.strip }
-        text = line.split('==')[1].strip
-        final << Subline.new(time_on, time_off, text)
-      end
+module Formats
+  include PlatformEndLine
+  def parse_rsb
+    inn = @raw.to_a
+    @title = inn.delete_at(0).split(':')[1] 
+    @authors = inn.delete_at(0).split(':')[1] 
+    @version = inn.delete_at(0).split(':')[1] 
+    inn.inject([]) do |final,line|
+      time_on,time_off = line.split('=>').map { |t| t.strip }
+      text = line.split('==')[1].strip
+      final << Subline.new(time_on, time_off, text)
     end
-    
-    def to_rsb
-      out = "- title: #{@title}\n- authors: #{@authors}\n- version: #{@version}\n"
-      out << @lines.inject([]) do |i,l|
-        i << "%s => %s == %s" % [l.time_on.to_s, l.time_off.to_s, l.text]
-      end.join("\n")      
-    end    
   end
-end
+  
+  def to_rsb
+    endl = endline( @raw )
+    out = ["- title: #{@title}", "- authors: #{@authors}", "- version: #{@version}"]
+    @lines.each do |l|
+      out << "%s => %s == %s" % [l.time_on.to_s, l.time_off.to_s, l.text]
+    end      
+    return out.join( endl ) + endl
+    #out = "- title: #{@title}\n- authors: #{@authors}\n- version: #{@version}\n"
+    #out << @lines.inject([]) do |i,l|
+    #  i << "%s => %s == %s" % [l.time_on.to_s, l.time_off.to_s, l.text]
+    #end.join("\n")      
+  end    
+end

data/lib/subtitle_it/formats/srt.rb

@@ -8,29 +8,30 @@
 #
 # Where N is the sub index number
 #
-module SubtitleIt
-  module Formats    
-    def parse_srt 
-      @raw.split(/\n\n/).inject([]) do |final,line|
-        line = line.split(/\n/)
-        line.delete_at(0)
-        time_on,time_off = line[0].split('-->').map { |t| t.strip }
-        line.delete_at(0)        
-        text = line.join("|")
-        final << Subline.new(time_on, time_off, text)
-      end
+module Formats    
+  include PlatformEndLine
+  def parse_srt
+    endl = endline( @raw )
+    @raw.split( endl*2 ).inject([]) do |final,line|
+      line = line.split(endl)
+      line.delete_at(0)
+      time_on,time_off = line[0].split('-->').map { |t| t.strip }
+      line.delete_at(0)        
+      text = line.join("|")
+      final << Subline.new(time_on, time_off, text)
     end
-
-    def to_srt
-      out = []
-      @lines.each_with_index do |l,i|
-        out << "#{i+1}"
-        out << "%s --> %s" % [l.time_on.to_s(','), l.time_off.to_s(',')]
-        out << l.text.gsub("|","\n") + "\n"
-      end
-      out.join("\n")
-    end    
   end
+
+  def to_srt
+    endl = endline( @raw )
+    out = []
+    @lines.each_with_index do |l,i|
+      out << "#{i+1}"
+      out << "%s --> %s" % [l.time_on.to_s(','), l.time_off.to_s(',')]
+      out << l.text.gsub("|", endl) + endl
+    end
+    out.join( endl )
+  end    
 end
 
 #looks like subrip accepts some styling:
@@ -41,4 +42,4 @@ end
 #     sdict.add(new StyledFormat(UNDERLINE, "u", true));
 #     sdict.add(new StyledFormat(UNDERLINE, "/u", false));
 #     sdict.add(new StyledFormat(STRIKETHROUGH, "s", true));
-#     sdict.add(new StyledFormat(STRIKETHROUGH, "/s", false));
+#     sdict.add(new StyledFormat(STRIKETHROUGH, "/s", false));

data/lib/subtitle_it/formats/sub.rb

@@ -15,33 +15,35 @@
 #
 # parts of the code from 'simplesubtitler' from Marcin (tiraeth) Chwedziak 
 #
-module SubtitleIt
-  module Formats
-    #between our formats, what changes can be reduced to a value
-    def ratio
-     1      
+module Formats
+  include PlatformEndLine
+  #between our formats, what changes can be reduced to a value
+  def ratio
+   1      
+  end
+	 
+  def parse_sub
+    @raw.to_a.inject([]) do |i,l|
+		      line_data = l.scan(/^\{([0-9]{1,})\}\{([0-9]{1,})\}(.+)$/)
+		      line_data = line_data.at 0
+		      time_on, time_off, text = line_data
+		      time_on, time_off = [time_on.to_i, time_off.to_i].map do |t| 
+			(t.to_i / @fps * 1000 / ratio).to_i 
+		      end	    
+      i << Subline.new(time_on, time_off, text.chomp)
     end
-           
-    def parse_sub
-      @raw.to_a.inject([]) do |i,l|
-  			line_data = l.scan(/^\{([0-9]{1,})\}\{([0-9]{1,})\}(.+)$/)
-  			line_data = line_data.at 0
-  			time_on, time_off, text = line_data
-  			time_on, time_off = [time_on.to_i, time_off.to_i].map do |t| 
-  			  (t.to_i / @fps * 1000 / ratio).to_i 
-  			end	    
-        i << Subline.new(time_on, time_off, text.chomp)
-      end
+  end
+      
+  def to_sub
+    endl = endline( @raw )
+    line_ary = []
+    @lines.each do |l| 
+      line_ary << "{%d}{%d}%s" % [parse_time(l.time_on), parse_time(l.time_off), l.text]
     end
-        
-    def to_sub
-      @lines.inject([]) do |i,l|
-        i << "{%d}{%d}%s" % [parse_time(l.time_on), parse_time(l.time_off), l.text]
-      end.join("\r\n")
-    end
-    
-    def parse_time(n)
-      n.to_i / 1000 * @fps * ratio
-    end
-  end 
-end
+    return line_ary.join( endl ) + endl
+  end
+  
+  def parse_time(n)
+    n.to_i / 1000 * @fps * ratio
+  end
+end 

data/lib/subtitle_it/formats/xml.rb

@@ -20,34 +20,37 @@
 #  </body>
 #</tt>
 require 'hpricot'
-module SubtitleIt
-  module Formats    
-    
-    def parse_xml
-      final = []
-      doc = Hpricot.XML(@raw)
-      (doc/'tt'/'p').each do |line|
-        time_on = line[:begin]
-        time_off = line[:dur]
-        text = line.innerHTML
-        final << Subline.new(time_on,time_off,text)
-      end
-      final
+module Formats    
+  include PlatformEndLine
+  
+  def parse_xml
+    final = []
+    doc = Hpricot.XML(@raw)
+    (doc/'tt'/'p').each do |line|
+      time_on, time_off = ['begin', 'dur'].map { |str| line[str.to_sym] }
+      text = line.innerHTML
+      final << Subline.new(time_on,time_off,text)
     end
-    
-    def xml_lines
-      @lines.inject([]) do |i,l| 
-        toff = l.time_off - l.time_on
-        i << "      <p begin=\"#{l.time_on}\" dur=\"#{toff}\">#{l.text}</p>"
-      end.join("\n")
+    return final
+  end
+  
+  def xml_lines
+    endl = endline( @raw )
+    line_ary = []
+    @lines.each do |l|
+      toff = l.time_off - l.time_on
+      line_ary << "      <p begin=\"#{l.time_on}\" dur=\"#{toff}\">#{l.text}</p>"
     end
-        
-    def to_xml
-      out = <<XML
+    return line_ary.join( endl ) + endl
+  end
+      
+  def to_xml
+    endl = endline( @raw )
+    out = <<XML
 <?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 + "\n" if @style}
+    <styling>#{@style + endl if @style}
     </styling>
   </head>
   <body>
@@ -57,7 +60,6 @@ module SubtitleIt
   </body>
 </tt>
 XML
-    out.chomp
-    end    
-  end
-end
+  out.chomp
+  end    
+end

data/lib/subtitle_it/formats/yml.rb

@@ -2,19 +2,17 @@
 # YML Dump
 #
 require 'yaml'
-module SubtitleIt
-  module Formats    
-    def parse_yml
-      @yaml = YAML::load(@raw)
-      header = @yaml.delete('header')
-      @title = header['title']
-      @author = header['authors']
-      @version = header['version']
-      @yaml['lines'].map { |l| Subline.new(l[0], l[1], l[2]) }
-    end
-        
-    def to_yml
-      YAML.dump(self)
-    end    
+module Formats    
+  def parse_yml
+    @yaml = YAML::load(@raw)
+    header = @yaml.delete('header')
+    @title = header['title']
+    @author = header['authors']
+    @version = header['version']
+    @yaml['lines'].map { |l| Subline.new(l[0], l[1], l[2]) }
   end
-end
+      
+  def to_yml
+    YAML.dump(self)
+  end    
+end

data/lib/subtitle_it/platform_endl.rb

@@ -0,0 +1,9 @@
+module PlatformEndLine
+  def platform( raw ) 
+    raw =~ /\r\n/ ? "WIN" : "UNIX"
+  end
+  def endline( raw )
+    platform( raw ) == "WIN" ? "\r\n" : "\n"
+  end
+end
+

data/lib/subtitle_it/subtitle.rb

@@ -6,7 +6,6 @@ require 'subtitle_it/formats/xml'
 require 'subtitle_it/formats/mpl'
 
 module SubtitleIt
-  include Formats
   
   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)
   SUB_EXTS = %w(srt sub smi txt ssa ass mpl xml yml rsb)
@@ -17,6 +16,7 @@ module SubtitleIt
   }
   
   class Subtitle    
+    include Formats
     attr_reader :id, :raw, :format, :lines, :style, :info, :filename, :rating
     
     def initialize(args = {})
@@ -64,4 +64,4 @@ module SubtitleIt
       @lines = lines
     end  
   end
-end
+end

data/lib/subtitle_it/version.rb

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

data/lib/subtitle_it.rb

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'subtitle_it/version'
 require 'subtitle_it/subtime'
 require 'subtitle_it/subline'
+require 'subtitle_it/platform_endl'
 require 'subtitle_it/subtitle'
 require 'subtitle_it/subdown'
 require 'subtitle_it/substyle'
@@ -17,4 +18,4 @@ class Numeric
   def reduce
     self / ( 10 ** Math::log10(self).to_i)
   end
-end
+end

data/subtitle_it.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |s|
   s.name = %q{subtitle_it}
-  s.version = "0.7.5"
+  s.version = "0.7.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marcos Piccinini", "Warlley Rezende"]
-  s.date = %q{2008-09-13}
+  s.authors = ["Marcos Piccinini", "Warlley Rezende", "Giovanni Rapagnani"]
+  s.date = %q{2008-09-17}
   s.default_executable = %q{subtitle_it}
   s.description = %q{description of gem}
   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/bin.rb", "lib/subtitle_it/fixes.rb", "lib/subtitle_it/formats/ass.rb", "lib/subtitle_it/formats/mpl.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/generator.rb", "lib/subtitle_it/movie.rb", "lib/subtitle_it/movie_hasher.rb", "lib/subtitle_it/subdown.rb", "lib/subtitle_it/subline.rb", "lib/subtitle_it/substyle.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/puplfiction.mpl", "spec/fixtures/sincity.yml", "spec/spec.opts", "spec/spec_helper.rb", "spec/subtitle_it/bin_spec.rb", "spec/subtitle_it/fixes_spec.rb", "spec/subtitle_it/formats/ass_spec.rb", "spec/subtitle_it/formats/mpl_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/generator_spec.rb", "spec/subtitle_it/movie_hasher_spec.rb", "spec/subtitle_it/movie_spec.rb", "spec/subtitle_it/subdown_spec.rb", "spec/subtitle_it/subline_spec.rb", "spec/subtitle_it/substyle_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", "config/hoe.rb", "config/requirements.rb", "lib/subtitle_it.rb", "lib/subtitle_it/bin.rb", "lib/subtitle_it/fixes.rb", "lib/subtitle_it/formats/ass.rb", "lib/subtitle_it/formats/mpl.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/generator.rb", "lib/subtitle_it/movie.rb", "lib/subtitle_it/movie_hasher.rb", "lib/subtitle_it/subdown.rb", "lib/subtitle_it/subline.rb", "lib/subtitle_it/substyle.rb", "lib/subtitle_it/subtime.rb",  "lib/subtitle_it/platform_endl.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/puplfiction.mpl", "spec/fixtures/sincity.yml", "spec/spec.opts", "spec/spec_helper.rb", "spec/subtitle_it/bin_spec.rb", "spec/subtitle_it/fixes_spec.rb", "spec/subtitle_it/formats/ass_spec.rb", "spec/subtitle_it/formats/mpl_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/generator_spec.rb", "spec/subtitle_it/movie_hasher_spec.rb", "spec/subtitle_it/movie_spec.rb", "spec/subtitle_it/subdown_spec.rb", "spec/subtitle_it/subline_spec.rb", "spec/subtitle_it/substyle_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{
@@ -38,4 +38,4 @@ For more information on subtitle_it, see http://github.com/nofxx/subtitle_it
   else
     s.add_dependency(%q<hoe>, [">= 1.7.0"])
   end
-end
+end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-subtitle_it
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - Marcos Piccinini
 - Warlley Rezende
+- Giovanni Rapagnani
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-09-13 00:00:00 -07:00
+date: 2008-09-17 00:00:00 -07:00
 default_executable: subtitle_it
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +73,7 @@ files:
 - lib/subtitle_it/subline.rb
 - lib/subtitle_it/substyle.rb
 - lib/subtitle_it/subtime.rb
+- lib/subtitle_it/platform_endl.rb
 - lib/subtitle_it/subtitle.rb
 - lib/subtitle_it/version.rb
 - script/console