addic7ed 3.0.0 → 4.0.0.pre.beta.5

data/lib/addic7ed/service.rb

@@ -0,0 +1,13 @@
+module Addic7ed
+  module Service
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def call(*args)
+        new(*args).call
+      end
+    end
+  end
+end

data/lib/addic7ed/services/check_compatibility.rb

@@ -0,0 +1,44 @@
+module Addic7ed
+  class CheckCompatibility
+    include Service
+
+    attr_reader :subtitle, :group
+
+    def initialize(subtitle, group)
+      @subtitle = subtitle
+      @group    = group
+    end
+
+    def call
+      defined_as_compatible? || generally_compatible? || commented_as_compatible?
+    end
+
+  private
+
+    def defined_as_compatible?
+      subtitle.version.split(",").include? group
+    end
+
+    def generally_compatible?
+      COMPATIBILITY_720P[subtitle.version] == group || COMPATIBILITY_720P[group] == subtitle.version
+    end
+
+    def commented_as_compatible?
+      return false if /(won'?t|doesn'?t|not) +work/i =~ subtitle.comment
+      return false if /resync +(from|of|for)/i =~ subtitle.comment
+      !!comment_matches_a_compatible_group?
+    end
+
+    def comment_matches_a_compatible_group?
+      Regexp.new("(#{compatible_groups.join('|')})", "i") =~ subtitle.comment
+    end
+
+    def compatible_groups
+      @compatible_groups ||= [
+        group,
+        COMPATIBILITY_720P[group],
+        COMPATIBILITY_720P[subtitle.version]
+      ].compact.uniq
+    end
+  end
+end

data/lib/addic7ed/services/download_subtitle.rb

@@ -0,0 +1,53 @@
+module Addic7ed
+  class DownloadSubtitle
+    include Service
+
+    HTTP_REDIRECT_LIMIT = 8
+
+    attr_reader :url, :filename, :referer, :redirect_count
+
+    def initialize(url, filename, referer, redirect_count = 0)
+      @url                 = url
+      @filename            = filename
+      @referer             = referer
+      @redirect_count = redirect_count
+    end
+
+    def call
+      raise DownloadError, "Too many HTTP redirections" if redirect_count >= HTTP_REDIRECT_LIMIT
+      raise DailyLimitExceeded, "Daily limit exceeded"  if %r{^/downloadexceeded.php} =~ url
+      return follow_redirection(response["location"])   if response.is_a? Net::HTTPRedirection
+      write(response.body)
+    end
+
+  private
+
+    def uri
+      @uri ||= URI(url)
+    end
+
+    def response
+      @response ||= Net::HTTP.start(uri.hostname, uri.port) do |http|
+        request = Net::HTTP::Get.new(uri.request_uri)
+        request["Referer"]    = referer # Addic7ed requires the Referer to be correct
+        request["User-Agent"] = USER_AGENTS.sample
+        http.request(request)
+      end
+    rescue
+      raise DownloadError, "A network error occured"
+    end
+
+    def follow_redirection(location_header)
+      # Addic7ed is serving redirection URL not-encoded,
+      # but Ruby does not support it (see http://bugs.ruby-lang.org/issues/7396)
+      new_url = URI.escape(location_header)
+      DownloadSubtitle.call(new_url, filename, url, redirect_count + 1)
+    end
+
+    def write(content)
+      Kernel.open(filename, "w") { |f| f << content }
+    rescue
+      raise DownloadError, "Cannot write to disk"
+    end
+  end
+end

data/lib/addic7ed/services/get_shows_list.rb

@@ -0,0 +1,29 @@
+require "singleton"
+
+module Addic7ed
+  class GetShowsList
+    include Singleton
+
+    def self.call
+      instance.call
+    end
+
+    def call
+      @shows ||= homepage_body.css("select#qsShow option:not(:first-child)").map(&:text)
+    end
+
+  private
+
+    def homepage_body
+      @homepage_body ||= Oga.parse_html(addic7ed_homepage.body)
+    end
+
+    def addic7ed_homepage
+      Net::HTTP.start("www.addic7ed.com") do |http|
+        request = Net::HTTP::Get.new("/")
+        request["User-Agent"] = USER_AGENTS.sample
+        http.request(request)
+      end
+    end
+  end
+end

data/lib/addic7ed/services/{addic7ed_comment_normalizer.rb → normalize_comment.rb}

@@ -1,19 +1,15 @@
 module Addic7ed
-  class Addic7edCommentNormalizer
+  class NormalizeComment
+    include Service
+
     attr_reader :comment
 
     def initialize(comment)
       @comment = comment || ""
     end
 
-    def self.call(comment)
-      new(comment).call
-    end
-
     def call
-      comment.downcase
+      comment.downcase.strip
     end
   end
-
-private
 end

data/lib/addic7ed/services/normalize_version.rb

