suby 0.0.6 → 0.0.8

data/bin/suby

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'suby'
+require_relative '../lib/suby'
 require 'optparse'
 
 options = {}

data/lib/suby.rb

@@ -13,7 +13,19 @@ module Suby
         File.exist? File.basename(file, File.extname(file)) + ".#{ext}" }
 
       begin
-        Downloader.new(file, options[:lang]).download
+        success = Downloader::DOWNLOADERS.find do |downloader|
+          error = catch :downloader do
+            downloader.new(file, options[:lang]).download
+            :success
+          end
+          if error == :success
+            puts "#{downloader} found subtitles for #{file}"
+          else
+            puts "#{downloader} did not find subtitles for #{file} (#{error})"
+          end
+          error == :success
+        end
+        STDERR.puts "No downloader could find subtitles for #{file}" unless success
       rescue
         puts "  The download of the subtitles failed for #{file}:"
         puts "  #{$!.class}: #{$!.message}"
@@ -22,20 +34,20 @@ module Suby
     }
   end
 
-  def extract_subs_from_archive(archive)
-    case `file #{archive}`
-    when /Zip archive data/
-      subs = `unzip -qql #{archive}`.scan(/\d{2}:\d{2}   (.+?(?:#{SUB_EXTENSIONS.join '|'}))$/).map(&:first)
-      raise "no subtitles in #{archive}" if subs.empty?
-      subs_for_unzip = subs.map { |sub| sub.gsub(/(\[|\])/) { "\\#{$1}" } }
-      system 'unzip', archive, *subs_for_unzip, 1 => :close
-      puts "found subtitles: #{subs.join(', ')}"
+  def extract_sub_from_archive(archive, format)
+    case format
+    when :zip
+      sub = `unzip -qql #{archive}`.scan(/\d{2}:\d{2}   (.+?(?:#{SUB_EXTENSIONS.join '|'}))$/).map(&:first).first
+      raise "no subtitles in #{archive}" unless sub
+      sub_for_unzip = sub.gsub(/(\[|\])/) { "\\#{$1}" }
+      system 'unzip', archive, sub_for_unzip, 1 => :close
+      puts "found subtitle: #{sub}" if $VERBOSE
     else
       raise "unknown archive type (#{archive})"
     end
 
     # Cleaning
     File.unlink archive
-    subs
+    sub
   end
 end

data/lib/suby/downloader.rb

@@ -1,91 +1,63 @@
 require 'net/http'
+require 'cgi/util'
 require 'nokogiri'
+require_relative 'filename_parser'
 
 module Suby
   class Downloader
-    SITE = 'www.tvsubtitles.net'
-    SEARCH_URL = '/search.php'
-
-    # cache
-    SHOW_URLS = {}
-    SHOW_PAGES = {}
+    DOWNLOADERS = []
+    def self.inherited(subclass)
+      DOWNLOADERS << subclass
+    end
 
     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
+    def initialize(file, lang = nil)
+      @file, @lang = file, (lang || 'en').to_sym
+      @show, @season, @episode = FilenameParser.parse(file)
     end
 
     def http
-      @http ||= Net::HTTP.new(SITE).start
+      @http ||= Net::HTTP.new(self.class::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
+    def get(path, initheader = {})
+      response = http.get(path, initheader)
+      raise "Invalid response for #{path}: #{response}" unless Net::HTTPSuccess === response
+      response.body
     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"
+    def get_redirection(path, initheader = {})
+      response = http.get(path, initheader)
+      location = response['Location']
+      unless (Net::HTTPFound === response or Net::HTTPSuccess === response) and location
+        raise "Invalid response for #{path}: #{response}: location: #{location.inspect}"
       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']
+      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 download_url
+    end
 
-      # extract
-      zip = http.get(download_url).body
+    def extract(url)
+      contents = get(url)
       http.finish
-      open(TEMP_ARCHIVE_NAME, 'wb') { |f| f.write zip }
-      subs = Suby.extract_subs_from_archive(TEMP_ARCHIVE_NAME)
+      format = self.class::FORMAT
+      if format == :file
+        open(sub_name(url), 'wb') { |f| f.write contents }
+      else
+        open(TEMP_ARCHIVE_NAME, 'wb') { |f| f.write contents }
+        sub = Suby.extract_sub_from_archive(TEMP_ARCHIVE_NAME, format)
+        File.rename sub, sub_name(sub)
+      end
+    end
 
-      new_name = File.basename(file, File.extname(file))+File.extname(subs.first)
-      File.rename subs.first, new_name
-      puts "Renaming to #{new_name}"
+    def sub_name(sub)
+      File.basename(file, File.extname(file)) + File.extname(sub)
     end
   end
 end
+
+require_relative 'downloader/tvsubtitles'
+require_relative 'downloader/addic7ed'

data/lib/suby/downloader/addic7ed.rb

@@ -0,0 +1,27 @@
+module Suby
+  class Downloader::Addic7ed < Downloader
+    SITE = 'www.addic7ed.com'
+    FORMAT = :file
+    LANG_IDS = {
+      en: 1,
+      es: 5,
+      fr: 8
+    }
+    FILTER_IGNORED = "Couldn't find any subs with the specified language. Filter ignored"
+
+    def download_url
+      subtitles_url = "/serie/#{CGI.escape show}/#{season}/#{episode}/#{LANG_IDS[lang]}"
+      response = http.get(subtitles_url)
+      throw :downloader, "show/season/episode not found" unless Net::HTTPSuccess === response
+      body = response.body
+      throw :downloader, "no subtitle available" if body.include? FILTER_IGNORED
+      download_url = Nokogiri(body).css('a').find { |a|
+        a[:href].start_with? '/original/' or
+        a[:href].start_with? '/updated/'
+      }[:href]
+      location = get_redirection download_url, 'Referer' => "http://#{SITE}#{subtitles_url}" # They check Referer
+      throw :downloader, "download exceeded" if location == '/downloadexceeded.php'
+      URI.escape location
+    end
+  end
+end

data/lib/suby/downloader/tvsubtitles.rb

@@ -0,0 +1,73 @@
+module Suby
+  class Downloader::TVSubtitles < Downloader
+    SITE = 'www.tvsubtitles.net'
+    FORMAT = :zip
+    SEARCH_URL = '/search.php'
+
+    # cache
+    SHOW_URLS = {}
+    SHOW_PAGES = {}
+
+    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
+        a = results.css('ul li div a').find { |a|
+           # "Show (2009-2011)" => "Show"
+          a.text.sub(/ \(\d{4}-\d{4}\)$/, '').casecmp(show) == 0
+        }
+        throw :downloader, "show not found" unless a
+        url = a[:href]
+
+        raise 'could not find the show' unless /^\/tvshow-(\d+)\.html$/ =~ url
+        "/tvshow-#{$1}.html"
+      end
+    end
+
+    def season_url
+      show_url.sub(/\.html$/, "-#{season}.html")
+    end
+
+    def episode_url
+      @episode_url ||= begin
+        SHOW_PAGES[show] ||= Nokogiri get season_url
+
+        season_text = /^Season #{season}$/
+        SHOW_PAGES[show].css('div.left_articles p.description b').find { |b|
+          b.text =~ season_text
+        } or throw :downloader, "season not found"
+
+        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/ }
+        }.tap { |tr|
+          throw :downloader, "episode not found" unless tr
+        }.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 get episode_url
+
+        # TODO: choose 720p or most downloaded instead of first found
+        a = subtitles.css('div.left_articles a').find { |a| a.name == 'a' && a[:href].start_with?('/subtitle') }
+        throw :downloader, "no subtitle available" unless a
+        url = a[:href]
+        raise 'invalid subtitle url' unless url =~ /^\/subtitle-(\d+)\.html/
+        url
+      end
+    end
+
+    def download_url
+      @download_url ||= URI.escape '/' + get_redirection(subtitles_url.sub('subtitle', 'download'))
+    end
+  end
+end

data/lib/suby/filename_parser.rb

@@ -0,0 +1,105 @@
+module Suby
+  module FilenameParser
+    extend self
+
+    # from tvnamer @ ab2c6c, with author's agreement, adapted
+    # See https://github.com/dbr/tvnamer/blob/master/tvnamer/config_defaults.py
+    FILENAME_PATTERNS = [
+      # foo.s0101
+      /^(?<show>.+?)
+      [ \._\-]
+      [Ss](?<season>[0-9]{2})
+      [\.\- ]?
+      (?<episode>[0-9]{2})
+      [^0-9]*$/x,
+
+      # foo.1x09*
+      /^(?<show>.+?)
+      [ \._\-]
+      \[?
+      (?<season>[0-9]+)
+      [xX]
+      (?<episode>[0-9]+)
+      \]?
+      [^\/]*$/x,
+
+      # foo.s01.e01, foo.s01_e01
+      /^(?<show>.+?)
+      [ \._\-]
+      \[?
+      [Ss](?<season>[0-9]+)[\. _-]?
+      [Ee]?(?<episode>[0-9]+)
+      \]?
+      [^\/]*$/x,
+
+      # foo - [01.09]
+      /^(?<show>.+?)
+      [ \._\-]?
+      \[
+      (?<season>[0-9]+?)
+      [.]
+      (?<episode>[0-9]+?)
+      \]
+      [ \._\-]?
+      [^\/]*$/x,
+
+      # Foo - S2 E 02 - etc
+      /^(?<show>.+?)
+      [ ]?[ \._\-][ ]?
+      [Ss](?<season>[0-9]+)[\.\- ]?
+      [Ee]?[ ]?(?<episode>[0-9]+)
+      [^\/]*$/x,
+
+      # Show - Episode 9999 [S 12 - Ep 131] - etc
+      /(?<show>.+)
+      [ ]-[ ]
+      [Ee]pisode[ ]\d+
+      [ ]
+      \[
+      [sS][ ]?(?<season>\d+)
+      ([ ]|[ ]-[ ]|-)
+      ([eE]|[eE]p)[ ]?(?<episode>\d+)
+      \]
+      .*$/x,
+
+      # foo.103*
+      /^(?<show>.+)
+      [ \._\-]
+      (?<season>[0-9]{1})
+      (?<episode>[0-9]{2})
+      [\._ -][^\/]*$/x,
+
+      # foo.0103*
+      /^(?<show>.+)
+      [ \._\-]
+      (?<season>[0-9]{2})
+      (?<episode>[0-9]{2,3})
+      [\._ -][^\/]*$/x
+    ]
+
+    def parse(file)
+      filename = File.basename(file)
+      FILENAME_PATTERNS.find { |pattern|
+        pattern =~ filename
+      } or raise "wrong file format (#{file})"
+      [clean_show_name($~[:show]), $~[:season].to_i, $~[:episode].to_i]
+    end
+
+    # from https://github.com/dbr/tvnamer/blob/master/tvnamer/utils.py#L78-95
+    # Cleans up series name by removing any . and _
+    # characters, along with any trailing hyphens.
+    #
+    # Is basically equivalent to replacing all _ and . with a
+    # space, but handles decimal numbers in string.
+    #
+    #   clean_show_name("an.example.1.0.test") # => "an example 1.0 test"
+    #   clean_show_name("an_example_1.0_test") # => "an example 1.0 test"
+    def clean_show_name show
+      show.gsub! /(?<!\d)[.]|[.](?!\d)/, ' '
+      show.tr! '_', ' '
+      show.chomp! '-'
+      show.strip!
+      show
+    end
+  end
+end

data/suby.gemspec

@@ -10,5 +10,5 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
   s.add_dependency 'nokogiri'
 
-  s.version = '0.0.6'
+  s.version = '0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suby
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-13 00:00:00.000000000 Z
+date: 2011-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153880860 !ruby/object:Gem::Requirement
+  requirement: &2157439960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153880860
+  version_requirements: *2157439960
 description: Find and download subtitles
 email: 
 executables:
@@ -30,7 +30,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/suby
+- lib/suby/downloader/addic7ed.rb
+- lib/suby/downloader/tvsubtitles.rb
 - lib/suby/downloader.rb
+- lib/suby/filename_parser.rb
 - lib/suby.rb
 - .gitignore
 - README.md