download_tv 2.6.6 → 2.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09d470071b18c6859d55874249141ae57bfc68b538fc8a5e5ffb3ba27dfb9d89'
-  data.tar.gz: '08fa4240f9f2ab5fe00fbe5509932b9a05d4c5e7254da38aaa249ecee3c60dce'
+  metadata.gz: 8220befd4c805752e34c0d67d992fb6a2ba16c901131304c0c630a1c02908340
+  data.tar.gz: 99f28d45aecd2738f941e49befc895b3e4228e9b5403f53886811d617abf2e85
 SHA512:
-  metadata.gz: 9a0f0390cf1f4d74f65a41e4704bca3d618043b6e72ad0a02716e5121276966016d60e9323f8392d77cb4bf07c1abb6289372d95214f575b9a7da3d620b5f993
-  data.tar.gz: 9271b796d80b9d0519699ca5f9acc0d26b88f190798474ca2128077324781df7f4205fffc4345f7d225b00635071177ca118d26ae0aacff2fc02e5174c3496e3
+  metadata.gz: 70e69b388a88a2764d129fafaab67a55b0ac222c6c03b64562ed84cd5b3b3a278dd29876161ee2a7f7949185fbf8ec0ae2f47fc04a11ce375f2c656764b31a1e
+  data.tar.gz: cb9897a14a4dc1a3341a94751525240b93d6cfbbeef8d14231fe3d7f5688e15f2942091d90d6fd105e9eea0b18c18f36f8ad3491b4642e3f7eefaa7039e2c00e

data/.github/workflows/ruby.yml

@@ -32,4 +32,4 @@ jobs:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run tests
-      run: bundle exec rake
+      run: bundle exec rspec

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # download_tv CHANGELOG
 
+## 2.6.8 (2022-12-02)
+
+* Improvements
+	* Improvements on the TorrentAPI grabber.
+	* Better detection of grabbers being offline.
+
+## 2.6.7 (2022-10-22)
+
+* Features
+	* Add `--healthcheck` to check the status of all the grabbers (online/offline).
+
+* Fixes
+	* Better detection for offline grabbers without crashing the app
+
+* Grabbers
+	* Torrentz: Fix parser
+
 ## 2.6.6 (2022-01-21)
 
 * Improvements

data/Gemfile

@@ -3,3 +3,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "rspec", "~> 3.11"

data/README.md

@@ -29,6 +29,7 @@ Specific options:
     -a, --[no-]auto                  Automatically find links
     -g, --grabber GRABBER            Use given grabber as first option
         --show-grabbers              List available grabbers
+        --healthcheck                Check status of all the grabbers
     -p, --pending                    Show list of pending downloads
         --clear-pending              Clear list of pending downloads
     -q, --queue SHOW                 Add show episode to pending downloads list

data/bin/tv

@@ -60,7 +60,12 @@ opt_parser = OptionParser.new do |opts|
   end
 
   opts.on('--show-grabbers', 'List available grabbers') do
-    puts DownloadTV::Torrent.new.grabbers
+    puts DownloadTV::Torrent.grabbers
+    exit
+  end
+
+  opts.on('--healthcheck', 'Check status of all the grabbers') do
+    DownloadTV::Torrent.healthcheck
     exit
   end
 
@@ -117,9 +122,9 @@ begin
   when 'config'
     DownloadTV::Configuration.new(config).change_configuration
   when 'showconfig'
-    DownloadTV::Configuration.new(config).print_config
+    puts DownloadTV::Configuration.new(config)
   when 'showpending'
-    DownloadTV::Configuration.new(config).print_attr(:pending)
+    puts DownloadTV::Configuration.new(config)[:pending]
   when 'clearpending'
     DownloadTV::Configuration.new(config).clear_pending
   when 'queue'

data/lib/download_tv/configuration.rb

@@ -4,134 +4,160 @@ module DownloadTV
   ##
   # Class used for managing the configuration of the application
   class Configuration
-    attr_reader :content, :config_path
+    def initialize(user_config = {})
+      load_config(user_config)
+    end
+
+    def [](key)
+      @content[key]
+    end
+
+    def []=(key, value)
+      @content[key] = value
+    end
+
+    def change_configuration
+      prompt_for_new_values
+      set_default_values
+      serialize
+    end
+
+    def serialize
+      self[:pending] = self[:pending].uniq
+      File.write(config_path, JSON.generate(@content))
+    end
+
+    def to_s
+      @content.reduce('') do |mem, item|
+        key, val = item
+        "#{mem}#{key}: #{val}\n"
+      end
+    end
+
+    def clear_pending
+      self[:pending].clear
+      serialize
+    end
+
+    def queue_pending(show)
+      self[:pending] << show
+      serialize
+    end
+
+    private
 
