warlley-subtitle_it 0.6.5 → 0.7.0

data/History.txt

@@ -27,4 +27,11 @@
 == 0.6.1 2008-09-09
 
 * 1 major enhancement:
-  * Adds xml tt support  
+  * Adds xml tt support 
+  
+== 0.7.0 2008-09-10
+
+* 4 major enhancements:
+  * Adds download opensubtitles support
+  * Fixes various bugs (and adds another ones)
+  * Adds MPL2 support

data/Manifest.txt

@@ -10,6 +10,7 @@ config/hoe.rb
 config/requirements.rb
 lib/subtitle_it.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
@@ -17,7 +18,9 @@ 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/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
@@ -32,16 +35,22 @@ 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/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/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

data/README.markdown

@@ -4,7 +4,7 @@ Ruby tool to work with subtitle files.
 
 h1. FEATURES:
 
-* Converts to and from: yml/srt/sub/rsb nice subtitle code
+* Converts to and from: SRT, SUB, XML(TT), YML, MPL2, RSB and ASS.
 * Fixes delays. (SrtResync)
 
 h2. TODO:

data/README.txt

@@ -5,14 +5,13 @@ Ruby tool to work with subtitle files.
 
 == FEATURES:
 
-* Converts to and from: SRT, SUB, XML(TT), YML, RSB and ASS
+* To and from: SRT, SUB, XML(TT), YML, MPL2, RSB and ASS.
+* Download from opensubtitles.org
 * Fixes delays. (SrtResync)
 
