osdb 0.0.1 → 0.0.2

data/Manifest

@@ -1,10 +1,15 @@
 Manifest
 Rakefile
+bin/getsub
 lib/osdb.rb
+lib/osdb/language.rb
 lib/osdb/movie.rb
 lib/osdb/server.rb
 lib/osdb/sub.rb
+osdb.gemspec
 spec/fixtures/somemovie.avi
+spec/osdb/language_spec.rb
 spec/osdb/movie_spec.rb
 spec/osdb/server_spec.rb
+spec/osdb/sub_spec.rb
 spec/spec_helper.rb

data/Rakefile

@@ -10,7 +10,7 @@ end
 begin
   require 'echoe'
   
-  Echoe.new('osdb', '0.0.1') do |p|
+  Echoe.new('osdb', '0.0.2') do |p|
     p.description    = "Ruby library to access OSDb services like OpenSubtitles.org"
     p.url            = "http://github.com/byroot/ruby-osdb"
     p.author         = "Jean Boussier"

data/bin/getsub

@@ -0,0 +1,64 @@
+#!/usr/bin/ruby
+
+require 'optparse'
+require 'uri'
+require 'rubygems'
+require "osdb"
+
+def env_lang
+  OSDb::Language.from_locale(ENV['LANG'])
+end
+
+@options = {:language => env_lang.to_iso639_2b, :force => false }
+@parser ||= OptionParser.new do |opts|
+  opts.banner = "Automatically download subs for your video files using opensubtitle.org"
+  opts.separator ""
+  opts.separator "Usage: getsub [options] VIDEO_FILE [VIDEO_FILE ...]"
+  opts.separator ""
+  opts.separator "Main options:"
+  
+  opts.on("-l", "--language LANGUAGE", "Sub language ISO 963 code like fre or eng. Default: env $LANG (#{env_lang.to_iso639_2b})") do |language|
+    @options[:language] = language
+  end
+  
+  opts.on("-f", "--force", "Download sub even if video already has one") { @options[:force] = true }
+end.parse!
+
+
+class OSDb::Movie
+  
+  def has_sub?
+    exist = false
+    %w(.srt .sub).each{ |ext| exist ||= File.exist?(path.gsub(File.extname(path), ext)) }
+    exist
+  end
+  
+  def sub_path(format)
+    path.gsub(File.extname(path), ".#{format}")
+  end
+  
+end
+
+movies = ARGV.map{ |path| OSDb::Movie.new(path) }
+movies.reject!(&:has_sub?) unless @options[:force]
+
+server = OSDb::Server.new(
+  :host => 'api.opensubtitles.org', 
+  :path => '/xml-rpc', 
+  :timeout => 90, 
+  :useragent => "SubDownloader 2.0.10" # register useragent ? WTF ? too boring.
+) 
+STDOUT.sync = true
+
+movies.each do |movie|
+  puts "* search subs for: #{movie.path}"
+  subs = server.search_subtitles(:moviehash => movie.hash, :moviebytesize => movie.size, :sublanguageid => @options[:language])
+  if subs.any?
+    sub_path = movie.sub_path(subs.first.format)
+    puts "download sub to #{sub_path}"
+    %x{ curl '#{subs.first.url}' | gunzip > #{sub_path} & }
+  else
+    puts "no sub found"
+  end
+  puts
+end

data/lib/osdb.rb

@@ -2,6 +2,7 @@ require 'xmlrpc/client'
 
 module OSDb
   base_path = File.expand_path(File.dirname(__FILE__) + '/osdb')
+  autoload :Language,  "#{base_path}/language"
   autoload :Movie,  "#{base_path}/movie"
   autoload :Server, "#{base_path}/server"
   autoload :Sub,    "#{base_path}/sub"

data/lib/osdb/language.rb

@@ -0,0 +1,84 @@
+module OSDb
+  
+  LANGUAGES = [ 
+    {:iso639_1 => 'sq', :iso639_2b => 'alb', :locale => 'sq', :name => 'Albanian'},
+    {:iso639_1 => 'ar', :iso639_2b => 'ara', :locale => 'ar', :name => 'Arabic'},
+    {:iso639_1 => 'hy', :iso639_2b => 'arm', :locale => 'hy', :name => 'Armenian'},
+    {:iso639_1 => 'ms', :iso639_2b => 'may', :locale => 'ms', :name => 'Malay'},
+    {:iso639_1 => 'bs', :iso639_2b => 'bos', :locale => 'bs', :name => 'Bosnian'},
+    {:iso639_1 => 'bg', :iso639_2b => 'bul', :locale => 'bg', :name => 'Bulgarian'},
+    {:iso639_1 => 'ca', :iso639_2b => 'cat', :locale => 'ca', :name => 'Catalan'},
+    {:iso639_1 => 'eu', :iso639_2b => 'eus', :locale => 'eu', :name => 'Basque'},
+    {:iso639_1 => 'zh', :iso639_2b => 'chi', :locale => 'zh_CN', :name => 'Chinese (China)'},
+    {:iso639_1 => 'hr', :iso639_2b => 'hrv', :locale => 'hr', :name => 'Croatian'},
+    {:iso639_1 => 'cs', :iso639_2b => 'cze', :locale => 'cs', :name => 'Czech'},
+    {:iso639_1 => 'da', :iso639_2b => 'dan', :locale => 'da', :name => 'Danish'},
+    {:iso639_1 => 'nl', :iso639_2b => 'dut', :locale => 'nl', :name => 'Dutch'},
+    {:iso639_1 => 'en', :iso639_2b => 'eng', :locale => 'en', :name => 'English (US)'},
+    {:iso639_1 => 'en', :iso639_2b => 'bre', :locale => 'en_GB', :name => 'English (UK)'},
+    {:iso639_1 => 'eo', :iso639_2b => 'epo', :locale => 'eo', :name => 'Esperanto'},
+    {:iso639_1 => 'et', :iso639_2b => 'est', :locale => 'et', :name => 'Estonian'},
+    {:iso639_1 => 'fi', :iso639_2b => 'fin', :locale => 'fi', :name => 'Finnish'},
+    {:iso639_1 => 'fr', :iso639_2b => 'fre', :locale => 'fr', :name => 'French'},
+    {:iso639_1 => 'gl', :iso639_2b => 'glg', :locale => 'gl', :name => 'Galician'},
+    {:iso639_1 => 'ka', :iso639_2b => 'geo', :locale => 'ka', :name => 'Georgian'},
+    {:iso639_1 => 'de', :iso639_2b => 'ger', :locale => 'de', :name => 'German'},
+    {:iso639_1 => 'el', :iso639_2b => 'ell', :locale => 'el', :name => 'Greek'},
+    {:iso639_1 => 'he', :iso639_2b => 'heb', :locale => 'he', :name => 'Hebrew'},
+    {:iso639_1 => 'hu', :iso639_2b => 'hun', :locale => 'hu', :name => 'Hungarian'},
+    {:iso639_1 => 'id', :iso639_2b => 'ind', :locale => 'id', :name => 'Indonesian'},
+    {:iso639_1 => 'it', :iso639_2b => 'ita', :locale => 'it', :name => 'Italian'},
+    {:iso639_1 => 'ja', :iso639_2b => 'jpn', :locale => 'ja', :name => 'Japanese'},
+    {:iso639_1 => 'kk', :iso639_2b => 'kaz', :locale => 'kk', :name => 'Kazakh'},
+    {:iso639_1 => 'ko', :iso639_2b => 'kor', :locale => 'ko', :name => 'Korean'},
+    {:iso639_1 => 'lv', :iso639_2b => 'lav', :locale => 'lv', :name => 'Latvian'},
+    {:iso639_1 => 'lt', :iso639_2b => 'lit', :locale => 'lt', :name => 'Lithuanian'},
+    {:iso639_1 => 'lb', :iso639_2b => 'ltz', :locale => 'lb', :name => 'Luxembourgish'},
+    {:iso639_1 => 'mk', :iso639_2b => 'mac', :locale => 'mk', :name => 'Macedonian'},
+    {:iso639_1 => 'no', :iso639_2b => 'nor', :locale => 'no', :name => 'Norwegian'},
+    {:iso639_1 => 'fa', :iso639_2b => 'per', :locale => 'fa', :name => 'Persian'},
+    {:iso639_1 => 'pl', :iso639_2b => 'pol', :locale => 'pl', :name => 'Polish'},
+    {:iso639_1 => 'pt', :iso639_2b => 'por', :locale => 'pt_PT', :name => 'Portuguese (Portugal)'},
+    {:iso639_1 => 'pb', :iso639_2b => 'pob', :locale => 'pt_BR', :name => 'Portuguese (Brazil)'},
+    {:iso639_1 => 'ro', :iso639_2b => 'rum', :locale => 'ro', :name => 'Romanian'},
+    {:iso639_1 => 'ru', :iso639_2b => 'rus', :locale => 'ru', :name => 'Russian'},
+    {:iso639_1 => 'sr', :iso639_2b => 'scc', :locale => 'sr', :name => 'Serbian'},
+    {:iso639_1 => 'sk', :iso639_2b => 'slo', :locale => 'sk', :name => 'Slovak'},
+    {:iso639_1 => 'sl', :iso639_2b => 'slv', :locale => 'sl', :name => 'Slovenian'},
+    {:iso639_1 => 'es', :iso639_2b => 'spa', :locale => 'es_ES', :name => 'Spanish (Spain)'},
+    {:iso639_1 => 'sv', :iso639_2b => 'swe', :locale => 'sv', :name => 'Swedish'},
+    {:iso639_1 => 'th', :iso639_2b => 'tha', :locale => 'th', :name => 'Thai'},
+    {:iso639_1 => 'tr', :iso639_2b => 'tur', :locale => 'tr', :name => 'Turkish'},
+    {:iso639_1 => 'uk', :iso639_2b => 'ukr', :locale => 'uk', :name => 'Ukrainian'},
+    {:iso639_1 => 'vi', :iso639_2b => 'vie', :locale => 'vi', :name => 'Vietnamese'}
+  ]
+  
+  class Language
+    
+    class << self
+      
+      def from_locale(locale)
+        locale = locale.split('.').first
+        lang = LANGUAGES.find{ |lang| lang[:locale] == locale }
+        return from_locale(locale.split('_').first) if !lang && locale.include?('_')
+        new(lang)
+      end
+      
+      def from_iso639_2b(code)
+        new(LANGUAGES.find{ |lang| lang[:iso639_2b] == code })
+      end
+      
+    end
+    
+    attr_reader :name, :to_iso639_1, :to_iso639_2b, :to_locale
+    
+    def initialize(hash)
+      @name = hash[:name]
+      @to_iso639_1 = hash[:iso639_1]
+      @to_iso639_2b = hash[:iso639_2b]
+      @to_locale = hash[:locale]
+    end
+    
+  end
+  
+end

data/lib/osdb/server.rb

@@ -10,7 +10,7 @@ module OSDb
     def initialize(options={})
       @username = options[:username] || ''
       @password = options[:password] || ''
-      @language = options[:language] || 'en'
+      @language = options[:language] || 'eng'
       @useragent = options[:useragent] || 'ruby-osdb v0.1'
       @client = ::XMLRPC::Client.new(*options.values_at(:host, :path, :port, :proxy_host, :proxy_port, :http_user, :http_password, :use_ssl, :timeout))
     end
@@ -37,7 +37,8 @@ module OSDb
     end
     
     def search_subtitles(*queries)
-      client.call('SearchSubtitles', token, queries)
+      subs = client.call('SearchSubtitles', token, queries)['data']
+      subs ? subs.map{ |s| Sub.new(s) } : []
     end
     
     def info

data/lib/osdb/sub.rb

@@ -1,4 +1,19 @@
+require 'uri'
+
 module OSDb
+  
   class Sub
+    
+    attr_reader :url, :format, :language, :rating, :raw_data
+    
+    def initialize(data)
+      @url = URI.parse(data['SubDownloadLink'])
+      @format = data['SubFormat']
+      @language = Language.from_iso639_2b(data['SubLanguageID'])
+      @rating = data['SubRating']
+      @raw_data = data
+    end
+    
   end
+  
 end

data/osdb.gemspec

@@ -2,21 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{osdb}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jean Boussier"]
   s.cert_chain = ["/Users/byroot/.ssh/gem-public_cert.pem"]
-  s.date = %q{2010-08-29}
+  s.date = %q{2010-09-29}
+  s.default_executable = %q{getsub}
   s.description = %q{Ruby library to access OSDb services like OpenSubtitles.org}
   s.email = %q{jean.boussier @nospam@ gmail.com}
-  s.extra_rdoc_files = ["lib/osdb.rb", "lib/osdb/movie.rb", "lib/osdb/server.rb", "lib/osdb/sub.rb"]
-  s.files = ["Manifest", "Rakefile", "lib/osdb.rb", "lib/osdb/movie.rb", "lib/osdb/server.rb", "lib/osdb/sub.rb", "spec/fixtures/somemovie.avi", "spec/osdb/movie_spec.rb", "spec/osdb/server_spec.rb", "spec/spec_helper.rb", "osdb.gemspec"]
+  s.executables = ["getsub"]
+  s.extra_rdoc_files = ["bin/getsub", "lib/osdb.rb", "lib/osdb/language.rb", "lib/osdb/movie.rb", "lib/osdb/server.rb", "lib/osdb/sub.rb"]
+  s.files = ["Manifest", "Rakefile", "bin/getsub", "lib/osdb.rb", "lib/osdb/language.rb", "lib/osdb/movie.rb", "lib/osdb/server.rb", "lib/osdb/sub.rb", "osdb.gemspec", "spec/fixtures/somemovie.avi", "spec/osdb/language_spec.rb", "spec/osdb/movie_spec.rb", "spec/osdb/server_spec.rb", "spec/osdb/sub_spec.rb", "spec/spec_helper.rb"]
   s.homepage = %q{http://github.com/byroot/ruby-osdb}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Osdb"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{osdb}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.signing_key = %q{/Users/byroot/.ssh/gem-private_key.pem}
   s.summary = %q{Ruby library to access OSDb services like OpenSubtitles.org}
 
@@ -24,7 +26,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/spec/osdb/language_spec.rb

@@ -0,0 +1,57 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe OSDb::Language do
+  
+  describe '.from_locale' do
+    
+    describe "simple locale" do
+      
+      subject{ OSDb::Language.from_locale('fr') }
+      
+      its(:name) { should == 'French' }
+      
+      its(:to_iso639_1) { should == 'fr' }
+      
+      its(:to_iso639_2b) { should == 'fre' }
+      
+    end
+    
+    describe "locale with territory" do
+      
+      subject{ OSDb::Language.from_locale('en_US') }
+      
+      its(:name) { should == 'English (US)' }
+      
+      its(:to_iso639_1) { should == 'en' }
+      
+      its(:to_iso639_2b) { should == 'eng' }
+      
+    end
+
+    describe "locale with territory and encoding" do
+      
+      subject{ OSDb::Language.from_locale('es_ES.UTF8') }
+      
+      its(:name) { should == 'Spanish (Spain)' }
+      
+      its(:to_iso639_1) { should == 'es' }
+      
+      its(:to_iso639_2b) { should == 'spa' }
+      
+    end
+    
+  end
+  
+  describe ".from_iso_639_2b" do
+    
+    subject{ OSDb::Language.from_iso639_2b('bre') }
+    
+    its(:name) { should == 'English (UK)' }
+    
+    its(:to_iso639_1) { should == 'en' }
+    
+    its(:to_locale) { should == 'en_GB' }
+    
+  end
+  
+end

data/spec/osdb/movie_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe OSDb::Server do
+describe OSDb::Movie do
   
   subject do
     OSDb::Movie.new(File.dirname(__FILE__) + '/../fixtures/somemovie.avi')

data/spec/osdb/server_spec.rb

@@ -54,22 +54,22 @@ describe OSDb::Server do
   describe '#search_subtitles' do
     
     it 'can search by hash and size' do
-      subs = subject.search_subtitles(:moviehash => 'bd71526264fd8bd9', :moviebytesize => '183406990', :sublanguageid => 'fre')['data']
+      subs = subject.search_subtitles(:moviehash => 'bd71526264fd8bd9', :moviebytesize => '183406990', :sublanguageid => 'fre')
       subs.should be_a(Array)
       subs.length.should >= 2
       subs.each do |sub|
-        sub['LanguageName'].should == 'French'
-        sub['MovieName'].should == '"How I Met Your Mother"'
+        sub.language.name.should == 'French'
+        sub.raw_data['MovieName'].should == '"How I Met Your Mother"'
       end
     end
     
     it 'can search by imdbid' do
-      subs = subject.search_subtitles(:imdbid => "0117500", :sublanguageid => 'fre')['data']
+      subs = subject.search_subtitles(:imdbid => "0117500", :sublanguageid => 'fre')
       subs.should be_a(Array)
       subs.length.should >= 1
       subs.each do |sub|
-        sub['LanguageName'].should == 'French'
-        sub['MovieName'].should == 'The Rock'
+        sub.language.name.should == 'French'
+        sub.raw_data['MovieName'].should == 'The Rock'
       end
     end
     

data/spec/osdb/sub_spec.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe OSDb::Sub do
+  
+  subject do
+    OSDb::Sub.new(
+      'SubFormat' => 'srt',
+      'SubDownloadLink' => 'http://example.com/foo.srt.gz',
+      'SubRating' => 7.89,
+      'SubLanguageID' => 'dut'
+    )
+  end
+  
+  its(:format) { should == 'srt' }
+  
+  its(:url) { should be_an(URI::HTTP) }
+  
+  its(:language) { should be_a(OSDb::Language) }
+  
+  its(:rating) { should == 7.89 }
+  
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: osdb
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jean Boussier
@@ -35,33 +36,39 @@ cert_chain:
   V/TAGOVlGVotOBnewCUdlw==
   -----END CERTIFICATE-----
 
-date: 2010-08-29 00:00:00 +02:00
+date: 2010-09-29 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
 description: Ruby library to access OSDb services like OpenSubtitles.org
 email: jean.boussier @nospam@ gmail.com
-executables: []
-
+executables: 
+- getsub
 extensions: []
 
 extra_rdoc_files: 
+- bin/getsub
 - lib/osdb.rb
+- lib/osdb/language.rb
 - lib/osdb/movie.rb
 - lib/osdb/server.rb
 - lib/osdb/sub.rb
 files: 
 - Manifest
 - Rakefile
+- bin/getsub
 - lib/osdb.rb
+- lib/osdb/language.rb
 - lib/osdb/movie.rb
 - lib/osdb/server.rb
 - lib/osdb/sub.rb
+- osdb.gemspec
 - spec/fixtures/somemovie.avi
+- spec/osdb/language_spec.rb
 - spec/osdb/movie_spec.rb
 - spec/osdb/server_spec.rb
+- spec/osdb/sub_spec.rb
 - spec/spec_helper.rb
-- osdb.gemspec
 has_rdoc: true
 homepage: http://github.com/byroot/ruby-osdb
 licenses: []
@@ -75,16 +82,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2
@@ -92,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: osdb
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby library to access OSDb services like OpenSubtitles.org