-    def initialize(content = {})
-      @config_path = content[:path] || default_config_path
-      FileUtils.mkdir_p(File.expand_path('..', @config_path))
+    def content
+      @content ||= {}
+    end
 
-      if File.exist? @config_path
-        load_config
-        @content.merge!(content) unless content.empty?
-        @content[:ignored]&.map!(&:downcase)
+    def load_config(user_config)
+      if File.exist? config_path
+        parse_config
       else
-        @content = content
+        FileUtils.mkdir_p(File.expand_path('..', config_path))
         change_configuration
       end
+      content.merge!(user_config) unless user_config.empty?
+      self[:ignored]&.map!(&:downcase)
     end
 
-    def change_configuration
+    def parse_config
+      source = File.read(config_path)
+      @content = JSON.parse(source, symbolize_names: true)
+
+      self[:date] = Date.parse(self[:date]) if self[:date]
+
+      if !self[:version] || breaking_changes?(self[:version])
+        warn 'Change configuration required (version with breaking changes detected)'
+        change_configuration
+      end
+    rescue JSON::ParserError => e
+      warn "Error parsing config file at #{config_path} => #{e.message}"
+      change_configuration
+    end
+
+    ##
+    # Returns true if a major or minor update has been detected, or if the config version is newer
+    # than the installed version. Returns something falsy otherwise
+    def breaking_changes?(version)
+      paired = DownloadTV::VERSION.split('.')
+                                  .map(&:to_i)
+                                  .zip(version.split('.').map(&:to_i))
+      # The configuration belongs to a newer version than is installed
+      return true unless paired.find_index { |x, y| x < y }.nil?
+
+      paired.find_index { |x, y| y < x }&.< 2
+    end
+
+    def prompt_for_new_values
       prompt_for_myep_user
       prompt_for_cookie
       prompt_for_ignored
       prompt_for_filters
       $stdout.flush
-
-      set_default_values
-      serialize
     end
 
     def prompt_for_myep_user
-      existing = "(#{@content[:myepisodes_user]}) " if @content[:myepisodes_user]
+      existing = "(#{self[:myepisodes_user]}) " if self[:myepisodes_user]
       print "Enter your MyEpisodes username #{existing}: "
       input = $stdin.gets.chomp
-      @content[:myepisodes_user] = input if input
+      self[:myepisodes_user] = input if input
     end
 
     def prompt_for_cookie
       print 'Save cookie? (y)/n: '
-      @content[:cookie] = !($stdin.gets.chomp.casecmp? 'n')
+      self[:cookie] = !($stdin.gets.chomp.casecmp? 'n')
     end
 
     def prompt_for_ignored
-      existing = "(#{@content[:ignored]})" if @content[:ignored]
+      existing = "(#{self[:ignored]})" if self[:ignored]
       puts "Enter a comma-separated list of shows to ignore: #{existing}"
 
-      @content[:ignored] = read_and_split_list :downcase
+      self[:ignored] = read_and_split_list :downcase
     end
 
     def prompt_for_filters
-      puts "Current filters: (#{@content[:filters]})" if @content[:filters]
-      @content[:filters] = {}
+      puts "Current filters: (#{self[:filters]})" if self[:filters]
+      self[:filters] = {}
 
       puts 'Enter a comma-separated list of terms to include: '
-      @content[:filters][:includes] = read_and_split_list :upcase
+      self[:filters][:includes] = read_and_split_list :upcase
 
       puts 'Enter a comma-separated list of terms to exclude: '
-      @content[:filters][:excludes] = read_and_split_list :upcase
+      self[:filters][:excludes] = read_and_split_list :upcase
     end
 
-    def read_and_split_list(case_method)
-      $stdin.gets.chomp.split(',')
-            .map(&:strip)
-            .map(&case_method)
+    def config_path
+      (content[:path] || default_config_path)
     end
 
-    def default_filters
-      {
-        'includes' => %w[PROPER REPACK],
-        'excludes' => %w[2160P 1080P 720P]
-      }
+    def default_config_path
+      File.join(ENV['HOME'], '.config', 'download_tv', 'config')
     end
 
     ##
     # Update the +content+ attribute with the defaults, if needed.
     # Maintains the previous values, in case it's an update from an existing file.
     def set_default_values
