lib/subtitle_it/languages.rb @@ -31,7 +31,7 @@ == 0.7.0 2008-09-10 -* 4 major enhancements: +* 3 major enhancements: * Adds download opensubtitles support * Fixes various bugs (and adds another ones) * Adds MPL2 support @@ -43,5 +43,11 @@ * subtitle_it worker code rewritten == 0.7.6 2008-09-17 + * 1 major enhancement: * Fixes a bug (platform dependent end-of-line) + +== 0.7.7 2008-09-20 + +* 1 major enhancement: + * Add language search (subtitle_it -l <code> <movie>) \ No newline at end of file History.txt @@ -19,8 +19,10 @@ 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/languages.rb lib/subtitle_it/movie.rb lib/subtitle_it/movie_hasher.rb +lib/subtitle_it/platform_endl.rb lib/subtitle_it/subdown.rb lib/subtitle_it/subline.rb lib/subtitle_it/substyle.rb Manifest.txt @@ -29,19 +29,12 @@ SubtitleIt - Download, convert and create subtitles. Usage: #{File.basename($0)} [options] movie or file_in [file_out] Options are: - -c FORMAT --convert=FORMAT Format to convert. Use this empty to - show all supported formats. 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("-l", "--language=LANGUAGE", String, + "Language to search subtitles for, try it empty to see the supported ones.") { |OPTIONS[:lang]| } opts.on("-c", "--convert=FORMAT", String, "Format to convert to") { |OPTIONS[:format]| } @@ -68,6 +61,6 @@ if ARGV.empty? puts parser.banner exit else - SubtitleIt::Bin.run! ARGV, OPTIONS[:format], OPTIONS[:force], OPTIONS[:delay] + SubtitleIt::Bin.run! ARGV, OPTIONS[:lang], OPTIONS[:format], OPTIONS[:force], OPTIONS[:delay] end bin/subtitle_it @@ -2,6 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) require 'rubygems' require 'subtitle_it/version' +require 'subtitle_it/languages' require 'subtitle_it/subtime' require 'subtitle_it/subline' require 'subtitle_it/platform_endl' lib/subtitle_it.rb @@ -14,11 +14,15 @@ module SubtitleIt end class Subdownloader - def run!(movie) + def run!(movie,lang=nil) @movie = Movie.new(movie) @down = Subdown.new @down.log_in! - res = @down.search_subtitles(@movie) + res = @down.search_subtitles(@movie, lang) + if res.length == 0 + STDOUT.puts "No results found." + return + end 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." @@ -57,17 +61,20 @@ module SubtitleIt end end - class Bin - def Bin.run! argv, format=nil, force=false, delay=nil + class Bin + + + def Bin.run! argv, lang=nil, format=nil, force=false, delay=nil raise unless argv @force = force @format = format unless File.exists?(argv[0]) - # generate_rsb + # TODO generate_rsb return end + @file_in = argv[0] @file_in_ext = Bin.get_extension(@file_in) if argv[1] @@ -76,7 +83,7 @@ module SubtitleIt @format = @file_out_ext end if MOVIE_EXTS.include? @file_in_ext - Subdownloader.new.run!(argv[0]) + Subdownloader.new.run!(argv[0], lang) elsif SUB_EXTS.include? @file_in_ext Subwork.new.run!(@file_in, @format) else @@ -106,6 +113,13 @@ module SubtitleIt f end + def Bin.print_languages + STDOUT.puts "CODE | LANGUAGE" + LANGS.each do |l| + STDOUT.puts " #{l[0]} | #{l[1]}" + end + end + def Bin.write_out(filename,dump) if File.exists?(filename) && !@force STDOUT.puts "File exists. #{filename}" lib/subtitle_it/bin.rb @@ -41,7 +41,7 @@ module Formats toff = l.time_off - l.time_on line_ary << " <p begin=\"#{l.time_on}\" dur=\"#{toff}\">#{l.text}</p>" end - return line_ary.join( endl ) + endl + return line_ary.join( endl ) end def to_xml @@ -55,11 +55,11 @@ module Formats </head> <body> <div xml:lang="en"> -#{xml_lines} +#{xml_lines} </div> </body> </tt> XML out.chomp - end + end end lib/subtitle_it/formats/xml.rb @@ -38,9 +38,11 @@ module SubtitleIt call('ServerInfo') end - def search_subtitles(movie) + def search_subtitles(movie, lang='') + lang ||= "" + puts la args = { - 'sublanguageid' => '', + 'sublanguageid' => lang, 'moviehash' => movie.haxx, 'moviebytesize' => movie.size } @@ -54,7 +56,7 @@ module SubtitleIt end def download_subtitle(sub) - result = call('DownloadSubtitles', [sub.id]) + result = call('DownloadSubtitles', [sub.osdb_id]) sub.data = self.class.decode_and_unzip(result['data'][0]['data']) end @@ -67,6 +69,8 @@ module SubtitleIt end def subtitle_languages + LANGS.map { |l| l[0].to_s } + # TODO.. get the correct codes end private @@ -80,12 +84,17 @@ module SubtitleIt 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.' + 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') lib/subtitle_it/subdown.rb @@ -20,7 +20,7 @@ module SubtitleIt 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 + @sec, @min, @hrs = time.reverse else raise "Format unknown." end #FIXME: dunno what to do about this.. nil = problems with to_i lib/subtitle_it/subtime.rb @@ -5,26 +5,35 @@ require 'subtitle_it/formats/rsb' require 'subtitle_it/formats/xml' require 'subtitle_it/formats/mpl' +# http://en.wikipedia.org/wiki/List_of_ISO_639-2_codes +# http://www.opensubtitles.org/addons/export_languages.php + 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 include Formats - attr_reader :id, :raw, :format, :lines, :style, :info, :filename, :rating + attr_reader :id, :raw, :format, :lines, :style, :info, :filename, :rating, :language, :user, :release_name, + :osdb_id, :download_count, :download_url, :original_filename def initialize(args = {}) + # Looks like opensubtitle is the only provider around.. + # If a second one comes need big refactor... if @info = args[:info] - @id = @info['IDSubtitleFile'].to_i - @filename = @info['SubFileName'].to_s - @format = @info['SubFormat'].to_s - @rating = @info['SubRating'].to_f + #@osdb_info = info + @osdb_id = @info['IDSubtitleFile'].to_s + @original_filename = @info['SubFileName'].to_s + @format = @info['SubFormat'].to_s + @user = @info['UserNickName'].to_s + @language = @info['LanguageName'].to_s + @release_name = @info['MovieReleaseName'].to_s + @download_count = @info['SubDownloadsCnt'].to_i + @rating = @info['SubRating'].to_f + @uploaded_at = @info['SubAddDate'].to_s # TODO: convert to time object? + @download_url = @info['SubDownloadLink'].to_s end @fps = args[:fps] || 23.976 parse_dump(args[:dump], args[:format]) if args[:dump] lib/subtitle_it/subtitle.rb @@ -2,7 +2,7 @@ module SubtitleIt module VERSION #:nodoc: MAJOR = 0 MINOR = 7 - TINY = 6 + TINY = 7 STRING = [MAJOR, MINOR, TINY].join('.') end lib/subtitle_it/version.rb @@ -12,16 +12,16 @@ module BinspecHelper def mock_subtitle @mock_subtitle = mock(Subtitle, { - :info => sub_info, :format => 'srt' + :info => sub_info, :format => 'srt', :<=> => 1 }) end def sub_info { - "SubLanguageID" => 'eng', - "MovieName" => 'Resevoir Dogs', - "MovieYear" => '1992', - "SubFileName" => 'Cool sub', + "SubLanguageID" => 'eng', + "MovieName" => 'Resevoir Dogs', + "MovieYear" => '1992', + "SubFileName" => 'Cool sub', "MovieImdbRating" => '10.0', "SubDownloadsCnt" => '310', "SubRating" => '9.5', @@ -60,24 +60,30 @@ end describe Subdownloader do include BinspecHelper + + it "should print languages" do + STDOUT.should_receive(:puts).at_least(30).times + SubtitleIt::Bin.print_languages + end 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(:puts).with("Found 2 results. 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("2) 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(:search_subtitles).and_return([mock_subtitle, mock_subtitle]) @mock_subdown.should_receive(:log_out!).and_return(true) Subdownloader.new.run! "file.avi" spec/subtitle_it/bin_spec.rb @@ -39,7 +39,7 @@ describe Formats, ".mpl" 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...") +[4203][4233]worth going a | line...\n") end end end \ No newline at end of file spec/subtitle_it/formats/mpl_spec.rb @@ -36,7 +36,7 @@ describe Formats, ".rsb" do end it "should dump the object to rsb" do - @sub.to_rsb.should eql("- title: sincity\n- authors: \n- version: 1.1\n00:05:26.500 => 00:05:28.500 == worth killing for...\n00:06:00.400 => 00:06:03.400 == worth dying for...\n00:07:00.300 => 00:07:03.300 == worth going to the hell for...\n00:07:00.300 => 00:07:03.300 == worth going a | line...") + @sub.to_rsb.should eql("- title: sincity\n- authors: \n- version: 1.1\n00:05:26.500 => 00:05:28.500 == worth killing for...\n00:06:00.400 => 00:06:03.400 == worth dying for...\n00:07:00.300 => 00:07:03.300 == worth going to the hell for...\n00:07:00.300 => 00:07:03.300 == worth going a | line...\n") end end end \ No newline at end of file spec/subtitle_it/formats/rsb_spec.rb @@ -40,10 +40,10 @@ describe Formats, ".sub" do end it "should dump the object as a SUB" do - @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...") + @sub.to_sub.should eql("{7816}{7864}worth killing for... +{8631}{8703}worth dying for... +{10069}{10141}worth going to the hell for... +{10069}{10141}worth going a | line...\n") end end end \ No newline at end of file spec/subtitle_it/formats/sub_spec.rb @@ -38,7 +38,7 @@ describe Formats, ".xml" do it "should parse the sub to an array" do @sub.to_xml.should be_instance_of(String) end - + it "should equal..." do @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\"> @@ -51,7 +51,7 @@ describe Formats, ".xml" do <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> + <p begin=\"00:07:00.300\" dur=\"00:00:03.000\">worth going a | line...</p> </div> </body> </tt>") spec/subtitle_it/formats/xml_spec.rb @@ -54,39 +54,41 @@ describe Subdown do end it "should get subtitle languages" do - @down.subtitle_languages.should be_nil + @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 # Opensubtitle API changes.... any suggestions? -# -#describe Subdown, " - Wired tests" do - # before(:each) do - # @down = Subdown.new - # @movie = mock(Movie, :haxx => '09a2c497663259cb') - # end - - # it "should get imdb info" do - # @down.log_in! - # @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 - # @down.log_in! - # @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 +# +# # +# 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", +# "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| +# r.should be_instance_of(Subtitle) +# end +# end # end \ No newline at end of file spec/subtitle_it/subdown_spec.rb @@ -35,11 +35,6 @@ describe Subtitle do it "should compare to another using rating" do @another_sub = Subtitle.new(attr_valid_subtitle.with(:info => { "SubRating" => 4.0} )) (@sub > @another_sub).should be_true - end - - + end end - - - end spec/subtitle_it/subtitle_spec.rb @@ -1,16 +1,16 @@ Gem::Specification.new do |s| s.name = %q{subtitle_it} - s.version = "0.7.6" + s.version = "0.7.7" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Marcos Piccinini", "Warlley Rezende", "Giovanni Rapagnani"] - s.date = %q{2008-09-17} + s.date = %q{2008-09-20} 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/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.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/languages.rb", "lib/subtitle_it/movie.rb", "lib/subtitle_it/movie_hasher.rb", "lib/subtitle_it/platform_endl.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.has_rdoc = true s.homepage = %q{http://github.com/nofxx/subtitle_it} s.post_install_message = %q{ subtitle_it.gemspec 6ca0d92c523b423b63d153a06069afeaed493cce Marcos Augusto x@nofxx.com http://github.com/nofxx/subtitle_it/commit/1e7e26941d3b818cd56c65c8f7e9988ad6c0366f 1e7e26941d3b818cd56c65c8f7e9988ad6c0366f

2008-09-20T17:17:32-07:00

adds search language fbd500bcbb8658f85040c131288ee80d627c42e8 Marcos Augusto x@nofxx.com