@@ -0,0 +1,22 @@
+module Addic7ed
+  class NormalizeVersion
+    include Service
+
+    attr_reader :version
+
+    def initialize(version)
+      @version = version || ""
+    end
+
+    def call
+      version
+        .gsub(/[[:space:]]/, "")
+        .upcase
+        .gsub(/,[\d\. ]+MBS$/, "")
+        .gsub(/(^VERSION *|720P|1080P|HDTV|PROPER|RERIP|INTERNAL|X\.?264)/, "")
+        .gsub(/[- \.\,]/, " ")
+        .strip
+        .gsub(/ +/, ",")
+    end
+  end
+end

data/lib/addic7ed/services/parse_page.rb

@@ -0,0 +1,43 @@
+require "oga"
+require "net/http"
+require "open-uri"
+
+module Addic7ed
+  class ParsePage
+    include Service
+
+    attr_reader :uri
+
+    def initialize(url)
+      @uri = URI(url)
+    end
+
+    def call
+      raise NoSubtitleFound unless subtitles_found?
+      subtitles_nodes.map { |subtitle_node| Addic7ed::ParseSubtitle.call(subtitle_node) }
+    end
+
+  private
+
+    def page_dom
+      raise EpisodeNotFound if server_response.body.nil? || server_response.body.empty?
+      @page_dom ||= Oga.parse_html(server_response.body)
+    end
+
+    def subtitles_nodes
+      @subtitles_nodes ||= page_dom.css("#container95m table.tabel95 table.tabel95")
+    end
+
+    def server_response
+      @server_response ||= Net::HTTP.start(uri.hostname, uri.port) do |http|
+        request = Net::HTTP::Get.new(uri.request_uri)
+        request["User-Agent"] = USER_AGENTS.sample
+        http.request(request)
+      end
+    end
+
+    def subtitles_found?
+      page_dom.css("select#filterlang ~ font[color='yellow']").empty? && !subtitles_nodes.empty?
+    end
+  end
+end

data/lib/addic7ed/services/parse_subtitle.rb

@@ -0,0 +1,79 @@
+require "oga"
+
+module Addic7ed
+  class ParseSubtitle
+    include Service
+
+    attr_reader :subtitle_node
+
+    FIELDS = [:version, :language, :status, :url, :source, :hi, :downloads, :comment].freeze
+
+    def initialize(subtitle_node)
+      @subtitle_node = subtitle_node
+    end
+
+    def call
+      Addic7ed::Subtitle.new(extract_fields)
+    end
+
+  private
+
+    def extract_fields
+      FIELDS.map do |field|
+        { field => send(:"extract_#{field}") }
+      end.reduce(:merge)
+    end
+
+    def extract_field(selector, options = { required: true })
+      node = subtitle_node.css(selector).first
+      raise Addic7ed::ParsingError if options[:required] && node.nil?
+      yield node
+    end
+
+    def extract_version
+      extract_field(".NewsTitle", &:text)
+    end
+
+    def extract_language
+      extract_field(".language") do |node|
+        node.text.gsub(/\A\W*/, "").gsub(/[^\w\)]*\z/, "")
+      end
+    end
+
+    def extract_status
+      extract_field("tr:nth-child(3) td:nth-child(4) b") do |node|
+        node.text.strip
+      end
+    end
+
+    def extract_url
+      extract_field("a.buttonDownload:last-of-type") do |node|
+        "http://www.addic7ed.com#{node['href']}"
+      end
+    end
+
+    def extract_source
+      extract_field("tr:nth-child(3) td:first-child a", required: false) do |node|
+        node["href"] unless node.nil?
+      end
+    end
+
+    def extract_hi
+      extract_field("tr:nth-child(4) td.newsDate img:last-of-type") do |node|
+        node.attribute("title") == "Hearing Impaired"
+      end
+    end
+
+    def extract_downloads
+      extract_field("tr:nth-child(4) td.newsDate") do |node|
+        /(?<downloads>\d*) Downloads/.match(node.text)[:downloads]
+      end
+    end
+
+    def extract_comment
+      extract_field("tr:nth-child(2) td.newsDate") do |node|
+        node.text.gsub(/<img[^>]+\>/i, "")
+      end
+    end
+  end
+end

data/lib/addic7ed/services/url_encode_show_name.rb

@@ -0,0 +1,46 @@
+module Addic7ed
+  class URLEncodeShowName
+    include Service
+
+    attr_reader :filename
+
+    def initialize(filename)
+      @filename = filename
+    end
+
+    # This service is unfortunately over complex because we have to compare the given show name to
+    # the actual Addic7ed shows list in order to find out how Addic7ed URL-encodes this show name
+    # (this is due to the inconsistency of their URL-encoding policy)
+    def call
+      matching_shows = matching_shows(ignore_year: false)
+      matching_shows = matching_shows(ignore_year: true) if matching_shows.empty?
+      raise ShowNotFound if matching_shows.empty?
+      matching_shows.last.tr(" ", "_")
+    end
+
+  private
+
+    def matching_shows(opts)
+      addic7ed_shows.select { |show_name| matching?(show_name, opts) }
+    end
+
+    def normalize(show_name, opts)
+      show_name
+        .downcase
+        .delete("'")
+        .gsub(/[_\.]+/, " ")
+        .gsub(/ (US|UK)( |$)/i, " (\\1)\\2")
+        .gsub(/ (\d{4})( |$)/i, " (\\1)\\2")
+        .strip
+        .tap { |showname| showname.gsub!(/ \(\d{4}\)( |$)/, '\1') if opts[:ignore_year] }
+    end
+
+    def matching?(addic7ed_show, opts)
+      normalize(addic7ed_show, opts) == normalize(filename, opts)
+    end
+
+    def addic7ed_shows
+      @addic7ed_shows ||= GetShowsList.call
+    end
+  end
+end

