osdb 0.0.4 → 0.0.5

data/README.md

@@ -22,6 +22,10 @@ You just have to execute `getsub` with some video files in arguments:
 
     $ getsub somemovie.avi othermovie.mkv
 
+Or specify a directory to search recursively:
+
+    $ getsub -d ~/Movies
+
 For options details just run:
 
     $ getsub --help

data/Rakefile

@@ -10,7 +10,7 @@ end
 begin
   require 'echoe'
   
-  Echoe.new('osdb', '0.0.4') do |p|
+  Echoe.new('osdb', '0.0.5') 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

@@ -1,19 +1,19 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 require 'optparse'
 require 'uri'
 require 'rubygems'
-require "osdb"
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'osdb'))
 
 def env_lang
   OSDb::Language.from_locale(ENV['LANG'])
 end
 
-@options = {:language => env_lang.to_iso639_2b, :force => false }
+@options = {:language => env_lang.to_iso639_2b, :force => false, :dir => nil }
 @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 "Usage: getsub [options] DIRECTORY | VIDEO_FILE [VIDEO_FILE ...]"
   opts.separator ""
   opts.separator "Main options:"
   
@@ -21,24 +21,13 @@ end
     @options[:language] = language
   end
   
-  opts.on("-f", "--force", "Download sub even if video already has one") { @options[:force] = true }
-end
-@parser.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}")
+  opts.on("-d", "--directory DIRECTORY", "Specify a directory to search recursively for movies") do |dir|
+    @options[:dir] = dir
   end
   
+  opts.on("-f", "--force", "Download sub even if video already has one") { @options[:force] = true }
 end
+@parser.parse!
 
 def curl_available?
   %x{ curl --version 2> /dev/null > /dev/null }
@@ -53,9 +42,9 @@ end
 def download!(url, local_path)
   puts "* download #{url} to #{local_path}"
   if curl_available?
-    %x{ curl '#{url}' | gunzip > '#{local_path}' }
+    %x{ curl -s '#{url}' | gunzip > "#{local_path}" }
   elsif wget_available?
-    %x{ wget -O - '#{url}' | gunzip > '#{local_path}'}
+    %x{ wget -O -quiet - '#{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
@@ -90,7 +79,12 @@ def select_sub(subs)
   selected_movie_subs.max
 end
 
-movies = ARGV.map{ |path| OSDb::Movie.new(path) }
+def arg_files
+  return ARGV unless @options[:dir]
+  Dir.glob(File.join(@options[:dir], '**', "*.{#{OSDb::Movie::EXTENSIONS.join(',')}}"))
+end
+
+movies = arg_files.map{ |path| OSDb::Movie.new(path) }
 movies.reject!(&:has_sub?) unless @options[:force]
 
 server = OSDb::Server.new(
@@ -108,14 +102,19 @@ if movies.empty?
 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 = select_sub(subs)
-    sub_path = movie.sub_path(sub.format)
-    download!(sub.url, sub_path)
-  else
-    puts "* no sub found"
+  begin
+    puts "* search subs for: #{movie.path}"
+    subs = server.search_subtitles(:moviehash => movie.hash, :moviebytesize => movie.size, :sublanguageid => @options[:language])
+    if subs.any?
+      sub = select_sub(subs)
+      sub_path = movie.sub_path(sub.format)
+      download!(sub.url, sub_path)
+    else
+      puts "* no sub found"
+    end
+    puts
+  rescue Exception => e
+    puts "#{e.class.name}: #{e.message}:"
+    puts e.backtrace
   end
-  puts
 end

data/lib/osdb/movie.rb

@@ -1,11 +1,23 @@
 module OSDb
   class Movie
     
+    EXTENSIONS = %w(avi mpg m4v mkv mov ogv)
+    
     attr_reader :path
     
     def initialize(path)
       @path = path
     end
+
+    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
     
     def hash
       @hash ||= self.class.compute_hash(path)

data/osdb.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{osdb}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   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-10-30}
+  s.date = %q{2010-12-03}
   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}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: osdb
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jean Boussier
@@ -36,7 +36,7 @@ cert_chain:
   V/TAGOVlGVotOBnewCUdlw==
   -----END CERTIFICATE-----
 
-date: 2010-10-30 00:00:00 +02:00
+date: 2010-12-03 00:00:00 +01:00
 default_executable: 
 dependencies: []