addic7ed 4.0.0.pre.beta.6 → 4.0.0.pre.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2a0a0fd093c29b07a62a7259c773df5343c4c2c
-  data.tar.gz: 03110733e1ba66da173b5ad852ea3668dcbc7f4a
+  metadata.gz: f8bd5053a6c2b6e07ba04dca54f782a865efd5d4
+  data.tar.gz: c163efc8390f5ae215b7bec747401360ee7095d1
 SHA512:
-  metadata.gz: c06455d2aad3610b7321dffd54f88f6d426087872083d96ae3284d21e6853936d883d76eff11390f7ffd8774ff0177126edce6460bec03288d1ad1789e6ec89d
-  data.tar.gz: 6b2a108af177c4b6096ef55152b233319893a7cd967e1e1a11daea8006f76933ecc783a44b585fdceb29f0dd32e446b0865a363c553fe20e7d027536d46e8fd4
+  metadata.gz: c4400b776ae11341b98684bbd19d93b01cde852e2ad7a33df6286a0a9b53b540c62311002ad1ddd14c4a5325f3ee3b76df7768105eafa21244c71887a8a9bd16
+  data.tar.gz: 72331b362831a3cc49af9b2a4e67a4595af1063ebc264582f8731d1fcc02417e3659234a57a14e9a3af2ea8207d05441f57289fc558a997d210503f62c2f1dd2

data/lib/addic7ed/models/episode.rb

@@ -6,91 +6,72 @@ require "open-uri"
 module Addic7ed
   # Represents a TV show episode.
   #
-  # @attr showname [String] TV show name.
+  # @attr show [String] TV show name.
   # @attr season [Numeric] Season number.
-  # @attr episode [Numeric] Episode number in the season.
+  # @attr number [Numeric] Episode number in the season.
 
   class Episode
-    attr_reader :showname, :season, :episode
+    attr_reader :show, :season, :number
 
     # Creates a new instance of {Episode}.
     #
-    # @param showname [String] TV show name, as extracted from the video file name
+    # @param show [String] TV show name
     #   (_e.g._ both +"Game.of.Thrones"+ and +"Game of Thrones"+ are valid)
     # @param season [Numeric] Season number
-    # @param episode [Numeric] Episode number in the season
+    # @param number [Numeric] Episode number in the season
     #
     # @example
-    #   Addic7ed::Episode.new("Game of Thrones", 6, 9)
+    #   Addic7ed::Episode.new(show: "Game of Thrones", season: 6, number: 9)
     #   #=> #<Addic7ed::Episode
-    #   #       @episode=9,
+    #   #       @number=9,
     #   #       @season=6,
-    #   #       @showname="Game.of.Thrones",
-    #   #       @subtitles={:fr=>nil, :ar=>nil, :az=>nil, ..., :th=>nil, :tr=>nil, :vi=>nil}
+    #   #       @show="Game.of.Thrones"
     #   #    >
 
-    def initialize(showname, season, episode)
-      @showname  = showname
-      @season    = season
-      @episode   = episode
-      @subtitles = languages_hash { |code, _| { code => nil } }
+    def initialize(show:, season:, number:)
+      @show   = show
+      @season = season
+      @number = number
     end
 
-    # Returns a list of all available {Subtitle}s for this {Episode} in the given +language+.
+    # Returns the URL of the Addic7ed webpage listing subtitles for this {Episode}.
+    # If +language+ is given, it returns the URL of the page with subtitles for this language only.
+    # (_warning:_ despite requesting a language, Addic7ed may display subtitles in all languages
+    # if the requested language has no subtitle)
     #
-    # @param language [String] Language code we want returned {Subtitle}s to be in.
+    # @param language [String] Language code we want the webpage to list subtitles in.
     #
-    # @return [Array<Subtitle>] List of {Subtitle}s available on Addic7ed for the given +language+.
+    # @return [String] Fully qualified URL of the webpage on Addic7ed.
     #
     # @example
