warlley-subtitle_it 0.7.4 → 0.7.5

data/History.txt

@@ -34,4 +34,10 @@
 * 4 major enhancements:
   * Adds download opensubtitles support
   * Fixes various bugs (and adds another ones)
-  * Adds MPL2 support
+  * Adds MPL2 support
+
+== 0.7.5 2008-09-13
+
+* 2 major enhancement
+  * Support multiple file downloads
+  * subtitle_it worker code rewritten 

data/README.txt

@@ -1,6 +1,6 @@
 = Subtitle It
 
-Ruby tool to work with subtitle files.
+Ruby tool to download, create, convert and fix subtitles.
 
 
 == FEATURES:
@@ -9,8 +9,10 @@ Ruby tool to work with subtitle files.
 * Download from opensubtitles.org
 * Fixes delays. (SrtResync)
 
+
 == TODO:
 
+* Support styles
 * Compatibility with "sube" (http://github.com/vic/sube)
 * Fix delays
 * Convert 1 to 2 CD`s and versa-vice
@@ -28,6 +30,8 @@ Bash tool:
 
 Convert a srt to sub:
   subtitle_it in.srt out.sub
+  or
+  subtitle_it -c sub in.srt
 
 Add a delay of 1 minute:
   subtitle_it -d 60 in.srt
@@ -38,7 +42,8 @@ Create a template
 
 == INSTALL:
 
- sudo gem install SubtitleIt
+ gem sources add http://gems.github.com
+ sudo gem install nofxx-subtitle_it
 
 
 == THE "Ruby Subtitle" Format - RSB

data/lib/subtitle_it/bin.rb

@@ -6,8 +6,8 @@ module SubtitleIt
     def run!(file, format)
       raise unless format
       content = File.open(file, 'r')
-      puts "Working on file #{file}..."
-      sub = Subtitle.new(nil, content, Bin.get_extension(file))       
+      STDOUT.puts "Working on file #{file}..."
+      sub = Subtitle.new({ :dump => content, :format => Bin.get_extension(file) })
       dump = sub.send :"to_#{format}" 
       Bin::write_out(Bin.swap_extension(file, format), dump)
     end
@@ -19,13 +19,13 @@ module SubtitleIt
       @down = Subdown.new
       @down.log_in!
       res = @down.search_subtitles(@movie)
-      puts "Found #{res.length} result#{"s" if res.length > 1}. Choose one:\n"
-      res.sort.each_with_index { |r,i| puts print_option(r,i) }
-      puts "You can choose multiple ones, separated with spaces or a range separated with hifen."      
-      printf "Choose: "  
+      STDOUT.puts "Found #{res.length} result#{"s" if res.length > 1}. Choose one:\n"
+      res.sort.each_with_index { |r,i| STDOUT.puts print_option(r,i) }
+      STDOUT.puts "You can choose multiple ones, separated with spaces or a range separated with hifen."      
+      STDOUT.printf "Choose: "  
       choose = parse_input(STDIN.gets.chomp)
       choose = choose.map { |c| res[c.to_i-1] }     
-      puts "Downloading #{choose.length} subtitles..."
+      STDOUT.puts "Downloading #{choose.length} subtitles..."
       choose.each do |sub| 
         down_a_sub(sub, sub.format)
       end
@@ -64,24 +64,26 @@ module SubtitleIt
       @force = force
       @format = format
       
-      if File.exists?(argv[0]) # && ( argv[1] || format )              
-        @file_in = argv[0]
-        @file_in_ext = Bin.get_extension(@file_in)        
-        if argv[1]
-          @file_out = argv[1] 
-          @file_out_ext = Bin.get_extension(@file_out)
-          @format = @file_out_ext
-        end        
-        if MOVIE_EXTS.include? @file_in_ext
-          Subdownloader.new.run!(argv[0])        
-        elsif SUB_EXTS.include? @file_in_ext
-          Subwork.new.run!(@file_in, @format)
-        else
-          raise "Unknown file."
-        end
+      unless File.exists?(argv[0]) 
+        #        generate_rsb
+        return
+      end
+      
+      @file_in = argv[0]
+      @file_in_ext = Bin.get_extension(@file_in)        
+      if argv[1]
+        @file_out = argv[1] 
+        @file_out_ext = Bin.get_extension(@file_out)
+        @format = @file_out_ext
+      end        
+      if MOVIE_EXTS.include? @file_in_ext
+        Subdownloader.new.run!(argv[0])        
+      elsif SUB_EXTS.include? @file_in_ext
+        Subwork.new.run!(@file_in, @format)
       else
-#        generate_rsb
+        raise "Unknown file."
       end
+
     rescue Exception => e
       puts e.message
       exit 1
@@ -100,10 +102,10 @@ module SubtitleIt
     
     def Bin.write_out(filename,dump)
       if File.exists?(filename) && !@force
-          puts "File exists. #{filename}"
+          STDOUT.puts "File exists. #{filename}"
       else
         File.open(filename, 'w') {|f| f.write(dump) }  
-        puts "Done. Wrote: #{filename}."
+        STDOUT.puts "Done. Wrote: #{filename}."
       end
     end
   end

data/lib/subtitle_it/subdown.rb

@@ -48,7 +48,7 @@ module SubtitleIt
       result = call('SearchSubtitles', [args])
       return [] unless result['data'] # if no results result['data'] == false
       result['data'].inject([]) do |subs, sub_info|
-        subs << Subtitle.new(sub_info)
+        subs << Subtitle.new({:info => sub_info})
         subs
       end
     end

data/lib/subtitle_it/subtitle.rb

@@ -10,28 +10,26 @@ module SubtitleIt
   
   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)
+  #TODO: create a lang class?
+  LANGS = {
+    :pb => 'Brazilian Portuguese',
+    :en => 'English'        
+  }
   
   class Subtitle    
     attr_reader :id, :raw, :format, :lines, :style, :info, :filename, :rating
     
-    def initialize(info=nil,dump=nil,format=nil)
-      if @info = info
-        @id       = info['IDSubtitleFile'].to_i
-        @filename = info['SubFileName'].to_s 
-        @format   = info['SubFormat'].to_s 
-        @rating   = info['SubRating'].to_f
+    def initialize(args = {})
+      if @info = args[:info]
+        @id       = @info['IDSubtitleFile'].to_i
+        @filename = @info['SubFileName'].to_s 
+        @format   = @info['SubFormat'].to_s 
+        @rating   = @info['SubRating'].to_f
       end
-      @fps=23.976      
-      parse_dump(dump,format) if dump
+      @fps = args[:fps] || 23.976      
+      parse_dump(args[:dump], args[:format]) if args[:dump]
     end
     
-    def parse_dump(dump,format)
-      raise unless format =~ /^srt$|sub|yml|txt|rsb|xml|ass|mpl/
-      @raw = dump.kind_of?(String) ? dump : dump.read
-      @format = format
-      parse!
-    end
-
     def style=(s)
       @style = s
     end
@@ -51,7 +49,14 @@ module SubtitleIt
 
     private
     
-    def parse!
+    def parse_dump(dump,format)
+      raise unless SUB_EXTS.include?(format)
+      @raw = dump.kind_of?(String) ? dump : dump.read
+      @format = format
+      parse_lines!
+    end
+    
+    def parse_lines!
       self.lines = send :"parse_#{@format}"      
     end
     

data/lib/subtitle_it/version.rb

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

data/spec/subtitle_it/bin_spec.rb

@@ -1,21 +1,34 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 module BinspecHelper
-  def mock_xmlrpc(stubs={})
-    @mock_xmlrpc ||= mock(XMLRPC::Client, stubs)#, @auth=nil, @parser=nil, @user=nil, @timeout=30, @cookie=nil, @http=#<Net::HTTP www.opensubtitles.org:80 open=false>, @use_ssl=false, @http_last_response=nil, @port=80, @host="www.opensubtitles.org", @path="/xml-rpc", @http_header_extra=nil, @create=nil, @password=nil, @proxy_port=nil, @proxy_host=nil> 
-  end
+  def mock_xmlrpc(stubs={});    @mock_xmlrpc ||= mock(XMLRPC::Client, stubs);  end
+  def mock_subdown;             @mock_subdown = mock(Subdown);  end
+  def mock_file;                @mock_file = mock(File);  end
+  
   def mock_movie
-    @mock_movie = mock(Movie, {:filename => "Beavis Butthead Do America", 
+    @mock_movie = mock(Movie, {:filename => "Beavis Butthead Do America.avi", 
       :haxx => '09a2c497663259cb' })
   end
-  def mock_subdown
-    @mock_subdown = mock(Subdown)
-  end
+  
   def mock_subtitle
-    @mock_subtitle = mock(Subtitle)
-  end  
-  def mock_file
-    @mock_file = mock(File)
+    @mock_subtitle = mock(Subtitle, { 
+      :info => sub_info, :format => 'srt'
+    })
+  end
+  
+  def sub_info
+    { 
+      "SubLanguageID" => 'eng',
+      "MovieName"     => 'Resevoir Dogs',
+      "MovieYear"     => '1992',
+      "SubFileName"   => 'Cool sub',
+      "MovieImdbRating" => '10.0',
+      "SubDownloadsCnt" => '310',
+      "SubRating"       => '9.5',
+      "SubFormat"       => 'srt',
+      "SubSumCD"        => '2',
+      "SubAuthorComment" => 'Nice nice...'
+      }
   end
 end
 
@@ -27,6 +40,8 @@ describe Bin do
   end
   
   # Having a hard time testing the command line tool...
+  # #
+  # 
   # it "should call for movie" do
   #   Subdownloader.should_receive(:new)
   #   File.should_receive(:exists?).and_return(true)
@@ -45,51 +60,28 @@ end
   
 describe Subdownloader do    
   include BinspecHelper
-  # this crashes autotest...
-  # it "should fetch subtitles" do
-  #   Movie.should_receive(:new).and_return(mock_movie)
-  #   File.should_receive(:exists?).and_return(true)
-  #   File.should_receive(:size).with('file.avi').and_return(1020)
-  #   File.should_receive(:open).with("file.avi", "rb")   
-  #   Subdown.should_receive(:new).and_return(mock_subdown)#mock(Subdown)) 
-  #   @mock_subdown.should_receive(:log_in!).and_return(true)
-  #   @mock_subdown.should_receive(:search_subtitles).and_return([])        
-  #   Subdownloader.new.run! "file.avi"        
-  # end
-  # it "should down a sub!" do
-  # 
-  #   Movie.should_receive(:new).and_return(mock_movie)
-  #   Subdown.should_receive(:new).and_return(mock_subdown)
-  #   Subtitle.should_receive(:new).and_return(mock_subtitle)
-  #   STDIN.should_receive(:gets).and_return("1")
-  #   #@mock_movie.should_receive(:size).and_return(1313)
-  #   #@mock_movie.should_receive(:filename).and_return("Beavis and Butthead do America")
-  #   #@mock_movie.should_receive(:filename).and_return("Beavis and Butthead do America")    
-  #   @mock_subtitle.should_receive(:info).and_return({ 
-  #     "SubLanguageID" => 'eng',
-  #     "MovieName"     => 'Resevoir Dogs',
-  #     "MovieYear"     => '1992',
-  #     "SubFileName"   => 'Cool sub',
-  #     "MovieImdbRating" => '10.0',
-  #     "SubDownloadsCnt" => '310',
-  #     "SubRating"       => '9.5',
-  #     "SubFormat"       => 'srt',
-  #     "SubSumCD"        => '2',
-  #     "SubAuthorComment" => 'Nice nice...'
-  #     })    
-  #   @mock_subdown.should_receive(:log_in!)
-  #   @mock_subdown.should_receive(:log_out!)    
-  #   @mock_subdown.should_receive(:search_subtitles).and_return([mock_subtitle])
-  #   @mock_subdown.should_receive(:download_subtitle).and_return(mock_subtitle)#.with(@mock_subtitle)
-  #   @mock_subtitle.should_receive(:format).and_return('sub')
-  #   @mock_subdown.stub!(:format).and_return('srt')
-  # 
-  #   @subd = Subdownloader.new
-  #   @subd.run!('teste.avi')
-  # 
-  #   @subd.down_a_sub(mock_subtitle, "xxx")
+
+  it "should download a subtitle" do
+    Movie.should_receive(:new).and_return(mock_movie)
+    Subdown.should_receive(:new).and_return(mock_subdown)#mock(Subdown))     
+       
+    STDIN.should_receive(:gets).and_return("1")    
+    STDOUT.should_receive(:puts).with("Found 1 result. Choose one:\n")
+    STDOUT.should_receive(:printf).with("Choose: ")    
+    STDOUT.should_receive(:puts).with("You can choose multiple ones, separated with spaces or a range separated with hifen.")
+    STDOUT.should_receive(:puts).with("Downloading 1 subtitles...")
+    STDOUT.should_receive(:puts).with("1) Resevoir Dogs / 1992 | Cool sub | Movie score: 10.0\n   Lang: Eng | Format: SRT | Downloads: 310 | Rating: 9.5 | CDs: 2\n   Comments: Nice nice... \n\n")    
+    STDOUT.should_receive(:puts).with("Done. Wrote: Beavis Butthead Do America.srt.")
+
+    File.should_receive(:open).with("Beavis Butthead Do America.srt", "w").and_return(true)     
+
+    @mock_subdown.should_receive(:log_in!).and_return(true)
+    @mock_subdown.should_receive(:download_subtitle).and_return(mock_subtitle)
+    @mock_subdown.should_receive(:search_subtitles).and_return([mock_subtitle])        
+    @mock_subdown.should_receive(:log_out!).and_return(true)    
     
-  #end
+    Subdownloader.new.run! "file.avi"        
+  end
   
   it "should get extension files" do
     Bin.get_extension("Lots.of.dots.happen").should eql("happen")
@@ -106,18 +98,7 @@ describe Subdownloader do
   end
 
   it "should print choice" do
-    @sub = mock(Subtitle, :info => { 
-      "SubLanguageID" => 'eng',
-      "MovieName"     => 'Resevoir Dogs',
-      "MovieYear"     => '1992',
-      "SubFileName"   => 'Cool sub',
-      "MovieImdbRating" => '10.0',
-      "SubDownloadsCnt" => '310',
-      "SubRating"       => '9.5',
-      "SubFormat"       => 'srt',
-      "SubSumCD"        => '2',
-      "SubAuthorComment" => 'Nice nice...'
-      })
+    @sub = mock(Subtitle, :info => sub_info)
       @subd = Subdownloader.new
       @subd.print_option(@sub, 1).should eql("2) Resevoir Dogs / 1992 | Cool sub | Movie score: 10.0
    Lang: Eng | Format: SRT | Downloads: 310 | Rating: 9.5 | CDs: 2
@@ -132,6 +113,9 @@ describe Subwork do
     File.should_receive(:open).with("file.srt", "r").and_return(mock_file) 
     File.should_receive(:open).with("file.sub", "w").and_return(true)     
 
+    STDOUT.should_receive(:puts).with("Working on file file.srt...")
+    STDOUT.should_receive(:puts).with('Done. Wrote: file.sub.')
+    
     Subtitle.should_receive(:new).and_return(mock_subtitle)
     @mock_subtitle.should_receive(:to_sub).and_return('subbb')
 
@@ -141,6 +125,10 @@ describe Subwork do
   it "should not write if file exists" do
     File.should_receive(:open).with("file.srt", "r").and_return(mock_file) 
     File.should_receive(:exists?).and_return(true)
+
+    STDOUT.should_receive(:puts).with("Working on file file.srt...")
+    STDOUT.should_receive(:puts).with("File exists. file.sub")
+    
     Subtitle.should_receive(:new).and_return(mock_subtitle)
     @mock_subtitle.should_receive(:to_sub).and_return('subbb')
     Subwork.new.run!("file.srt", "sub")

data/spec/subtitle_it/formats/mpl_spec.rb

@@ -5,7 +5,7 @@ describe Formats, ".mpl" do
   describe "In" do
     
     before(:each) do
-      @mpl = Subtitle.new(nil, mpl_fixture,'mpl') 
+      @mpl = Subtitle.new({:dump => mpl_fixture, :format => 'mpl'}) 
     end  
 
     it "should parse the sub to an array" do
@@ -32,7 +32,7 @@ describe Formats, ".mpl" do
   describe "Out!" do
        
     before(:each) do
-      @sub = Subtitle.new(nil, yml_fixture,'yml')    
+      @sub = Subtitle.new({:dump => yml_fixture, :format => 'yml'}) 
     end  
   
     it "should dump the object as a SRT" do

data/spec/subtitle_it/formats/rsb_spec.rb

@@ -5,7 +5,7 @@ describe Formats, ".rsb" do
   describe "In" do
     
     before(:each) do
-      @rsb = Subtitle.new(nil, rsb_fixture,'rsb') 
+      @rsb = Subtitle.new({:dump => rsb_fixture, :format => 'rsb'}) 
     end  
 
     it "should parse the sub to an array" do
@@ -32,7 +32,7 @@ describe Formats, ".rsb" do
   describe "Out" do
     include SubFixtures
     before(:each) do     
-      @sub = Subtitle.new(nil, yml_fixture,'yml')    
+      @sub = Subtitle.new({:dump => yml_fixture, :format => 'yml'}) 
     end  
       
     it "should dump the object to rsb" do

data/spec/subtitle_it/formats/srt_spec.rb

@@ -5,7 +5,7 @@ describe Formats, ".srt" do
   describe "In" do
     
     before(:each) do
-      @srt = Subtitle.new(nil, srt_fixture,'srt') 
+      @srt = Subtitle.new({:dump => srt_fixture, :format => 'srt'}) 
     end  
 
     it "should parse the sub to an array" do
@@ -32,7 +32,7 @@ describe Formats, ".srt" do
   describe "Out!" do
        
     before(:each) do
-      @sub = Subtitle.new(nil, yml_fixture,'yml')    
+      @sub = Subtitle.new({:dump => yml_fixture, :format => 'yml'}) 
     end  
   
     it "should dump the object as a SRT" do

data/spec/subtitle_it/formats/sub_spec.rb

@@ -5,7 +5,7 @@ describe Formats, ".sub" do
   describe "Parse" do
   
     before(:each) do
-      @sub = Subtitle.new(nil, sub_fixture,'sub') 
+      @sub = Subtitle.new({:dump => sub_fixture, :format => 'sub'}) 
     end  
 
     it "should parse the sub to an array" do
@@ -36,7 +36,7 @@ describe Formats, ".sub" do
   describe "Out" do
 
     before(:each) do
-      @sub = Subtitle.new(nil, yml_fixture,'yml')    
+      @sub = Subtitle.new({:dump => yml_fixture, :format => 'yml'})    
     end  
 
     it "should dump the object as a SUB" do

data/spec/subtitle_it/formats/xml_spec.rb

@@ -4,7 +4,7 @@ describe Formats, ".xml" do
   include SubFixtures
   describe "In" do    
     before(:each) do    
-      @xml = Subtitle.new(nil, xml_fixture,'xml')    
+      @xml = Subtitle.new({:dump => xml_fixture, :format => 'xml'}) 
     end  
         
     it "should parse the sub to an array" do
@@ -32,7 +32,7 @@ describe Formats, ".xml" do
   
   describe "Out" do    
     before(:each) do    
-      @sub = Subtitle.new(nil, yml_fixture,'yml')    
+      @sub = Subtitle.new({:dump => yml_fixture, :format => 'yml'})  
     end  
         
     it "should parse the sub to an array" do

data/spec/subtitle_it/formats/yml_spec.rb

@@ -5,7 +5,7 @@ describe Formats, ".yml" do
     include SubFixtures
     
     before(:each) do    
-      @sub = Subtitle.new(nil, yml_fixture,'yml')    
+      @sub = Subtitle.new({:dump => yml_fixture, :format => 'yml'}) 
     end  
   
     it "should have author" do

data/spec/subtitle_it/subtitle_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Subtitle do
   def attr_valid_subtitle  
-    { 
+    { :info => { 
     "SubLanguageID" => 'eng',
     "MovieName"     => 'Resevoir Dogs',
     "MovieYear"     => '1992',
@@ -13,7 +13,7 @@ describe Subtitle do
     "SubFormat"       => 'srt',
     "SubSumCD"        => '2',
     "SubAuthorComment" => 'Nice nice...'
-    }
+    }}
   end
   
   it "should instantiate" do
@@ -21,13 +21,19 @@ describe Subtitle do
     @sub.rating.should eql(9.5)    
   end
   
+  it "should fill lines" do
+    @sub = Subtitle.new(attr_valid_subtitle.with({:dump => "{10}{20} Hello", :format => "sub"}))
+    @sub.lines[0].text.should eql(' Hello')
+  end
+  
+  
   describe "Compare" do
     before(:each) do
       @sub = Subtitle.new(attr_valid_subtitle)
     end    
     
     it "should compare to another using rating" do
-      @another_sub = Subtitle.new(attr_valid_subtitle.with("SubRating" => 4.0))
+      @another_sub = Subtitle.new(attr_valid_subtitle.with(:info => { "SubRating" => 4.0} ))
       (@sub > @another_sub).should be_true
     end
       

data/spec/subtitle_it_spec.rb

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 describe SubtitleIt do
   
   it "should instantiate " do
-    @sub = Subtitle.new(nil, "{12}{30}hey hey heypending", "sub")
+    @sub = Subtitle.new({:dump => "{12}{30}hey hey heypending", :format => "sub"})
     @sub.should be_instance_of(Subtitle)
   end
 end

data/subtitle_it.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{subtitle_it}
-  s.version = "0.7.4"
+  s.version = "0.7.5"
 
   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-10}
+  s.date = %q{2008-09-13}
   s.default_executable = %q{subtitle_it}
   s.description = %q{description of gem}
   s.email = ["x@nofxx.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warlley-subtitle_it
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 -07:00
+date: 2008-09-13 00:00:00 -07:00
 default_executable: subtitle_it
 dependencies: 
 - !ruby/object:Gem::Dependency