@@ -1,8 +1,8 @@ #!/usr/bin/env ruby # SubtitleIt # -# Created on 2008-9-4. -# Copyright (c) 2008. All rights reserved. +# Created on 2008-09-04. +# Copyleft (c) 2008. MIT License. # begin require 'rubygems' @@ -31,7 +31,7 @@ Usage: #{File.basename($0)} [options] movie or file_in [file_out] BANNER opts.separator " Options are:" - + opts.on("-l", "--language [LANGUAGE]", String, "Language to search subtitles for, try it empty to see the supported ones.") do |OPTIONS[:lang]| if OPTIONS[:lang].nil? @@ -42,18 +42,18 @@ BANNER 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("-f", "--force", "Force overwrite") { OPTIONS[:force] = true } + opts.on("-h", "--help", - "Show this help message.") { puts opts; exit } - + "Show this help message.") { puts opts; exit } + opts.on("-v", "--version", - "Show program version") { puts "SubtitleIt v#{SubtitleIt::VERSION::STRING}"; exit } - + "Show program version") { puts "SubtitleIt v#{SubtitleIt::VERSION::STRING}"; exit } + opts.parse!(ARGV) if MANDATORY_OPTIONS && MANDATORY_OPTIONS.find { |option| OPTIONS[option.to_sym].nil? } @@ -67,4 +67,3 @@ if ARGV.empty? else SubtitleIt::Bin.run! ARGV, OPTIONS[:lang], OPTIONS[:format], OPTIONS[:force], OPTIONS[:delay] end - bin/subtitle_it @@ -1,36 +1,38 @@ module SubtitleIt - #TODO: create a lang class? - # now I`m more lost.... opensubtitle uses a 3 chars like + # opensubtitle uses a 3 chars like # Por => Portuguese # Cze => Czech .... + # + # LANGUAGE / HUMAN NAME / OPENSUBTITLE CODE LANGS = { :aa => 'Afar', :ab => 'Abkhazian', :af => 'Afrikaans', :ak => 'Akan', + :ay => 'Assyrian', :sq => 'Albanian', :am => 'Amharic', :ar => 'Arabic', - :pb => 'Brazilian Portuguese', + :br => ['Brazilian', 'por'], :hy => 'Armenian', :bs => 'Bosnian', :bg => 'Bulgarian', :ca => 'Catalan', - :zh => 'Chinese', :cs => 'Czech', :da => 'Danish', :nl => 'Dutch', + :en => ['English','eng'], :et => 'Estonian', - :fr => 'French', + :fr => ['French', 'fra'], :de => 'German', - :gl => 'Galician', + :gl => 'Galician', :el => 'Greek', :he => 'Hebrew', :hi => 'Hindi', :hr => 'Croatian', :hu => 'Hungarian', :is => 'Icelandic', - :id => 'Indonesian', + :id => 'Indonesian', :it => 'Italian', :ja => 'Japanese', :kk => 'Kazakh', @@ -54,14 +56,6 @@ module SubtitleIt :uk => 'Ukrainian', :vi => 'Vietnamese', :ro => 'Romanian', - :pb => 'Brazilian', - :ay => 'Assyrian', - :en => 'English' - } - - OPSUB_LANGS = { - # TODO : add the other languages id - :fr => 'fra', - :en => 'eng' + :zh => 'Chinese' } end lib/subtitle_it/languages.rb @@ -5,6 +5,7 @@ require 'stringio' require 'subtitle_it/version' require 'subtitle_it/subtitle' +require 'subtitle_it/languages' module SubtitleIt class Subdown @@ -38,10 +39,10 @@ module SubtitleIt call('ServerInfo') end - def search_subtitles(movie, lang='') - lang ||= "" - lang_id = Subdown.opsub_id(lang) unless lang == "" - puts "Searching for " + lang + " => id: " + lang_id.to_s unless lang == "" + def search_subtitles(movie, lang_id=nil) + lang_name, lang_id = LANGS[:lang_id] + STDOUT.print "Searching for " + STDOUT.puts lang_id ? lang_name : "all languages." args = { 'sublanguageid' => lang_id, 'moviehash' => movie.haxx, @@ -58,7 +59,7 @@ module SubtitleIt def download_subtitle(sub) result = call('DownloadSubtitles', [sub.osdb_id]) - sub.data = self.class.decode_and_unzip(result['data'][0]['data']) + sub.data = self.class.decode_and_unzip(result['data'][0]['data']) end def upload_subtitle(movie, subs) @@ -74,53 +75,50 @@ module SubtitleIt # TODO.. get the correct codes # end # - def Subdown.opsub_id( language ) # Get the Opensubtitle.org language id from the language string (e.g. 'French' returns 'fra' ) - ary = LANGS.find do |sym_lang| - sym_lang if sym_lang[1].downcase == language.downcase - end - OPSUB_LANGS[ ary[0] ] - end - - def Subdown.subtitle_languages - lang_ary = [] - OPSUB_LANGS.each_key do |key| - lang_ary.push( LANGS[key] ) - end - lang_ary.sort.inject( "" ) do |str, lang| - str += lang + " " - str - end - end +# def Subdown.opsub_id( language ) # Get the Opensubtitle.org language id from the language string (e.g. 'French' returns 'fra' ) +# ary = LANGS.find do |sym_lang| +# sym_lang if sym_lang[1].downcase == language.downcase +# end +# OPSUB_LANGS[ ary[0] ] +# end + +# def Subdown.subtitle_languages +# lang_ary = [] +# OPSUB_LANGS.each_key do |key| +# lang_ary.push( LANGS[key] ) +# end +# lang_ary.sort.inject( "" ) { |str, lang| str << lang + " " } +# 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 + 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) + result = @client.call(method, *args) # $LOG.debug "Client#call #{method}, #{args.inspect}: #{result.inspect}" - - if !self.class.result_status_ok?(result) - raise XMLRPC::FaultException.new(result['status'].to_i, result['status'][4..-1]) # 'status' of the form 'XXX Message' - end - - result - end - - # Returns true if status is OK (ie. in range 200-299) or don't exists. - def self.result_status_ok?(result) - !result.key?('status') || (200...300) === result['status'].to_i - end - def prevent_session_expiration - call('NoOperation') + unless self.class.result_status_ok?(result) + raise XMLRPC::FaultException.new(result['status'].to_i, result['status'][4..-1]) # 'status' of the form 'XXX Message' end - def self.decode_and_unzip(data) - Zlib::GzipReader.new(StringIO.new(XMLRPC::Base64.decode(data))).read - end + result + end + + # Returns true if status is OK (ie. in range 200-299) or don't exists. + def self.result_status_ok?(result) + !result.key?('status') || (200...300) === result['status'].to_i + 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 lib/subtitle_it/subdown.rb @@ -3,39 +3,43 @@ module SubtitleIt class Subtime attr_accessor :hrs, :min, :sec, :ms - - def initialize(data) - raise if data == nil + + def initialize(data) + raise if data == nil parse_data(data) 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) + when Numeric + @sec, @ms = data.divmod(1000) @min, @sec = @sec.divmod(60) @hrs, @min = @min.divmod(60) - when String + 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 + 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); 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 \ No newline at end of file +end lib/subtitle_it/subtime.rb @@ -2,44 +2,44 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') module SubdownHelper 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> + @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_movie - @mock_movie = mock(Movie, :haxx => '09a2c497663259cb') + @mock_movie = mock(Movie, :haxx => '09a2c497663259cb', :size => 81401) end end describe Subdown do include SubdownHelper - + before(:each) do - @sub = mock(Subtitle) + @sub = mock(Subtitle) end - + it "should initialize nicely" do XMLRPC::Client.should_receive(:new2) - @down = Subdown.new + @down = Subdown.new end - + it "should log in!" do XMLRPC::Client.should_receive(:new2).with('http://www.opensubtitles.org/xml-rpc').and_return(mock_xmlrpc) @mock_xmlrpc.should_receive(:call).with("LogIn", "", "", "", "SubtitleIt #{SubtitleIt::VERSION::STRING}").and_return({ - "status"=>"200 OK", - "seconds"=>0.004, + "status"=>"200 OK", + "seconds"=>0.004, "token"=>"shkuj98gcvu5gp1b5tlo8uq525" }) @down = Subdown.new - @down.should_not be_logged_in + @down.should_not be_logged_in @down.log_in! @down.should be_logged_in end - + it "should raise if connection sux" do XMLRPC::Client.should_receive(:new2).with('http://www.opensubtitles.org/xml-rpc').and_return(mock_xmlrpc) @mock_xmlrpc.should_receive(:call).with("LogIn", "", "", "", "SubtitleIt #{SubtitleIt::VERSION::STRING}").and_return({ - "status"=>"404 FAIL", - "seconds"=>0.004, + "status"=>"404 FAIL", + "seconds"=>0.004, "token"=>"" }) @down = Subdown.new @@ -48,47 +48,89 @@ describe Subdown do end - describe "Instantiate" do + describe "Logged in" do before(:each) do - @down = Subdown.new + XMLRPC::Client.should_receive(:new2). + with('http://www.opensubtitles.org/xml-rpc'). + and_return(mock_xmlrpc) + + @mock_xmlrpc.should_receive(:call).with("LogIn", "", "", "", + "SubtitleIt #{SubtitleIt::VERSION::STRING}").and_return({ + "status"=>"200 OK", + "seconds"=>0.004, + "token"=>"shkuj98gcvu5gp1b5tlo8uq525" + }) + @down = Subdown.new + @down.log_in! end - - it "should get subtitle languages" do - @down.subtitle_languages.should be_instance_of(Array) - @down.subtitle_languages.length.should eql(51) - @down.subtitle_languages[0].should be_instance_of(String) + + it "should search for all languages" do + @mock_xmlrpc.should_receive(:call).with("SearchSubtitles", + "shkuj98gcvu5gp1b5tlo8uq525", [{ + "sublanguageid"=>nil, + "moviebytesize"=>81401, + "moviehash"=>"09a2c497663259cb"}]).and_return( + { :result => 200 } + ) + + STDOUT.should_receive(:print).with("Searching for ") + STDOUT.should_receive(:puts).with("all languages.") + @down.search_subtitles(mock_movie). + should eql([]) end - + + it "should search for one languages" do + @mock_xmlrpc.should_receive(:call).with("SearchSubtitles", + "shkuj98gcvu5gp1b5tlo8uq525", [{ + "sublanguageid"=>nil, + "moviebytesize"=>81401, + "moviehash"=>"09a2c497663259cb"}]).and_return( + { :result => 200 } + ) + + STDOUT.should_receive(:print).with("Searching for ") + STDOUT.should_receive(:puts).with("portuguese.") + @down.search_subtitles(mock_movie, "por"). + should eql([]) + end + +# it "should get subtitle languages" do +# @down.subtitle_languages.should be_instance_of(Array) +# @down.subtitle_languages.length.should eql(51) +# @down.subtitle_languages[0].should be_instance_of(String) +# end + end end -# REAL TESTS THAT USES THE INTERNET... DUNNO BETTER PRACTICE FOR THIS -# Mock is nice, but I would like to keep this here, who knows if +# REAL TESTS THAT USES THE WIRE... DUNNO BETTER PRACTICE FOR THIS +# +# Mock is above, but I`ll keep this here, who knows if # Opensubtitle API changes.... any suggestions? -# -# # +# +# # # describe Subdown, " - Wired tests" do # before(:each) do # @down = Subdown.new # @movie = mock(Movie, :haxx => '09a2c497663259cb') # @down.log_in! # end -# +# # it "should get imdb info" do -# @movie.should_receive('info=').with({"MovieYear"=>"2004", -# "MovieImdbID"=>"403358", -# "MovieName"=>"Nochnoy dozor", +# @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, 'pt') # res.should be_instance_of(Array) -# res.each do |r| +# res.each do |r| # r.should be_instance_of(Subtitle) # end # end -# end \ No newline at end of file +# end spec/subtitle_it/subdown_spec.rb .autotest a586aa7c46b2c8004115de7bf5e891b858ad3904 Marcos Augusto x@nofxx.com http://github.com/nofxx/subtitle_it/commit/ed8c72e37337689e4da162336bb217b87efdb6a2 ed8c72e37337689e4da162336bb217b87efdb6a2 2008-10-28T08:57:44-07:00 2008-10-28T08:57:44-07:00 specs works again...langs soon 1e19871bcabcdd6e6bd7ee71b643838f945af599 Marcos Augusto x@nofxx.com