-      @content[:auto] ||= true
-      @content[:grabber] ||= 'TorrentAPI'
-      @content[:date] ||= Date.today - 1
-      @content[:filters] ||= default_filters
-      @content[:pending] ||= []
-      @content[:version] = DownloadTV::VERSION
-    end
-
-    def serialize
-      @content[:pending] = @content[:pending].uniq
-      File.write(@config_path, JSON.generate(@content))
-    end
-
-    def load_config
-      source = File.read(@config_path)
-      @content = JSON.parse(source, symbolize_names: true)
-
-      @content[:date] = Date.parse(@content[:date]) if @content[:date]
-
-      change_configuration if !@content[:version] || breaking_changes?(@content[:version])
-    rescue JSON::ParserError
-      @content = {}
-      change_configuration
-    end
-
-    def default_config_path
-      File.join(ENV['HOME'], '.config', 'download_tv', 'config')
-    end
-
-    ##
-    # Returns true if a major or minor update has been detected, something falsy otherwise
-    def breaking_changes?(version)
-      DownloadTV::VERSION.split('.')
-                         .zip(version.split('.'))
-                         .find_index { |x, y| y < x }
-                         &.< 2
+      self[:auto] ||= true
+      self[:grabber] ||= 'TorrentAPI'
+      self[:date] ||= Date.today - 1
+      self[:filters] ||= default_filters
+      self[:pending] ||= []
+      self[:version] = DownloadTV::VERSION
     end
 
-    def print_config
-      @content.each { |k, v| puts "#{k}: #{v}" }
-    end
-
-    def print_attr(arg)
-      puts @content[arg]
-    end
-
-    def clear_pending
-      @content[:pending].clear
-      serialize
+    def default_filters
+      {
+        'includes' => %w[PROPER REPACK],
+        'excludes' => %w[2160P 1080P 720P]
+      }
     end
 
-    def queue_pending(show)
-      @content[:pending] << show
-      serialize
+    def read_and_split_list(case_method)
+      $stdin.gets.chomp.split(',')
+            .map(&:strip)
+            .map(&case_method)
     end
   end
 end

data/lib/download_tv/downloader.rb

@@ -16,7 +16,7 @@ module DownloadTV
     # Tries to download episodes in order for a given season,
     # until it can't find any
     def download_entire_season(show, season)
-      t = Torrent.new(@config.content[:grabber])
+      t = Torrent.new(@config[:grabber])
       season.insert(0, '0') if season.size == 1
       episode = "#{show} s#{season}e01"
       loop do
@@ -29,7 +29,7 @@ module DownloadTV
     end
 
     def download_single_show(show, season = nil)
-      t = Torrent.new(@config.content[:grabber])
+      t = Torrent.new(@config[:grabber])
       show = fix_names([show]).first
       if season
         download_entire_season(show, season)
@@ -44,7 +44,7 @@ module DownloadTV
     def download_from_file(filename)
       if File.exist? filename
         filename = File.realpath(filename)
-        t = Torrent.new(@config.content[:grabber])
+        t = Torrent.new(@config[:grabber])
         to_download = File.readlines(filename, chomp: true)
         fix_names(to_download).each { |show| download(get_link(t, show)) }
       else
@@ -56,7 +56,7 @@ module DownloadTV
     ##
     # Returns the date from which to check shows
     def date_to_check_from(offset)
-      return @config.content[:date] if offset.zero?
+      return @config[:date] if offset.zero?
 
       Date.today - offset
     end
@@ -70,8 +70,8 @@ module DownloadTV
     # The param +offset+ can be used to move the date back that many days in the check
     # The param +include_tomorrow+ will add the current day to the list of dates to search
     def run(dry_run = false, offset = 0, include_tomorrow: false)
-      pending = @config.content[:pending].clone
-      @config.content[:pending].clear
+      pending = @config[:pending].clone
+      @config[:pending].clear
       pending ||= []
       date = date_to_check_from(offset)
 
@@ -85,10 +85,10 @@ module DownloadTV
       end
 
       unless dry_run
-        @config.content[:date] = if include_tomorrow
+        @config[:date] = if include_tomorrow
                                    Date.today.next
                                  else
-                                   [Date.today, @config.content[:date]].max
+                                   [Date.today, @config[:date]].max
                                  end
         @config.serialize
       end
@@ -126,9 +126,8 @@ module DownloadTV
     end
 
     def shows_to_download(date, include_tomorrow)
