osdb 0.0.2 → 0.0.3

data/Manifest

@@ -1,4 +1,5 @@
 Manifest
+README.md
 Rakefile
 bin/getsub
 lib/osdb.rb

data/README.md

@@ -0,0 +1,27 @@
+# OSDb
+
+Client library for the [OSDb protocol](http://trac.opensubtitles.org/projects/opensubtitles/wiki/XMLRPC).
+Currently the implentation is limited to movie identification and subtitles search
+
+## Examples
+
+Just read the source of `bin/getsub` it is a typical example of OSDb's capacities.
+
+## getsub
+
+The osdb gem provide a simple script to find and download the best subtitle on
+[opensubtitles.org](http://www.opensubtitles.org/) for your video file.
+
+### Installation
+
+    $ gem install osdb
+
+### Usage
+
+You just have to execute `getsub` with some video files in arguments:
+
+    $ getsub somemovie.avi othermovie.mkv
+
+For options details just run:
+
+    $ getsub --help

data/Rakefile

@@ -10,14 +10,16 @@ end
 begin
   require 'echoe'
   
-  Echoe.new('osdb', '0.0.2') do |p|
+  Echoe.new('osdb', '0.0.3') 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"
     p.email          = "jean.boussier @nospam@ gmail.com"
   end
   
-rescue LoadError
+rescue LoadError => e
+  puts "Failed to load Echoe"
+  puts e.message
 end
 
 task :default => :spec

data/bin/getsub

@@ -22,7 +22,8 @@ end
   end
   
   opts.on("-f", "--force", "Download sub even if video already has one") { @options[:force] = true }
-end.parse!
+end
+@parser.parse!
 
 
 class OSDb::Movie
@@ -39,6 +40,56 @@ class OSDb::Movie
   
 end
 
+def curl_available?
+  %x{ curl --version 2> /dev/null > /dev/null }
+  $?.success?
+end
+
+def wget_available?
+  %x{ wget --version 2> /dev/null > /dev/null }
+  $?.success?
+end
+
+def download!(url, local_path)
+  puts "* download #{url} to #{local_path}"
+  if curl_available?
+    %x{ curl '#{url}' | gunzip > '#{local_path}' }
+  elsif wget_available?
+    %x{ wget -O - '#{url}' | gunzip > '#{local_path}'}
+  else
+    puts "Can't found any curl or wget please install one of them or manualy download your sub"
+    puts url
+  end
+end
+
+def group_by_movie_name(subs)
+  subs.inject({}) do |hash, sub| 
+    hash[sub.movie_name] ||= []
+    hash[sub.movie_name] << sub
+    hash
+  end
+end
+
+def ask_user_to_identify_movie(movies)
+  puts "D'oh! You stumbled upon a hash conflict, please resolve it:"
+  puts
+  movies.keys.each_with_index do |name, index|
+    puts " #{index} - #{name}"
+  end
+  puts
+  print 'id: '
+  str = STDIN.gets
+  movies[movies.keys[str.to_i]]
+end
+
+def select_sub(subs)
+  return subs.first if subs.length == 1
+  movies = group_by_movie_name(subs)
+  return movies.values.first.max(&:rating) if movies.length == 1
+  selected_movie_subs = ask_user_to_identify_movie(movies)
+  selected_movie_subs.max(&:rating)
+end
+
 movies = ARGV.map{ |path| OSDb::Movie.new(path) }
 movies.reject!(&:has_sub?) unless @options[:force]
 
@@ -50,15 +101,21 @@ server = OSDb::Server.new(
 ) 
 STDOUT.sync = true
 
+if movies.empty?
+  puts "No file provided"
+  puts @parser.help
+  exit 1
+end
+
 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} & }
+    sub = select_sub(subs)
+    sub_path = movie.sub_path(sub.format)
+    download!(sub.url, sub_path)
   else
-    puts "no sub found"
+    puts "* no sub found"
   end
   puts
 end

data/lib/osdb/sub.rb

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

data/osdb.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{osdb}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   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-09-29}
+  s.date = %q{2010-10-17}
   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.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.extra_rdoc_files = ["README.md", "bin/getsub", "lib/osdb.rb", "lib/osdb/language.rb", "lib/osdb/movie.rb", "lib/osdb/server.rb", "lib/osdb/sub.rb"]
+  s.files = ["Manifest", "README.md", "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.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Osdb", "--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{osdb}
   s.rubygems_version = %q{1.3.7}

data/spec/osdb/server_spec.rb

@@ -6,7 +6,8 @@ describe OSDb::Server do
     @server = OSDb::Server.new(
       :host => 'api.opensubtitles.org', 
       :path => '/xml-rpc',
-      :timeout => 60 # OS.org is very very slow ....
+      :timeout => 60, # OS.org is very very slow ....
+      :useragent => 'OS Test User Agent'
     )
   end
   
@@ -39,14 +40,14 @@ describe OSDb::Server do
   describe "#check_movie_hash" do
     
     it 'should identify movie' do
-      subject.check_movie_hash(:moviehash => '37d0c7d0cfcbe280')['data'].should == [{
+      subject.check_movie_hash('37d0c7d0cfcbe280')['data'].should == {
         "37d0c7d0cfcbe280" => {
           "MovieYear" => "1996",
           "MovieImdbID" => "0117500",
           "MovieName" => "The Rock",
           "MovieHash" => "37d0c7d0cfcbe280"
         }
-      }]
+      }
     end
     
   end

data/spec/osdb/sub_spec.rb

@@ -7,7 +7,8 @@ describe OSDb::Sub do
       'SubFormat' => 'srt',
       'SubDownloadLink' => 'http://example.com/foo.srt.gz',
       'SubRating' => 7.89,
-      'SubLanguageID' => 'dut'
+      'SubLanguageID' => 'dut',
+      'MovieName' => 'Lock, Stock and Two Smoking Barrels'
     )
   end
   
@@ -19,4 +20,6 @@ describe OSDb::Sub do
   
   its(:rating) { should == 7.89 }
   
-end
+  its(:movie_name) { should == 'Lock, Stock and Two Smoking Barrels' }
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: osdb
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jean Boussier
@@ -36,7 +36,7 @@ cert_chain:
   V/TAGOVlGVotOBnewCUdlw==
   -----END CERTIFICATE-----
 
-date: 2010-09-29 00:00:00 +02:00
+date: 2010-10-17 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -47,6 +47,7 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- README.md
 - bin/getsub
 - lib/osdb.rb
 - lib/osdb/language.rb
@@ -55,6 +56,7 @@ extra_rdoc_files:
 - lib/osdb/sub.rb
 files: 
 - Manifest
+- README.md
 - Rakefile
 - bin/getsub
 - lib/osdb.rb
@@ -79,6 +81,8 @@ rdoc_options:
 - --inline-source
 - --title
 - Osdb
+- --main
+- README.md
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement