suby 0.1.0 → 0.1.1

data/bin/suby

@@ -5,18 +5,18 @@ require 'optparse'
 
 options = {}
 option_parser = OptionParser.new do |opts|
-   opts.banner = "#{File.basename $0} [options] video"
-   opts.separator '  Find and download subtitles for the given video file'
-   opts.separator "\nOptions:"
+  opts.banner = "#{File.basename $0} [options] video"
+  opts.separator '  Find and download subtitles for the given video file'
+  opts.separator "\nOptions:"
 
-   opts.on '-l', '--lang LANG = en', 'Lang for subtitles' do |lang|
+  opts.on '-l', '--lang LANG = en', 'Lang for subtitles' do |lang|
     options[:lang] = lang
-   end
+  end
 
-   opts.on '-h', '--help', 'Show usage' do
-     puts opts
-     exit
-   end
+  opts.on '-h', '--help', 'Show usage' do
+    puts opts
+    exit
+  end
 end
 
 option_parser.parse!

data/lib/suby.rb

@@ -1,71 +1,77 @@
 require_relative 'suby/downloader_error'
 require_relative 'suby/not_found_error'
+require_relative 'suby/filename_parser'
 require_relative 'suby/downloader'
-require 'zip/zip'
+require_relative 'suby/interface'
 
-module Suby
-  extend self
+gem 'rubyzip2'
+require 'zip'
 
-  SUB_EXTENSIONS = %w[srt sub]
+module Suby
+  SUB_EXTENSIONS = %w[srt sub].map { |ext| ".#{ext}" }
   TEMP_ARCHIVE_NAME = '__archive__'
 
-  def download_subtitles(files, options = {})
-    files.each { |file|
-      next puts "Skipping: #{file}" if SUB_EXTENSIONS.any? { |ext|
-        File.exist? File.basename(file, File.extname(file)) + ".#{ext}"
-      }
-      download_subtitles_for_file(file, options)
-    }
-  end
+  class << self
+    include Interface
 
-  def download_subtitles_for_file(file, options)
-    begin
-      success = Downloader::DOWNLOADERS.find { |downloader_class|
-        try_downloader(downloader_class.new(file, options[:lang]))
+    def download_subtitles(files, options = {})
+      files.each { |file|
+        next if Dir.exist?(file) or SUB_EXTENSIONS.include?(File.extname(file))
+        next puts "Skipping: #{file}" if SUB_EXTENSIONS.any? { |ext|
+          File.exist? File.basename(file, File.extname(file)) + ext
+        }
+        download_subtitles_for_file(file, options)
       }
-      unless success
-        STDERR.puts "No downloader could find subtitles for #{file}"
+    end
+
+    def download_subtitles_for_file(file, options)
+      begin
+        show, season, episode = FilenameParser.parse(file)
+        puts file
+        success = Downloader::DOWNLOADERS.find { |downloader_class|
+          try_downloader(downloader_class.new(file, show, season, episode, options[:lang]))
+        }
+        error "No downloader could find subtitles for #{file}" unless success
+      rescue
+        error "  The download of the subtitles failed for #{file}:"
+        error "  #{$!.class}: #{$!.message}"
+        puts $!.backtrace.map { |line| line.prepend ' '*4 }
       end
-    rescue
-      puts "  The download of the subtitles failed for #{file}:"
-      puts "  #{$!.class}: #{$!.message}"
-      puts $!.backtrace.map { |line| line.prepend ' '*4 }
     end
-  end
 
-  def try_downloader(downloader)
-    begin
-      downloader.download
-    rescue Suby::NotFoundError => error
-      puts "#{downloader.class} did not find subtitles for " +
-           "#{downloader.file} (#{error.message})"
-      false
-    rescue Suby::DownloaderError => error
-      puts "#{downloader.class} had a problem finding subtitles for " +
-           "#{downloader.file} (#{error.message})"
-      false
-    else
-      puts "#{downloader.class} found subtitles for #{downloader.file}"
-      true
+    def try_downloader(downloader)
+      begin
+        print "  #{downloader.to_s.ljust(20)}"
+        downloader.download
+      rescue Suby::NotFoundError => error
+        failure "Failed: #{error.message}"
+        false
+      rescue Suby::DownloaderError => error
+        error "Error: #{error.message}"
+        false
+      else
+        success "Found"
+        true
+      end
     end
-  end
 
-  def extract_sub_from_archive(archive, format, basename)
-    case format
-    when :zip
-      Zip::ZipFile.open(archive) { |zip|
-        sub = zip.entries.find { |entry|
-          entry.to_s =~ /\.#{Regexp.union SUB_EXTENSIONS}$/
+    def extract_sub_from_archive(archive, format, basename)
+      case format
+      when :zip
+        Zip::ZipFile.open(archive) { |zip|
+          sub = zip.entries.find { |entry|
+            entry.to_s =~ /#{Regexp.union SUB_EXTENSIONS}$/
+          }
+          raise "no subtitles in #{archive}" unless sub
+          name = basename + File.extname(sub.to_s)
+          sub.extract(name)
         }
-        raise "no subtitles in #{archive}" unless sub
-        name = basename + File.extname(sub.to_s)
-        sub.extract(name)
-      }
-    else
-      raise "unknown archive type (#{archive})"
+      else
+        raise "unknown archive type (#{archive})"
+      end
+    ensure
+      # Cleaning
+      File.unlink archive if File.exist? archive
     end
-  ensure
-    # Cleaning
-    File.unlink archive if File.exist? archive
   end
 end

data/lib/suby/downloader.rb

@@ -1,7 +1,6 @@
 require 'net/http'
 require 'cgi/util'
 require 'nokogiri'
-require_relative 'filename_parser'
 
 module Suby
   class Downloader
@@ -12,9 +11,22 @@ module Suby
 
     attr_reader :show, :season, :episode, :file, :lang
 
-    def initialize(file, lang = nil)
-      @file, @lang = file, (lang || 'en').to_sym
-      @show, @season, @episode = FilenameParser.parse(file)
+    def initialize(file, *args)
+      @file = file
+      @lang = (args.last || 'en').to_sym
+      case args.size
+      when 0..1
+        @show, @season, @episode = FilenameParser.parse(file)
+      when 3..4
+        @show, @season, @episode = args
+      else
+        raise ArgumentError, "wrong number of arguments: #{args.size+1} for " +
+                             "(file, [show, season, episode], [lang])"
+      end
+    end
+
+    def to_s
+      self.class.name.sub(/^.+::/, '')
     end
 
     def http

data/lib/suby/downloader/addic7ed.rb

@@ -26,6 +26,8 @@ module Suby
 
     def subtitles_body
       body = subtitles_response.body
+      body.strip!
+      raise NotFoundError, "show/season/episode not found" if body.empty?
       if body.include? FILTER_IGNORED
         raise NotFoundError, "no subtitle available"
       end
@@ -42,10 +44,12 @@ module Suby
     end
 
     def download_url
-      download_url = Nokogiri(subtitles_body).css('a').find { |a|
+      link = Nokogiri(subtitles_body).css('a').find { |a|
         a[:href].start_with? '/original/' or
         a[:href].start_with? '/updated/'
-      }[:href]
+      }
+      raise NotFoundError, "show/season/episode not found" unless link
+      download_url = link[:href]
 
       redirected_url download_url
     end

data/lib/suby/filename_parser.rb

@@ -82,7 +82,7 @@ module Suby
       found = FILENAME_PATTERNS.find { |pattern|
         pattern =~ filename
       }
-      raise "wrong file format (#{file})" unless found
+      raise "Wrong file format (#{file})" unless found
       [clean_show_name($~[:show]), $~[:season].to_i, $~[:episode].to_i]
     end
 

data/lib/suby/interface.rb

@@ -0,0 +1,17 @@
+require 'term/ansicolor'
+
+module Suby
+  module Interface
+    def success message
+      puts Term::ANSIColor.green message
+    end
+
+    def failure message
+       puts Term::ANSIColor.blue message
+    end
+
+    def error message
+       puts Term::ANSIColor.red message
+    end
+  end
+end

data/suby.gemspec

@@ -11,7 +11,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.2'
   s.add_dependency 'nokogiri'
-  s.add_dependency 'rubyzip'
+  s.add_dependency 'rubyzip2'
+  s.add_dependency 'term-ansicolor'
 
-  s.version = '0.1.0'
+  s.version = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-29 00:00:00.000000000 Z
+date: 2011-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153546620 !ruby/object:Gem::Requirement
+  requirement: &2156836860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153546620
+  version_requirements: *2156836860
 - !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: &2153546120 !ruby/object:Gem::Requirement
+  name: rubyzip2
+  requirement: &2156836400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153546120
+  version_requirements: *2156836400
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: &2156835980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156835980
 description: Find and download subtitles
 email: eregontp@gmail.com
 executables:
@@ -46,6 +57,7 @@ files:
 - lib/suby/downloader.rb
 - lib/suby/downloader_error.rb
 - lib/suby/filename_parser.rb
+- lib/suby/interface.rb
 - lib/suby/not_found_error.rb
 - lib/suby.rb
 - .gitignore
@@ -71,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.6.1
 signing_key: 
 specification_version: 3
 summary: Subtitles' downloader