-      myepisodes = MyEpisodes.new(@config.content[:myepisodes_user],
-                                  @config.content[:cookie])
-      myepisodes.load_cookie
+      myepisodes = MyEpisodes.new(@config[:myepisodes_user],
+                                  @config[:cookie])
       shows = myepisodes.get_shows_since(date, include_tomorrow: include_tomorrow)
       shows = reject_ignored(shows)
       fix_names(shows)
@@ -144,11 +143,11 @@ module DownloadTV
       links = torrent.get_links(show)
 
       if links.empty?
-        @config.content[:pending] << show if save_pending
+        @config[:pending] << show if save_pending
         return
       end
 
-      if @config.content[:auto]
+      if @config[:auto]
         filter_shows(links).first[1]
       else
         prompt_links(links)
@@ -181,7 +180,7 @@ module DownloadTV
     def reject_ignored(shows)
       shows.reject do |i|
         # Remove season+episode
-        @config.content[:ignored]
+        @config[:ignored]
                .include?(i.split(' ')[0..-2].join(' ').downcase)
       end
     end
@@ -199,7 +198,7 @@ module DownloadTV
     # Runs until no filters are left to be applied or applying
     # a filter would leave no results
     def filter_shows(links)
-      @filterer ||= Filterer.new(@config.content[:filters])
+      @filterer ||= Filterer.new(@config[:filters])
       @filterer.filter(links)
     end
 

data/lib/download_tv/filterer.rb

@@ -4,28 +4,11 @@ module DownloadTV
   ##
   # Builds and applies filters to the results
   class Filterer
-    attr_reader :filters
-
     def initialize(filters_config)
       @filters = []
       build_filters(filters_config)
     end
 
-    def build_include_filter(str)
-      @filters << ->(n) { !n.upcase.include?(str) }
-    end
-
-    def build_exclude_filter(str)
-      @filters << ->(n) { n.upcase.include?(str) }
-    end
-
-    def build_filters(filters_config)
-      return unless filters_config
-
-      filters_config[:includes].map { |i| build_include_filter(i) }
-      filters_config[:excludes].map { |i| build_exclude_filter(i) }
-    end
-
     ##
     # Iteratively applies filters until they've all been applied
     # or applying the next filter would result in no results
@@ -41,5 +24,22 @@ module DownloadTV
 
       shows
     end
+
+    private
+
+    def build_filters(filters_config)
+      return unless filters_config
+
+      filters_config[:includes].map { |i| build_include_filter(i) }
+      filters_config[:excludes].map { |i| build_exclude_filter(i) }
+    end
+
+    def build_include_filter(str)
+      @filters << ->(n) { !n.upcase.include?(str) }
+    end
+
+    def build_exclude_filter(str)
+      @filters << ->(n) { n.upcase.include?(str) }
+    end
   end
 end

data/lib/download_tv/grabbers/eztv.rb

@@ -9,7 +9,7 @@ module DownloadTV
     end
 
     def get_links(show)
-      raw_data = @agent.get(format(@url, show))
+      raw_data = agent.get(format(@url, show))
       raw_seeders = raw_data.search('td.forum_thread_post_end').map { |e| e.children[0].text.to_i }
       raw_links = raw_data.search('a.magnet').sort_by.with_index { |_, index| raw_seeders[index] }.reverse
 

data/lib/download_tv/grabbers/torrentapi.rb

@@ -35,7 +35,7 @@ module DownloadTV
     # Makes a get request tp the given url.
     # Returns the JSON response parsed into a hash
     def request_and_parse(url)
-      page = @agent.get(url).content
+      page = agent.get(url).content
       JSON.parse(page)
     end
 
@@ -63,7 +63,7 @@ module DownloadTV
         obj = request_and_parse(search)
       end
 
-      while obj['error_code'] == TOO_MANY_REQUESTS_ERROR
+      while obj['error_code'] == TOO_MANY_REQUESTS_ERROR || obj.has_key?('rate_limit')
         sleep(@wait)
         obj = request_and_parse(search)
       end

data/lib/download_tv/grabbers/torrentz.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module DownloadTV
+  ##
+  # Torrentz2 grabber
+  class Torrentz < LinkGrabber
+    def initialize
+      super('https://torrentz2.nz/search?q=%s')
+    end
+
+    def get_links(show)
+      raw_data = agent.get(format(@url, show))
+      results = raw_data.search('dl')
+
+      raise NoTorrentsError if results.empty?
+
+      data = results.sort_by { |e| e.search('dd span')[3].text.to_i }.reverse
+
+      data.collect do |i|
+        [i.children[0].text.strip,
+         i.search('dd span a').first.attribute('href').text]
+      end
+    end
+  end
+end