data/lib/addic7ed/version.rb

@@ -1,3 +1,3 @@
 module Addic7ed
-  VERSION = "3.0.0"
+  VERSION = "4.0.0-beta.5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: addic7ed
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0.pre.beta.5
 platform: ruby
 authors:
 - Michael Baudino
@@ -66,6 +66,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: inch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oga
   requirement: !ruby/object:Gem::Requirement
@@ -96,42 +138,30 @@ dependencies:
         version: 1.8.3
 description: Ruby script (cli) to fetch subtitles on Addic7ed
 email: michael.baudino@alpine-lab.com
-executables:
-- addic7ed
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.md
-- bin/addic7ed
 - lib/addic7ed.rb
 - lib/addic7ed/common.rb
-- lib/addic7ed/episode.rb
+- lib/addic7ed/config.json
 - lib/addic7ed/errors.rb
-- lib/addic7ed/parser.rb
-- lib/addic7ed/services/addic7ed_comment_normalizer.rb
-- lib/addic7ed/services/addic7ed_version_normalizer.rb
-- lib/addic7ed/show_list.rb
-- lib/addic7ed/subtitle.rb
+- lib/addic7ed/models/episode.rb
+- lib/addic7ed/models/search.rb
+- lib/addic7ed/models/subtitle.rb
+- lib/addic7ed/models/subtitles_collection.rb
+- lib/addic7ed/models/video_file.rb
+- lib/addic7ed/service.rb
+- lib/addic7ed/services/check_compatibility.rb
+- lib/addic7ed/services/download_subtitle.rb
+- lib/addic7ed/services/get_shows_list.rb
+- lib/addic7ed/services/normalize_comment.rb
+- lib/addic7ed/services/normalize_version.rb
+- lib/addic7ed/services/parse_page.rb
+- lib/addic7ed/services/parse_subtitle.rb
+- lib/addic7ed/services/url_encode_show_name.rb
 - lib/addic7ed/version.rb
-- lib/addic7ed/video_file.rb
-- spec/lib/addic7ed/common_spec.rb
-- spec/lib/addic7ed/episode_spec.rb
-- spec/lib/addic7ed/services/addic7ed_comment_normalizer_spec.rb
-- spec/lib/addic7ed/services/addic7ed_version_normalizer_spec.rb
-- spec/lib/addic7ed/show_list_spec.rb
-- spec/lib/addic7ed/subtitle_spec.rb
-- spec/lib/addic7ed/video_file_spec.rb
-- spec/responses/basic_redirection.http
-- spec/responses/homepage.http
-- spec/responses/redirection_loop.http
-- spec/responses/walking-dead-3-2-1.http
-- spec/responses/walking-dead-3-2-48.http
-- spec/responses/walking-dead-3-2-7.http
-- spec/responses/walking-dead-3-2-8.http
-- spec/responses/walking-dead-3-2-8_best_subtitle.http
-- spec/responses/walking-dead-3-4-8.http
-- spec/responses/walking-dead-3-42-8.http
-- spec/spec_helper.rb
 homepage: https://github.com/michaelbaudino/addic7ed-ruby
 licenses:
 - MIT
@@ -147,31 +177,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Addic7ed auto-downloader
-test_files:
-- spec/lib/addic7ed/common_spec.rb
-- spec/lib/addic7ed/episode_spec.rb
-- spec/lib/addic7ed/services/addic7ed_comment_normalizer_spec.rb
-- spec/lib/addic7ed/services/addic7ed_version_normalizer_spec.rb
-- spec/lib/addic7ed/show_list_spec.rb
-- spec/lib/addic7ed/subtitle_spec.rb
-- spec/lib/addic7ed/video_file_spec.rb
-- spec/responses/basic_redirection.http
-- spec/responses/homepage.http
-- spec/responses/redirection_loop.http
-- spec/responses/walking-dead-3-2-1.http
-- spec/responses/walking-dead-3-2-48.http
-- spec/responses/walking-dead-3-2-7.http
-- spec/responses/walking-dead-3-2-8.http
-- spec/responses/walking-dead-3-2-8_best_subtitle.http
-- spec/responses/walking-dead-3-4-8.http
-- spec/responses/walking-dead-3-42-8.http
-- spec/spec_helper.rb
+test_files: []
+has_rdoc: