suby 0.0.5 → 0.0.6

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/README.md

@@ -0,0 +1,23 @@
+# suby
+
+Find and download subtitles
+
+suby is a little script to find and download subtitles for TV series
+
+## Install
+
+    gem install suby
+
+## Synopsis
+
+    suby 'my show 1x01 - Pilot.avi' # => Downloads my show 1x01 - Pilot.srt
+
+## Status
+
+Under heavy development.
+
+* Currently only accept one format for input.  
+  You could use [tvnamer](https://github.com/dbr/tvnamer) to rename the video files before.
+
+* Search only on tvsubtitles.net.  
+  Many series have subtitles there, but not all.

data/bin/suby

@@ -23,6 +23,4 @@ option_parser.parse!
 
 puts option_parser if ARGV.empty?
 
-ARGV.each do |file|
-  Suby.download_subtitles file, options
-end
+Suby.download_subtitles ARGV, options

data/lib/suby.rb

@@ -1,83 +1,24 @@
-require 'net/http'
-require 'nokogiri'
+require_relative 'suby/downloader'
 
 module Suby
   extend self
 
-  DEFAULT_OPTIONS = {
-    lang: 'en'
-  }
-
   SUB_EXTENSIONS = %w[srt sub]
   TEMP_ARCHIVE_NAME = '__archive__'
-  SITE = 'www.tvsubtitles.net'
-  SEARCH_URL = '/search.php'
-
-  # cache
-  SHOW_URLS = {}
-  SHOW_PAGES = {}
-
-  def download_subtitles(file, options = {})
-    options = DEFAULT_OPTIONS.merge options
-    return if SUB_EXTENSIONS.include? File.extname(file)
-    return puts "Skipping: #{file}" if SUB_EXTENSIONS.any? { |ext|
-      File.exist? File.basename(file, File.extname(file)) + ".#{ext}" }
-
-    unless /^(?<show>.+) (?<season>\d{1,2})x(?<episode>\d{1,2}) - .+\.[a-z]+?$/ =~ file
-      return puts "wrong file format (#{file}). Must be:\n<show> <season>x<episode> - <title>.<ext>"
-    end
-    season, episode = [season, episode].map(&:to_i)
-    puts "Searching subtitles for #{file}:"
-    puts "Show: #{show}, Season: #{season}, Episode: #{episode}"
-
-    Net::HTTP.start(SITE) { |tvsubtitles|
-      # search show
-      show_url = (SHOW_URLS[show] ||= begin
-        post = Net::HTTP::Post.new(SEARCH_URL)
-        post.form_data = { 'q' => show }
-        results = Nokogiri tvsubtitles.request(post).body
-        url = results.css('ul li div a').first[:href]
-
-        raise 'could not find the show' unless /^\/tvshow-(\d+)\.html$/ =~ url
-        "/tvshow-#{$1}-#{season}.html"
-      end)
-      puts "show url: #{show_url}"
-
-      # search episode
-      show = (SHOW_PAGES[show] ||= Nokogiri tvsubtitles.get(show_url).body)
-      episode_url = nil
-      show.css('div.left_articles table tr').find { |tr|
-        tr.children.find { |td| td.name == 'td' && td.text =~ /\A#{season}x0?#{episode}\z/ }
-      }.children.find { |td|
-        td.children.find { |a|
-          a.name == 'a' && a[:href].start_with?('episode') && episode_url = a[:href]
-        }
-      }
-
-      raise "invalid episode url: #{episode_url}" unless episode_url =~ /^episode-(\d+)\.html$/
-      episode_url = "/episode-#{$1}-#{options[:lang]}.html"
-      puts "episode url: #{episode_url}"
-
-      # subtitles
-      subtitles = Nokogiri tvsubtitles.get(episode_url).body
-
-      # TODO: choose 720p or most downloaded instead of first found
-      subtitle_url = subtitles.css('div.left_articles a').find { |a| a.name == 'a' && a[:href].start_with?('/subtitle') }[:href]
-      raise 'invalid subtitle url' unless subtitle_url =~ /^\/subtitle-(\d+)\.html/
-      puts "subtitle url: #{subtitle_url}"
-
-      # download
-      download_url = tvsubtitles.get("/download-#{$1}.html")['Location']
-      download_url = URI.escape('/'+download_url)
-      puts "download url: #{download_url}"
 
-      # extract
-      zip = tvsubtitles.get(download_url).body
-      open(TEMP_ARCHIVE_NAME, 'wb') { |f| f.write zip }
-      subs = extract_subs_from_archive(TEMP_ARCHIVE_NAME)
-      new_name = File.basename(file, File.extname(file))+File.extname(subs.first)
-      File.rename(subs.first, new_name)
-      puts "Renaming to #{new_name}"
+  def download_subtitles(files, options = {})
+    files.each { |file|
+      next if SUB_EXTENSIONS.include? File.extname(file)
+      next puts "Skipping: #{file}" if SUB_EXTENSIONS.any? { |ext|
+        File.exist? File.basename(file, File.extname(file)) + ".#{ext}" }
+
+      begin
+        Downloader.new(file, options[:lang]).download
+      rescue
+        puts "  The download of the subtitles failed for #{file}:"
+        puts "  #{$!.class}: #{$!.message}"
+        puts $!.backtrace.map { |line| line.prepend ' '*4 }
+      end
     }
   end
 

data/lib/suby/downloader.rb

@@ -0,0 +1,91 @@
+require 'net/http'
+require 'nokogiri'
+
+module Suby
+  class Downloader
+    SITE = 'www.tvsubtitles.net'
+    SEARCH_URL = '/search.php'
+
+    # cache
+    SHOW_URLS = {}
+    SHOW_PAGES = {}
+
+    attr_reader :show, :season, :episode, :file, :lang
+
+    def initialize file, lang = nil
+      @file, @lang = file, lang || 'en'
+      unless /^(?<show>.+) (?<season>\d{1,2})x(?<episode>\d{1,2})(?: - .+)?\.[a-z]+?$/ =~ file
+        raise "wrong file format (#{file}). Must be:\n<show> <season>x<episode>[ - <title>].<ext>"
+      end
+      @show, @season, @episode = show, season.to_i, episode.to_i
+    end
+
+    def http
+      @http ||= Net::HTTP.new(SITE).start
+    end
+
+    def show_url
+      SHOW_URLS[show] ||= begin
+        post = Net::HTTP::Post.new(SEARCH_URL)
+        post.form_data = { 'q' => show }
+        results = Nokogiri http.request(post).body
+        url = results.css('ul li div a').first[:href]
+
+        raise 'could not find the show' unless /^\/tvshow-(\d+)\.html$/ =~ url
+        "/tvshow-#{$1}-#{season}.html"
+      end
+    end
+
+    def episode_url
+      @episode_url ||= begin
+        SHOW_PAGES[show] ||= Nokogiri http.get(show_url).body
+
+        url = nil
+        SHOW_PAGES[show].css('div.left_articles table tr').find { |tr|
+          tr.children.find { |td| td.name == 'td' && td.text =~ /\A#{season}x0?#{episode}\z/ }
+        }.children.find { |td|
+          td.children.find { |a|
+            a.name == 'a' && a[:href].start_with?('episode') && url = a[:href]
+          }
+        }
+        raise "invalid episode url: #{episode_url}" unless url =~ /^episode-(\d+)\.html$/
+        "/episode-#{$1}-#{lang}.html"
+      end
+    end
+
+    def subtitles_url
+      @subtitles_url ||= begin
+        subtitles = Nokogiri http.get(episode_url).body
+
+        # TODO: choose 720p or most downloaded instead of first found
+        url = subtitles.css('div.left_articles a').find { |a| a.name == 'a' && a[:href].start_with?('/subtitle') }[:href]
+        raise 'invalid subtitle url' unless url =~ /^\/subtitle-(\d+)\.html/
+        url
+      end
+    end
+
+    def download_url
+      @download_url ||= URI.escape '/' + http.get(subtitles_url.sub('subtitle', 'download'))['Location']
+    end
+
+    def download
+      puts "Searching subtitles for #{file}:"
+      puts "Show: #{show}, Season: #{season}, Episode: #{episode}"
+
+      puts "show url: #{show_url}"
+      puts "episode url: #{episode_url}"
+      puts "subtitle url: #{subtitles_url}"
+      puts "download url: #{download_url}"
+
+      # extract
+      zip = http.get(download_url).body
+      http.finish
+      open(TEMP_ARCHIVE_NAME, 'wb') { |f| f.write zip }
+      subs = Suby.extract_subs_from_archive(TEMP_ARCHIVE_NAME)
+
+      new_name = File.basename(file, File.extname(file))+File.extname(subs.first)
+      File.rename subs.first, new_name
+      puts "Renaming to #{new_name}"
+    end
+  end
+end

data/suby.gemspec

@@ -0,0 +1,14 @@
+Gem::Specification.new do |s|
+  s.name = 'suby'
+  s.summary = "Subtitles' downloader"
+  s.description = "Find and download subtitles"
+  s.author = 'eregon'
+
+  s.files = Dir['bin/*', 'lib/**/*.rb', '.gitignore', 'README.md', 'suby.gemspec']
+  s.executables = ['suby']
+
+  s.required_ruby_version = '>= 1.9.2'
+  s.add_dependency 'nokogiri'
+
+  s.version = '0.0.6'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-19 00:00:00.000000000 Z
-dependencies: []
+date: 2011-07-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2153880860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153880860
 description: Find and download subtitles
 email: 
 executables:
@@ -19,7 +30,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/suby
+- lib/suby/downloader.rb
 - lib/suby.rb
+- .gitignore
+- README.md
+- suby.gemspec
 homepage: 
 licenses: []
 post_install_message: 
@@ -31,7 +46,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -40,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.5.1
 signing_key: 
 specification_version: 3
 summary: Subtitles' downloader