data/lib/download_tv/grabbers/tpb.rb

@@ -14,7 +14,7 @@ module DownloadTV
       search = format(@url, show)
 
       # Skip the header
-      data = @agent.get(search).search('#searchResult tr').drop 1
+      data = agent.get(search).search('#searchResult tr').drop 1
 
       raise NoTorrentsError if data.empty?
 

data/lib/download_tv/linkgrabber.rb

@@ -8,7 +8,10 @@ module DownloadTV
 
     def initialize(url)
       @url = url
-      @agent = Mechanize.new do |a|
+    end
+
+    def agent
+      @agent ||= Mechanize.new do |a|
         a.user_agent = DownloadTV::USER_AGENT
         a.read_timeout = 10
       end
@@ -20,9 +23,9 @@ module DownloadTV
             else
               @url
             end
-      @agent.head(url)
+      agent.head(url)
       true
-    rescue Mechanize::ResponseCodeError, Net::HTTP::Persistent::Error, Errno::ECONNRESET
+    rescue StandardError
       false
     end
 

data/lib/download_tv/myepisodes.rb

@@ -5,32 +5,65 @@ module DownloadTV
   # API wrapper for MyEpisodes
   class MyEpisodes
     def initialize(user, save_cookie)
-      @agent = Mechanize.new
-      @agent.user_agent = DownloadTV::USER_AGENT
       @user = user
       @save_cookie = save_cookie
       @cookie_path = File.join(ENV['HOME'], '.config', 'download_tv', 'cookie')
+      agent.user_agent = DownloadTV::USER_AGENT
+      login
+    end
+
+    def get_shows_since(last, include_tomorrow: false)
+      page = agent.get 'https://www.myepisodes.com/ajax/service.php?mode=view_privatelist'
+      shows = page.parser.css('tr.past')
+      shows = filter_newer_shows(shows, last)
+      shows.concat(page.parser.css('tr.today')) if include_tomorrow
+      build_show_strings(shows)
+    end
+
+    private
+
+    def agent
+      @agent ||= Mechanize.new
     end
 
     def login
+      logged_in_with_cookie = load_cookie
+      manual_login unless logged_in_with_cookie
+    end
+
+    def manual_login
       pass = prompt_user_data
-      page = @agent.get 'https://www.myepisodes.com/login.php'
+      page = agent.get 'https://www.myepisodes.com/login.php'
 
       login_form = page.forms[1]
       login_form.username = @user
       login_form.password = pass
 
-      page = @agent.submit(login_form, login_form.buttons.first)
+      page = agent.submit(login_form, login_form.buttons.first)
 
       raise InvalidLoginError if page.filename == 'login.php'
 
-      save_cookie if @save_cookie
+      store_cookie if @save_cookie
+    end
+
+    ##
+    # If there is a cookie file, tries to log in using it
+    # returns the result of the operation (true/false)
+    def load_cookie
+      if File.exist? @cookie_path
+        agent.cookie_jar.load @cookie_path
+        return true if logged_in?
+
+        puts 'The cookie is invalid/has expired.'
+      else
+        puts 'Cookie file not found'
+      end
 
-      @agent
+      false
     end
 
     def prompt_user_data
-      if !@user || @user == ''
+      if @user.nil? || @user.empty?
         print 'Enter your MyEpisodes username: '
         @user = $stdin.gets.chomp
       end
@@ -41,35 +74,13 @@ module DownloadTV
       pass
     end
 
-    def load_cookie
-      if File.exist? @cookie_path
-        @agent.cookie_jar.load @cookie_path
-        return @agent if logged_in?
-
-        puts 'The cookie is invalid/has expired.'
-      else
-        puts 'Cookie file not found'
-      end
-
-      login
-    end
-
     def logged_in?
-      page = @agent.get 'https://www.myepisodes.com/login.php'
+      page = agent.get 'https://www.myepisodes.com/login.php'
       page.links[1].text != 'Register'
     end
 
-    def save_cookie
-      @agent.cookie_jar.save(@cookie_path, session: true)
-      @agent
-    end
-
-    def get_shows_since(last, include_tomorrow: false)
-      page = @agent.get 'https://www.myepisodes.com/ajax/service.php?mode=view_privatelist'
-      shows = page.parser.css('tr.past')
-      shows = filter_newer_shows(shows, last)
-      shows.concat(page.parser.css('tr.today')) if include_tomorrow
-      build_show_strings(shows)
+    def store_cookie
+      agent.cookie_jar.save(@cookie_path, session: true)
     end
 
     # Only keep the shows that have aired since the given date