-    #   Addic7ed::Episode.new("Game.of.Thrones", 3, 9).subtitles(:fr)
-    #   #=> [
-    #   #      #<Addic7ed::Subtitle
-    #   #          @comment="works with ctrlhd",
-    #   #          @downloads=28130,
-    #   #          @hi=false,
-    #   #          @language="French",
-    #   #          @source="http://addic7ed.com",
-    #   #          @status="Completed",
-    #   #          @url="http://www.addic7ed.com/updated/8/76081/0",
-    #   #          @version="EVOLVE">,
-    #   #      #<Addic7ed::Subtitle
-    #   #          @comment="la fabrique",
-    #   #          @downloads=1515,
-    #   #          @hi=false,
-    #   #          @language="French",
-    #   #          @source="http://sous-titres.eu",
-    #   #          @status="Completed",
-    #   #          @url="http://www.addic7ed.com/original/76081/11",
-    #   #          @version="EVOLVE">,
-    #   #      #<Addic7ed::Subtitle
-    #   #          @comment="la fabrique",
-    #   #          @downloads=917,
-    #   #          @hi=false,
-    #   #          @language="French",
-    #   #          @source="http://sous-titres.eu",
-    #   #          @status="Completed",
-    #   #          @url="http://www.addic7ed.com/original/76081/12",
-    #   #          @version="WEB,DL,NTB,&,YFN">
-    #   #     ]
+    #   Addic7ed::Episode.new("Game of Thrones", 6, 9).page_url
+    #   #=> "http://www.addic7ed.com/serie/Game_of_Thrones/6/9/0"
+    #
+    #   Addic7ed::Episode.new("Game of Thrones", 6, 9).page_url(:fr)
+    #   #=> "http://www.addic7ed.com/serie/Game_of_Thrones/6/9/8"
 
-    def subtitles(language)
-      @subtitles[language] ||= Addic7ed::ParsePage.call(page_url(language))
+    def page_url(language = nil)
+      return localized_url(0) if language.nil?
+      localized_urls[language]
     end
 
-    # Returns the URL of the Addic7ed webpage listing subtitles for this {Episode}
-    # in the given +language+.
+    # Returns all available subtitles for this episode.
     #
-    # @param language [String] Language code we want the webpage to list subtitles in.
-    #
-    # @return [String] Fully qualified URL of the webpage on Addic7ed.
+    # @return [SubtitlesCollection] the collection of subtitles.
     #
     # @example
-    #   Addic7ed::Episode.new("Game of Thrones", 6, 9).page_url
-    #   #=> "http://www.addic7ed.com/serie/Game_of_Thrones/6/9/8"
+    #   Addic7ed::Episode.new("Game of Thrones", 6, 9)
+    #   #=> #<Addic7ed::SubtitlesCollection
+    #   #     @subtitles=[
+    #   #       #<Addic7ed::Subtitle ... >,
+    #   #       #<Addic7ed::Subtitle ... >,
+    #   #       #<Addic7ed::Subtitle ... >
+    #   #     ]
 
-    def page_url(language)
-      localized_urls[language]
+    def subtitles
+      @subtitles ||= SubtitlesCollection.new(
+        Addic7ed::ParsePage.call(page_url)
+      )
     end
 
     private
@@ -100,11 +81,11 @@ module Addic7ed
     end
 
     def url_encoded_showname
-      @url_encoded_showname ||= URLEncodeShowName.call(showname)
+      @url_encoded_showname ||= URLEncodeShowName.call(show)
     end
 
-    def localized_url(lang)
-      "http://www.addic7ed.com/serie/#{url_encoded_showname}/#{season}/#{episode}/#{lang}"
+    def localized_url(lang_id)
+      "http://www.addic7ed.com/serie/#{url_encoded_showname}/#{season}/#{number}/#{lang_id}"
     end
 
     def languages_hash(&block)

data/lib/addic7ed/models/subtitle.rb

@@ -16,13 +16,14 @@ module Addic7ed
   # @attr downloads [Numeric] Number of times this subtitle has been downloaded.
   # @attr comment [String] Comment manually added by the subtitle author/publisher
   #   (usually related to extra-compatibilities or resync source).
-  # @attr hi [Boolean] Hearing-impaired support.
+  # @attr corrected [Boolean] Indicates if the subtitle has been corrected.
+  # @attr hi [Boolean] Indicates if the subtitle embeds hearing-impaired sequences.
   # @attr url [String] Download URL of actual subtitle file (warning: Addic7ed servers
   #   won't serve a subtite file without a proper +Referer+ HTTP header which can be
   #   retrieved from +episode.page_url+).
 
   class Subtitle
-    attr_reader :version, :language, :status, :source, :downloads, :comment, :hi
+    attr_reader :version, :language, :status, :source, :downloads, :comment, :corrected, :hi
     attr_accessor :url
 
     # Creates a new instance of {Subtitle} created using +options+,
@@ -35,7 +36,8 @@ module Addic7ed
     # * +source+: URL of website the subtitle was originally published on
     # * +downloads+: number of times the subtitle has been downloaded
     # * +comment+: manually added comment from the author or publisher
-    # * +hi+: hearing-impaired support
+    # * +corrected+: indicates if subtitle has been corrected
+    # * +hi+: indicates if subtitle embeds hearing-impaired sequences
     # * +url+: download URL for the subtitle file
     #
     # @param options [Hash] subtitle information as a {Hash}
@@ -48,17 +50,19 @@ module Addic7ed
     #     source:    "http://sous-titres.eu",
     #     downloads: 10335,
     #     comment:   "works with 1080p.BATV",
+    #     corrected: true,
     #     hi:        false,
     #     url:       "http://www.addic7ed.com/original/113643/4"
     #   )
     #   #=> #<Addic7ed::Subtitle
     #   #       @version="KILLERS,AVS",
-    #   #       @language="French"
-    #   #       @status="Completed"
-    #   #       @url="http://www.addic7ed.com/original/113643/4"
-    #   #       @source="http://sous-titres.eu"
-    #   #       @hi=false
-    #   #       @downloads=10335
+    #   #       @language="French",
+    #   #       @status="Completed",
+    #   #       @url="http://www.addic7ed.com/original/113643/4",
+    #   #       @source="http://sous-titres.eu",
+    #   #       @corrected=true,
+    #   #       @hi=false,
+    #   #       @downloads=10335,
     #   #       @comment="works with 1080p.batv"
     #   #   >
 
@@ -68,6 +72,7 @@ module Addic7ed
       @status    = options[:status]
       @url       = options[:url]
       @source    = options[:source]
+      @corrected = options[:corrected]
       @hi        = options[:hi]
       @downloads = options[:downloads].to_i || 0
       @comment   = NormalizeComment.call(options[:comment])

data/lib/addic7ed/models/subtitles_collection.rb

@@ -3,9 +3,25 @@
 module Addic7ed
   # Represents a collection of {Subtitle} objects.
   #
-  # This collection inherits from {Array} so it behaves exaclty like it,
-  # but it also provides some methods to filter, order and choose the best subtitle.
-  class SubtitlesCollection < Array
+  # This collection is a custom {Enumerable} which provides
+  # some methods to filter, order and choose the best subtitle.
+  class SubtitlesCollection
+    include Enumerable
+
+    # @!visibility private
+    def each(&block)
+      @subtitles.each(&block)
+    end
+
+    # Creates a filterable, sortable collection of subtitles
+    # @param subtitles [Enumerable] List of subtitles to initialize the collection with
+    #
+    # @return [SubtitleCollection] the initialized subtitles collection
+
+    def initialize(subtitles = [])
+      @subtitles = subtitles
+    end
+
     # Returns only subtitles that are compatible with +group+.
     # @param group [String] Release group we want the returned subtitles to be compatible with
     #
@@ -21,7 +37,7 @@ module Addic7ed
     #   #=> [#<Addic7ed::Subtitle @version="LOL">, #<Addic7ed::Subtitle @version="DIMENSION">]
 
     def compatible_with(group)
-      select { |subtitle| CheckCompatibility.call(subtitle, group) }
+      chainable(select { |subtitle| CheckCompatibility.call(subtitle, group) })
     end
 
     # Returns only completed subtitles.
@@ -37,7 +53,24 @@ module Addic7ed
     #   #=> [#<Addic7ed::Subtitle @status="Completed">]
 
     def completed
-      select(&:completed?)
+      chainable(select(&:completed?))
+    end
+
+    # Returns only subtitles for given +language_code+.
+    #
+    # @return [SubtitleCollection] Copy of collection filtered by +language+
+    #
+    # @example
+    #   english_subtitle = Addic7ed::Subtitle.new(language: "English")
+    #   french_subtitle  = Addic7ed::Subtitle.new(language: "French")
+    #   collection = Addic7ed::SubtitlesCollection.new([english_subtitle, french_subtitle])
+    #
+    #   collection.for_language(:en)
+    #   #=> [#<Addic7ed::Subtitle @language="English">]
+
+    def for_language(language_code)
+      raise LanguageNotSupported unless LANGUAGES.key? language_code.to_sym
+      chainable(select { |subtitle| subtitle.language == LANGUAGES[language_code.to_sym][:name] })
     end
 
     # Returns the most downloaded subtitle.
@@ -58,8 +91,8 @@ module Addic7ed
 
     private
 
-    def select
-      SubtitlesCollection.new(super)
+    def chainable(array)
+      self.class.new(array)
     end
   end
 end

data/lib/addic7ed/services/download_subtitle.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# TODO: move to the CLI codebase and use HTTParty
+
 module Addic7ed
   class DownloadSubtitle
     include Service
@@ -39,20 +41,20 @@ module Addic7ed
         request["User-Agent"] = USER_AGENTS.sample
         http.request(request)
       end
-    rescue
+    rescue StandardError
       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)
+      new_url = CGI.escape(location_header)
       DownloadSubtitle.call(new_url, filename, url, redirect_count + 1)
     end
 
     def write(content)
       Kernel.open(filename, "w") { |f| f << content }
-    rescue
+    rescue StandardError
       raise DownloadError, "Cannot write to disk"
     end
   end

data/lib/addic7ed/services/parse_page.rb

@@ -16,7 +16,9 @@ module Addic7ed
 
     def call
       raise NoSubtitleFound unless subtitles_found?
-      subtitles_nodes.map { |subtitle_node| Addic7ed::ParseSubtitle.call(subtitle_node) }
+      subtitles_nodes.map do |subtitle_node|
+        Addic7ed::ParseSubtitleNode.call(subtitle_node)
+      end.flatten
     end
 
     private

data/lib/addic7ed/services/parse_subtitle_node.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "oga"
+
+module Addic7ed
+  class ParseSubtitleNode
+    include Service
+
+    attr_reader :subtitle_node
+
+    def initialize(subtitle_node)
+      @subtitle_node = subtitle_node
+    end
+
+    def call
+      children_fields.map do |child_fields|
+        Addic7ed::Subtitle.new(root_fields.merge(child_fields))
+      end
+    end
+
+    private
+
+    def root_fields
+      @root_fields ||= ParseSubtitleNodeRootFields.call(subtitle_node)
+    end
+
+    def children_fields
+      @children_fields ||= subtitle_node.css(".language").map do |language_node|
+        ParseSubtitleNodeChildFields.call(language_node)
+      end
+    end
+  end
+end

data/lib/addic7ed/services/parse_subtitle_node_child_fields.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Addic7ed
+  class ParseSubtitleNodeChildFields
+    include Service
+
+    attr_reader :language_node
+
+    FIELDS = %i[language status url corrected hi downloads].freeze
+
+    def initialize(language_node)
+      @language_node = language_node
+    end
+
+    def call
+      FIELDS.map do |field|
+        { field => send(field) }
+      end.reduce(:merge)
+    end
+
+    private
+
+    def language
+      @language ||= language_node.text.gsub(/\A\W*/, "").gsub(/[^\w\)]*\z/, "")
+    end
+
+    def status
+      @status ||= language_node.css("~ td b").first.text.strip
+    end
+
+    def url
+      @url ||= "http://www.addic7ed.com" + language_node.css("~ td a.buttonDownload").first[:href]
+    end
+
+    def corrected
+      return @corrected if defined? @corrected
+      @corrected = language_node.parent.css("~ tr td.newsDate img")[0][:title] == "Corrected"
+    end
+
+    def hi
+      return @hi if defined? @hi
+      @hi = language_node.parent.css("~ tr td.newsDate img")[1][:title] == "Hearing Impaired"
+    end
+
+    def downloads
+      @downloads ||= begin
+        text = language_node.parent.css("~ tr td.newsDate").text
+        /(?<downloads>\d*) Downloads/.match(text)[:downloads]
+      end
+    end
+  end
+end

data/lib/addic7ed/services/parse_subtitle_node_root_fields.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Addic7ed
+  class ParseSubtitleNodeRootFields
+    include Service
+
+    attr_reader :subtitle_node
+
+    FIELDS = %i[version source comment].freeze
+
+    def initialize(subtitle_node)
+      @subtitle_node = subtitle_node
+    end
+
+    def call
+      FIELDS.map do |field|
+        { field => send(field) }
+      end.reduce(:merge)
+    end
+
+    private
+
+    def version
+      return @version if defined? @version
+      @version = subtitle_node.css(".NewsTitle").first.text
+    end
+
+    def source
+      return @source if defined? @source
+      @source = subtitle_node.css("tr:nth-child(3) td:first-child a").first.tap do |node|
+        break node[:href] if node
+      end
+    end
+
+    def comment
+      return @comment if defined? @comment
+      @comment = subtitle_node.css("tr:nth-child(2) td.newsDate").first.tap do |node|
+        break node.text.strip if node
+      end
+    end
+  end
+end

data/lib/addic7ed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Addic7ed
-  VERSION = "4.0.0-beta.6".freeze # rubocop:disable Style/RedundantFreeze
+  VERSION = "4.0.0-beta.7".freeze # rubocop:disable Style/RedundantFreeze
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: addic7ed
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre.beta.6
+  version: 4.0.0.pre.beta.7
 platform: ruby
 authors:
 - Michael Baudino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-13 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: inch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: inch
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -134,7 +134,6 @@ files:
 - lib/addic7ed/config.json
 - lib/addic7ed/errors.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