-TODO:
+== TODO:
 
 * Compatibility with "sube" (http://github.com/vic/sube)
-* Download subtitles. (http://github.com/johanlunds/downsub/tree)
-* Download from http://trac.opensubtitles.org/projects/opensubtitles/wiki/XMLRPC
 * Fix delays
 * Convert 1 to 2 CD`s and versa-vice
 * ASS Format (Yes, for the funny of it...)
@@ -52,17 +51,31 @@ MM:SS => N == TEXT | NEWLINE
 Create a template to check it out. 
 
 
-== OTHER TOOLS:
+== DEV:
+
+To run tests:
+
+  rake spec or autotest
+  
+Documentation => doc
+Subtitle examples => spec/fixtures
+  
+
+== SUBTITLE EDITORS:
+
+Try those nice editors too, if SubtitleIt does not fit your need:
+
+Jubler: http://www.jubler.org/
 
 Aegisub: http://www.malakith.net/aegiwiki/Main_Page
 
 
+
 == LICENSE:
 
 (The MIT License)
 
 Copyright (c) 2008 Warlley Rezende, Marcos Piccinini
-Parts of subrip code by Marcin (tiraeth) Chwedziak 
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/bin/subtitle_it

@@ -55,7 +55,7 @@ BANNER
           
   #FIXME: I gave up... I cant acess the version var from here... missing something.
   opts.on("-v", "--version",
-          "Show program version") {   puts 'SubtitleIt v0.6.5'; exit }          
+          "Show program version") {   puts "SubtitleIt v#{SubtitleIt::VERSION::STRING}"; exit }          
           
   opts.parse!(ARGV)
 
@@ -69,25 +69,54 @@ if ARGV.empty?
   exit
 end
 
-filein, filein_ext = ARGV[0].split('.')
+
+filein = ARGV[0].split('.')
+filein_ext = filein.delete_at(-1)
+filein = filein.join('')
 fileout, fileout_ext = ARGV[1] ? ARGV[1].split('.') : [filein, filein_ext]
+
+#time spent
 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
-    puts "Working on file #{filein}..."
-    sub = Subtitle.new(content, filein_ext) 
-    format = OPTIONS[:format]
-    format ||= fileout_ext unless fileout_ext == filein_ext
-    out = sub.send :"to_#{format}" 
-    #TODO: rescue format not found....
-  end 
+
+#FIXME: ugly
+if %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).include?(filein_ext)
+ #we got a video! 
+ include SubtitleIt
+  @down = Subdown.new
+  @down.log_in!
+  @movie = Movie.new(ARGV[0]) 
+  res = @down.search_subtitles(@movie)#.inspect
+  puts "Found #{res.length} result#{"s" if res.length > 1}. Choose one:\n"
+  res.each_with_index do |r,i| 
+    puts "#{i+1}) #{r.info["MovieName"]} / #{r.info["MovieYear"]} - #{r.info["SubFileName"]} Dl count: #{r.info["SubDownloadsCnt"]} Rating: #{r.info["SubRating"]}"
+    puts "    Language: #{r.info["SubLanguageID"]} Movie rating: #{r.info["MovieImdbRating"]} CD Count: #{r.info["SubSumCD"]}"
+    puts "    Comments: #{r.info["SubAuthorComment"]} \n\n"
+  end
+  printf "Choose one: "  
+  choose = STDIN.gets.to_i
+  choose = res[choose + 1]
+  puts "Downloading #{choose.info}"
+  out = @down.download_subtitle(choose)
+  format = choose.format
+  @down.log_out!
 else
-  format = 'rsb'
-  out = <<GEN
+  #we got files
+  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
+      puts "Working on file #{filein}..."
+      sub = Subtitle.new(content, filein_ext) 
+      format = OPTIONS[:format]
+      format ||= fileout_ext unless fileout_ext == filein_ext
+      out = sub.send :"to_#{format}" 
+      #TODO: rescue format not found....
+    end 
+  else
+    format = 'rsb'
+    out = <<GEN
 - title: #{ARGV[0]}
 - authors: FIXME 
 - version: FIXME
@@ -95,6 +124,7 @@ else
 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
+  end
 end
 
 fout = "#{fileout}.#{format}"

data/lib/subtitle_it/formats/ass.rb

@@ -1,5 +1,6 @@
 # SubtitleIt
 #  ASS - http://en.wikipedia.org/wiki/SubStation_Alpha
+#  http://www.malakith.net/aegiwiki/ASS
 #
 module SubtitleIt
   module Formats    

data/lib/subtitle_it/formats/mpl.rb

@@ -0,0 +1,28 @@
+# SubtitleIt
+# MPL2 - extension .txt
+#
+# [1025][1115]You always say that.|The same thing every time.
+#
+# 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
+  			text_on, text_off, text = line_data
+  			text_on, text_off = [text_on.to_i, text_off.to_i].map { |t| t.to_i * 1000 }	    
+        i << Subline.new(text_on, text_off, text.chomp)
+      end
+    end
+        
+    def to_mpl
+      @lines.inject([]) do |i,l|
+        start = l.text_on.to_i / 100
+        stop = l.text_off.to_i / 100
+        i << "[%d][%d]%s" % [start, stop, l.text]
+      end.join("\n")
+    end    
+  end 
+end

data/lib/subtitle_it/formats/rsb.rb

@@ -1,7 +1,8 @@
 # SubtitleIt
 # RSB - Ruby Subtitle
 #
-# 00:32 => 00:33 == Nice police work! | Thank you!
+# 00:32 => 00:33
+# Nice police work! | Thank you!
 # 00:53 => N == Howdy ho!
 # MM:SS => N == TEXT | NEWLINE
 #
@@ -28,6 +29,4 @@ module SubtitleIt
       end.join("\n")      
     end    
   end
-end
-
-
+end

data/lib/subtitle_it/formats/srt.rb

@@ -1,5 +1,5 @@
 # SubtitleIt
-# SRT format
+# SRT - Subrip format
 #
 # N
 # 00:55:21,600 --> 00:55:27,197
@@ -31,4 +31,14 @@ module SubtitleIt
       out.join("\n")
     end    
   end
-end
+end
+
+#looks like subrip accepts some styling:
+#     sdict.add(new StyledFormat(ITALIC, "i", true));
+#     sdict.add(new StyledFormat(ITALIC, "/i", false));
+#     sdict.add(new StyledFormat(BOLD, "b", true));
+#     sdict.add(new StyledFormat(BOLD, "/b", false));
+#     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));

data/lib/subtitle_it/formats/sub.rb

@@ -1,15 +1,29 @@
 # SubtitleIt
-# MicroDVD  - Subrip format
+# MPSub, MicroDVD or VOBSub format
+#TODO: tricky.. detect which format we got.
 #
 # {1025}{1115}You always say that.|The same thing every time.
 # {1118}{1177}"l'm throug h, never again,|too dangerous."
 #
+# MicroDVD:
+# {1}{1}25.000
+# {2447}{2513}You should come to the Drama Club, too.
+# {2513}{2594}Yeah. The Drama Club is worried|that you haven't been coming.
+# {2603}{2675}I see. Sorry, I'll drop by next time.
+#
 # Where N is ms / framerate / 1000 (ms -> s)
 #
 # parts of the code from 'simplesubtitler' from Marcin (tiraeth) Chwedziak 
 #
 module SubtitleIt
-  module Formats        
+  module Formats
+    #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,})\}(.+)$/)
@@ -22,8 +36,8 @@ module SubtitleIt
         
     def to_sub
       @lines.inject([]) do |i,l|
-        start = l.text_on.to_i / @fps / 1000
-        stop = l.text_off.to_i / @fps / 1000
+        start = l.text_on.to_i / 1000 * @fps * ratio
+        stop = l.text_off.to_i / 1000 * @fps * ratio
         i << "{%d}{%d}%s" % [start, stop, l.text]
       end.join("\r\n")
     end    

data/lib/subtitle_it/movie.rb

@@ -1,5 +1,5 @@
 # downsub - github.com/johanlunds/downsub
-require 'down_sub/movie_hasher'
+require 'subtitle_it/movie_hasher'
 
 module SubtitleIt
   class Movie
@@ -10,12 +10,12 @@ module SubtitleIt
 
     def initialize(filename)
       @filename = filename
-      @hash = nil
+      @haxx = nil
       @info = {}
     end
 
-    def hash
-      @hash ||= MovieHasher::compute_hash(@filename)
+    def haxx
+      @haxx ||= MovieHasher::compute_haxx(@filename)
     end
 
     def size

data/lib/subtitle_it/movie_hasher.rb

@@ -4,27 +4,27 @@ module SubtitleIt
 
     CHUNK_SIZE = 64 * 1024 # in bytes
 
-    def self.compute_hash(filename)
+    def self.compute_haxx(filename)
       filesize = File.size(filename)
-      hash = filesize
+      haxx = 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
+          haxx = haxx + 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
+          haxx = haxx + n & 0xffffffffffffffff
         end
       end
 
-      sprintf("%016x", hash)
+      sprintf("%016x", haxx)
     end
   end
 end

data/lib/subtitle_it/subdown.rb

@@ -0,0 +1,99 @@
+## downsub - github.com/johanlunds/downsub
+require 'xmlrpc/client'
+require 'zlib'
+require 'stringio'
+
+require 'subtitle_it/version'
+require 'subtitle_it/subtitle'
+
+module SubtitleIt
+  class Subdown
+    @@host = "http://www.opensubtitles.org/xml-rpc"
+    @@host_dev = "http://dev.opensubtitles.org/xml-rpc"
+
+    @@user_agent = "SubtitleIt #{SubtitleIt::VERSION}"
+
+    @@no_token = %w(ServerInfo LogIn)
+
+    def initialize(host = @@host)
+      @client = XMLRPC::Client.new2(host)
+      @token = nil
+    end
+
+    def log_in!
+      result = call('LogIn', '', '', '', @@user_agent)
+      @token = result['token'].to_s
+    end
+
+    def logged_in?
+      !@token.nil? && !@token.empty?
+    end
+
+    def log_out!
+      call('LogOut')
+      @token = nil
+    end
+
+    def server_info
+      call('ServerInfo')
+    end
+
+    def search_subtitles(movie)
+      args = {
+        'sublanguageid' => '',
+        'moviehash'     => movie.haxx,
+        'moviebytesize' => movie.size
+      }
+
+      result = call('SearchSubtitles', [args])
+      return [] unless result['data'] # if no results result['data'] == false
+      result['data'].inject([]) do |subs, sub_info|
+        subs << Subtitle.new(nil,nil,sub_info)
+        subs
+      end
+    end
+
+    def download_subtitle(sub)
+      result = call('DownloadSubtitles', [sub.id])
+      sub.data = self.class.decode_and_unzip(result['data'][0]['data'])
+      
+    end
+
+    def upload_subtitle(movie, subs)
+    end
+
+    def imdb_info(movie)
+      result = call('CheckMovieHash', [movie.haxx])
+      movie.info = result['data'][movie.haxx] # TODO: Handle if no result for movie
+    end
+
+    def subtitle_languages
+    end
+
+    private
+
+      def call(method, *args)
+        unless @@no_token.include? method
+          raise 'Need to be logged in for this.' unless logged_in?
+          args = [@token, *args]
+        end
+
+        result = @client.call(method, *args)
+#        $LOG.debug "Client#call #{method}, #{args.inspect}: #{result.inspect}"
+        
+        if result['status'] && !((200...300) === result['status'].to_i)
+          raise 'Status not OK in result.'
+        end
+        
+        result
+      end
+
+      def prevent_session_expiration
+        call('NoOperation')
+      end
+
+      def self.decode_and_unzip(data)
+        Zlib::GzipReader.new(StringIO.new(XMLRPC::Base64.decode(data))).read
+      end
+  end
+end

data/lib/subtitle_it/subtime.rb

@@ -4,60 +4,38 @@ module SubtitleIt
   class Subtime
     attr_accessor :hrs, :min, :sec, :ms
         
-    def initialize(sym)  
-      @hrs = @min = @sec = @ms = 0    
-      parse_subtime(sym)    
+    def initialize(data) 
+      raise if data == nil          
+      parse_data(data)
     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
-        @min = sym / 60000 % 600
-        @sec = sym / 1000 % 60
-        @ms = sym % 1000
-        return
-      end
-      v = sym.split(/\.|\,/)
-      if ms = v[1]  
-        @ms =  (("0.%d" % ms.to_i).to_f * 1000).to_i
-      end
-      v = v[0].split(/:/).map { |s| s.to_i }      
-      case v.size
-      when 1
-        @sec = v.first
-      when 2
-        @min, @sec = v
-      when 3
-        @hrs, @min, @sec = v
-      else
-        raise "Wrong time format"
-      end
+    # parses string like '00:00:00,000' or single number as ms.
+    def parse_data(data)
+      case data
+      when Numeric 
+        @sec, @ms = data.divmod(1000)
+        @min, @sec = @sec.divmod(60)
+        @hrs, @min = @min.divmod(60)
+      when String 
+        time, float = data.split(/\.|\,/)
+        time = time.split(/:/).map { |s| s.to_i }
+        @ms =  (("0.%d" % float.to_i).to_f * 1000).to_i if float
+  			@sec, @min, @hrs = time.reverse
+      else raise "Format unknown."
+      end 
+      #FIXME: dunno what to do about this.. nil = problems with to_i
+      @hrs ||= 0; @min ||= 0; @sec ||= 0;  @ms ||= 0
     end
-    
+
     # to_s(separator) => to_s(",") => 00:00:00,000
-    def to_s(sep='.')
-      "%02d:%02d:%02d#{sep}%03d" % [@hrs, @min, @sec,  @ms]
-    end
+    def to_s(sep='.'); "%02d:%02d:%02d#{sep}%03d" % [@hrs, @min, @sec,  @ms];    end
     
     # return time as a total in ms
-    def to_i
-      ( @hrs * 3600 + @min * 60 + @sec ) * 1000 + @ms
-    end
-    
-    def +(other)
-       Subtime.new(self.to_i + other.to_i)
-    end
-    
-    def -(other)
-       Subtime.new(self.to_i - other.to_i)
-    end
+    def to_i;  ( @hrs * 3600 + @min * 60 + @sec ) * 1000 + @ms;    end
     
-    def <=>(other)
-      self.to_i <=> other.to_i
-    end
+    def +(other);   Subtime.new(self.to_i + other.to_i);    end    
+    def -(other);   Subtime.new(self.to_i - other.to_i);    end    
+    def <=>(other);      self.to_i <=> other.to_i;    end
     include Comparable
   end
 end

data/lib/subtitle_it/subtitle.rb

@@ -3,28 +3,51 @@ require 'subtitle_it/formats/sub'
 require 'subtitle_it/formats/yml'
 require 'subtitle_it/formats/rsb'
 require 'subtitle_it/formats/xml'
+require 'subtitle_it/formats/mpl'
 
 module SubtitleIt
   include Formats
   
   class Subtitle    
-    attr_reader :raw, :format, :lines, :style
+    attr_reader :id, :raw, :format, :lines, :style, :info, :filename
+    
     EXTS = %w(srt sub smi txt ssa ass mpl xml yml rsb)
     
-    def initialize(dump, format, style=nil, fps=23.976)
-      raise unless format =~ /^srt$|^sub|yml|txt|rsb|xml|ass/
+    def initialize(dump=nil,format=nil,info=nil)
+      @info     = info
+      @id       = info['IDSubtitleFile'].to_i if info
+      @filename = info['SubFileName'].to_s if info
+      @format   = info['SubFormat'].to_s if info  
+      @fps=23.976      
+      parse_dump(dump,format) if 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
-      @style = style
-      @fps = fps      
       parse!
     end
+
+    def style=(s)
+      @style = s
+    end
+    
+    def fps=(fps)
+      @fps = fps
+    end
+    
+    def data=(data)
+      @raw = data
+    end
+
+    
+    private
     
     def parse!
       self.lines = send :"parse_#{@format}"      
     end
     
-    private
     def lines=(lines)
       @lines = lines
     end  

data/lib/subtitle_it/version.rb

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

data/lib/subtitle_it.rb

@@ -5,6 +5,10 @@ require 'subtitle_it/version'
 require 'subtitle_it/subtime'
 require 'subtitle_it/subline'
 require 'subtitle_it/subtitle'
+require 'subtitle_it/subdown'
+require 'subtitle_it/substyle'
+require 'subtitle_it/movie'
+
 
 module SubtitleIt
 end

data/spec/fixtures/puplfiction.mpl

@@ -0,0 +1,12 @@
+[1025][1115]You always say that.|The same thing every time.
+[1118][1177]"l'm through, never again,|too dangerous."
+[1180][1270]I know that's what I always say.|I'm always right too.
+[1274][1364]- You forget about it in a day or two.|- The days of me forgetting are over.
+[1368][1428]The days of me remembering|have just begun.
+[1430][1490]You know, when you go on like this,|what you sound like ?
+[1493][1583]- I sound like a sensible fuckin' man.|- You sound like a duck.
+[1587][1707]- Quack, quack, quack.|- Take heart, 'cause you're never
+[1712][1802]Since I'm never gonna|do it again, you're never
+[1806][1956]- After tonight ?|- Correct. I got all tonight to quack.
+[1962][2022]- Can I get anyone more coffee ?|- Oh, yes !
+[2087][2176]- Thank you.|- You're welcome.

data/spec/spec_helper.rb

@@ -30,4 +30,8 @@ module SubFixtures
   def xml_fixture
     File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/movie.xml')) 
   end  
+  
+  def mpl_fixture
+    File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/puplfiction.mpl')) 
+  end  
 end

data/spec/subtitle_it/formats/mpl_spec.rb

@@ -0,0 +1,45 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Formats, ".mpl" do
+  include SubFixtures
+  describe "In" do
+    
+    before(:each) do
+      @mpl = Subtitle.new(mpl_fixture,'mpl') 
+    end  
+
+    it "should parse the sub to an array" do
+      @mpl.lines.should be_instance_of(Array)
+    end
+    
+    it "should have N lines" do
+      @mpl.should have(12).lines      
+    end
+    
+    it "should parse time of" do
+      @mpl.lines[0].text_on.to_s.should eql("00:17:05.000")
+    end
+    
+    it "should parse time of" do
+      @mpl.lines[0].text_off.to_s.should eql("00:18:35.000")
+    end
+    
+    it "should parse text" do
+      @mpl.lines[0].text.should eql("You always say that.|The same thing every time.")
+    end
+  end
+    
+  describe "Out!" do
+       
+    before(:each) do
+      @sub = Subtitle.new(yml_fixture,'yml')    
+    end  
+  
+    it "should dump the object as a SRT" do
+      @sub.to_mpl.should eql("[3265][3285]worth killing for...
+[3604][3634]worth dying for...
+[4203][4233]worth going to the hell for...
+[4203][4233]worth going a | line...")
+    end
+  end
+end

data/spec/subtitle_it/formats/sub_spec.rb

@@ -40,7 +40,10 @@ describe Formats, ".sub" do
     end  
 
     it "should dump the object as a SUB" do
-      @sub.to_sub.should eql("{13}{13}worth killing for...\r\n{15}{15}worth dying for...\r\n{17}{17}worth going to the hell for...\r\n{17}{17}worth going a | line...")
+      @sub.to_sub.should eql("{7816}{7864}worth killing for...\r
+{8631}{8703}worth dying for...\r
+{10069}{10141}worth going to the hell for...\r
+{10069}{10141}worth going a | line...")
     end
   end  
 end

data/spec/subtitle_it/movie_hasher_spec.rb

@@ -0,0 +1 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')

data/spec/subtitle_it/movie_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Movie do
+  before(:each) do
+    @movie = Movie.new('pulpfiction')
+  end
+
+  
+  
+  
+  it "should get subtitle languages" do
+#    @down.subtitle_languages.should be_nil
+  end
+  
+
+  
+end

data/spec/subtitle_it/subdown_spec.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Subdown do
+  before(:each) do
+    @down = Subdown.new
+    @down.log_in!
+    @movie = mock(Movie, :haxx => '09a2c497663259cb')
+  end
+
+  
+  it "should get imdb info" do
+    @movie.should_receive('info=').with({"MovieYear"=>"2004", 
+      "MovieImdbID"=>"403358", 
+      "MovieName"=>"Nochnoy dozor", 
+      "MovieHash"=>"09a2c497663259cb"})
+    @down.imdb_info(@movie)
+  end
+  
+  it "should search subs info" do
+    @movie.stub!(:size).and_return(733589504)
+    res = @down.search_subtitles(@movie)
+    res.should be_instance_of(Array)
+    res.each do |r| 
+      r.should be_instance_of(Subtitle)
+    end
+  end
+  
+  
+
+  it "should get subtitle languages" do
+    @down.subtitle_languages.should be_nil
+  end
+  
+
+  
+end
+
+
+
+# 
+# @client.log_in!
+# @movie = DownSub::Movie.new('/Users/lundan/Movies/21[2008]DvDrip-aXXo/21[2008]DvDrip-aXXo.avi') # ask_open_file
+# @client.imdb_info(@movie)
+# 
+# puts @client.search_subtitles(@movie).inspect
+# 

data/spec/subtitle_it/substyle_spec.rb

@@ -0,0 +1 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')

data/spec/subtitle_it/subtime_spec.rb

@@ -34,6 +34,17 @@ describe Subtime do
   end
 end
 
+describe "and the other way around" do
+  it "should print nicely" do
+    @subtime = Subtime.new(3723400)
+    @subtime.to_s.should eql('01:02:03.400')
+  end
+  
+end
+
+
+
+
 describe Subtime,"22" do
   it "should convert a big time" do
     @subtime =  Subtime.new('11:22:33.742')
@@ -51,20 +62,20 @@ end
 
 describe Subtime, ".other formats" do
   
-  it "should parse comma" do
+  it "should parse min:sec.ms" do
     @subtime = Subtime.new('01:03.4')
   end
 
-  it "should parse dot" do
+  it "should parse min:sec,ms" do
     @subtime = Subtime.new('01:03,3')
   end
   
-  it "should parse dot" do
+  it "should single as seconds hour should be nil" do
     @subtime = Subtime.new('3')
     @subtime.hrs.should eql(0)
   end
   
-  it "should parse dot" do
+  it "should parse min:sec" do
     @subtime = Subtime.new('01:03')
     @subtime.min.should eql(1)
   end

data/subtitle_it.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{subtitle_it}
-  s.version = "0.6.5"
+  s.version = "0.7.0"
 
   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/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.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/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/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/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/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{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warlley-subtitle_it
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -57,6 +57,7 @@ files:
 - config/requirements.rb
 - lib/subtitle_it.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
@@ -64,7 +65,9 @@ files:
 - lib/subtitle_it/formats/yml.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
@@ -79,16 +82,22 @@ files:
 - 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/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/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