@@ -145,14 +144,23 @@ files:
 - 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/parse_subtitle_node.rb
+- lib/addic7ed/services/parse_subtitle_node_child_fields.rb
+- lib/addic7ed/services/parse_subtitle_node_root_fields.rb
 - lib/addic7ed/services/url_encode_show_name.rb
 - lib/addic7ed/version.rb
 homepage: https://github.com/michaelbaudino/addic7ed-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+    Important update if you're upgrading from 3.x to 4.x:
+
+        This gem is not providing a CLI tool anymore.
+        If you're using it as a Ruby API for Addic7ed, you're all good, ignore this message.
+        If you're expecting the `addic7ed` binary, we've moved it to the `addic7ed-cli` gem.
+
 rdoc_options: []
 require_paths:
 - lib
@@ -168,8 +176,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Addic7ed auto-downloader
 test_files: []
+has_rdoc: 

data/lib/addic7ed/models/search.rb

@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-
-module Addic7ed
-  # Represents a subtitle search for a +video_filename+ in a +language+ with
-  # multiple search +criterias+.
-  #
-  # @attr video_filename [String] Video file name we're searching subtitles for.
-  # @attr language [String] ISO code of language (_e.g._ "en", "fr", "es").
-  # @attr criterias [Hash] List of search criterias as a {Hash}.
-
-  class Search
-    attr_reader :video_filename, :language,  :criterias
-
-    # Creates a new instance of {Search}.
-    #
-    # Currently supported search criterias are:
-    # * +no_hi+: do not include hearing impaired subtitles (defaults to +false+)
-    #
-    # @param video_filename [String] Path to the video file for which we search subtitles
-    #   (either relative or absolute path)
-    # @param language [String] ISO code of target subtitles language
-    # @param criterias [Hash] List of search criterias the subtitles must match
-    #   (will be merged with default criterias as described above)
-    #
-    # @example
-    #   Addic7ed::Search.new("Game.of.Thrones.S06E09.720p.HDTV.x264-AVS.mkv", :fr)
-    #   #=> #<Addic7ed::Search
-    #   #       @criterias={:no_hi=>false},
-    #   #       @language=:fr,
-    #   #       @video_filename="Game.of.Thrones.S06E09.720p.HDTV.x264-AVS.mkv"
-    #   #   >
-
-    def initialize(video_filename, language, criterias = {})
-      @video_filename = video_filename
-      @language       = language
-      @criterias      = default_criterias.merge(criterias)
-    end
-
-    # Returns the {VideoFile} object representing the video file we're searching subtitles for.
-    #
-    # @return [VideoFile] the {VideoFile} associated with this {Search}
-
-    def video_file
-      @video_file ||= VideoFile.new(video_filename)
-    end
-
-    # Returns the {Episode} object we're searching subtitles for.
-    #
-    # @return [Episode] the {Episode} associated with this {Search}
-
-    def episode
-      @episode ||= Episode.new(video_file.showname, video_file.season, video_file.episode)
-    end
-
-    # Returns the list of all available subtitles for this search,
-    # regardless of completeness, compatibility or search +criterias+.
-    #
-    # @return [SubtitlesCollection] all subtitles for the searched episode
-
-    def all_subtitles
-      @all_subtitles ||= SubtitlesCollection.new(episode.subtitles(language))
-    end
-
-    # Returns the list of subtitles completed and compatible with the episode we're searching
-    # subtitles for, regardless of search +criterias+.
-    #
-    # @return [SubtitlesCollection] subtitles completed and compatible with the searched episode
-
-    def matching_subtitles
-      @matching_subtitles ||= all_subtitles.completed.compatible_with(video_file.group)
-    end
-
-    # Returns the best subtitle for the episode we're searching subtitles for.
-    #
-    # The best subtitle means the more popular (_i.e._ most downloaded) subtitle among completed,
-    # compatible subtitles for the episode we're searching subtitles for.
-    #
-    # @return [SubtitlesCollection] subtitles completed and compatible with the searched episode
-
-    def best_subtitle
-      @best_subtitle ||= matching_subtitles.most_popular
-    end
-
-    private
-
-    def default_criterias
-      {
-        no_hi: false
-      }
-    end
-  end
-end

data/lib/addic7ed/services/parse_subtitle.rb

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-require "oga"
-
-module Addic7ed
-  class ParseSubtitle
-    include Service
-
-    attr_reader :subtitle_node
-
-    FIELDS = %i[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