download_tv 2.4.7 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3da65f8f28fbd1c2d76d9166e5e5ed8e13ddf77546e63a43955d88ca60b226da
-  data.tar.gz: 526cc3fffa489f0e4f9b568b196bc0c468958fab56f46e72b0fe1222b515aa62
+  metadata.gz: d2db543fb9eaf70753008d797005ac32249c67fde6e0b9b6a41e916c0eb66fcb
+  data.tar.gz: 41fe118c7d18adb566dec211873d64a3f6d2fdcfeea0f6e18c173545e6b8368c
 SHA512:
-  metadata.gz: 0aa3b30cf80314fe1cc88b83a89b1d548a81fd787b38b3aed26433263de54f09288e05413f0eb64654ad2a4d6acfc4c4ae82e780b37a98a40e59bf33b1857475
-  data.tar.gz: 738b270056911835ac14e073d8067376f43dc2dce4bdaddc7a8c36c38f3eb90ff5adddcd68f387f81d5f71a88aca831684fc086f82b859b90a089e4c2bd41f08
+  metadata.gz: e01b1c252163640d4d9be4cf47c3488019387762924de1d72cf58398be28e82ba5355abdf11fe7b31bfe38db5f13969e19081671f45eb0199cffcb776028d152
+  data.tar.gz: 57c2389c98774ba8f31e78d4e0adfd857c044862224d2b39611accfc2cd850403f89e2154f91ab6280fc7b6bab187bf524aec4ac950e5385a3a1271bc81c7b30

data/.gitignore

@@ -1,2 +1,3 @@
 /Gemfile.lock
-/pkg/
+/pkg/
+.rubocop.yml

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 

data/bin/tv

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'optparse'
 require 'download_tv'
@@ -58,6 +59,14 @@ opt_parser = OptionParser.new do |opts|
     exit
   end
 
+  opts.on('-p', '--pending', 'Show list of pending downloads') do
+    options[:cmd] = 'showpending'
+  end
+
+  opts.on('--clear-pending', 'Clear list of pending downloads') do
+    options[:cmd] = 'clearpending'
+  end
+
   opts.on('-v', '--version', 'Print version') do
     puts DownloadTV::VERSION
     exit
@@ -86,6 +95,10 @@ begin
     DownloadTV::Configuration.new(config, true)
   when 'showconfig'
     DownloadTV::Configuration.new(config).print_config
+  when 'showpending'
+    DownloadTV::Configuration.new(config).print_attr(:pending)
+  when 'clearpending'
+    DownloadTV::Configuration.new(config).clear_pending
   end
 rescue Interrupt
   puts 'Interrupt signal detected. Exiting...'

data/download_tv.gemspec

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'download_tv/version'
 
@@ -23,11 +23,11 @@ Gem::Specification.new do |s|
   s.executables = ['tv']
 
   s.add_development_dependency 'bundler', '~> 1.15'
-  s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'minitest', '~> 5.0'
+  s.add_development_dependency 'rake', '~> 10.0'
 
   s.add_dependency('json')
   s.add_dependency('mechanize')
 
-  s.license     = 'MIT'
+  s.license = 'MIT'
 end

data/lib/download_tv.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'mechanize'
 require 'date'
@@ -13,7 +15,7 @@ require 'download_tv/linkgrabber'
 require 'download_tv/subtitles'
 
 module DownloadTV
-  USER_AGENT = "DownloadTV #{DownloadTV::VERSION}".freeze
+  USER_AGENT = "DownloadTV #{DownloadTV::VERSION}"
 
   class NoTorrentsError < StandardError; end
 

data/lib/download_tv/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DownloadTV
   ##
   # Class used for managing the configuration of the application
@@ -6,7 +8,7 @@ module DownloadTV
 
     def initialize(content = {}, force_change = false)
       FileUtils.mkdir_p(File.join(ENV['HOME'], '.config', 'download_tv'))
-      @config_path = content[:path] || File.join(ENV['HOME'], '.config', 'download_tv', 'config')
+      @config_path = content[:path] || default_config_path
 
       if File.exist? @config_path
         load_config
@@ -20,34 +22,52 @@ module DownloadTV
     end
 
     def change_configuration
+      prompt_for_myep_user
+      prompt_for_cookie
+      prompt_for_ignored
+      STDOUT.flush
+
+      set_default_values
+      serialize
+    end
+
+    def prompt_for_myep_user
       if @content[:myepisodes_user]
         print "Enter your MyEpisodes username (#{@content[:myepisodes_user]}) : "
       else
         print 'Enter your MyEpisodes username: '
       end
       @content[:myepisodes_user] = STDIN.gets.chomp
+    end
 
+    def prompt_for_cookie
       print 'Save cookie? (y)/n: '
       @content[:cookie] = !(STDIN.gets.chomp.casecmp? 'n')
+    end
 
+    def prompt_for_ignored
       if @content[:ignored]
         puts "Enter a comma-separated list of shows to ignore: (#{@content[:ignored]})"
       else
         puts 'Enter a comma-separated list of shows to ignore: '
       end
 
-      @content[:ignored] = STDIN.gets.chomp.split(',').map(&:strip).map(&:downcase)
-      STDOUT.flush
+      @content[:ignored] = STDIN.gets
+                                .chomp
+                                .split(',')
+                                .map(&:strip)
+                                .map(&:downcase)
+    end
 
+    def set_default_values
       # When modifying existing config, keeps previous values
       # When creating new one, sets defaults
       @content[:auto] ||= true
       @content[:subs] ||= true
       @content[:grabber] ||= 'TorrentAPI'
       @content[:date] ||= Date.today - 1
+      @content[:pending] = []
       @content[:version] = DownloadTV::VERSION
-
-      serialize
     end
 
     def serialize
@@ -67,16 +87,32 @@ module DownloadTV
       retry
     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
     # Returns false if a patch has been detected
     # Returns nil if it's the same version
     def breaking_changes?(version)
-      DownloadTV::VERSION.split('.').zip(version.split('.')).find_index { |x, y| y > x }&.< 2
+      DownloadTV::VERSION.split('.')
+                         .zip(version.split('.'))
+                         .find_index { |x, y| y < x }
+                         &.< 2
     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
+      @content.serialize
+    end
   end
 end

data/lib/download_tv/downloader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DownloadTV
   ##
   # Entry point of the application
@@ -20,16 +22,19 @@ module DownloadTV
 
     def download_single_show(show)
       t = Torrent.new(@config.content[:grabber])
+      show = fix_names([show]).first
       download(get_link(t, show))
     end
 
     ##
-    # Given a file containing a list of episodes (one per line), it tries to find download links for each
+    # Given a file containing a list of episodes (one per line)
+    # it tries to find download links for each
     def download_from_file(filename)
       if File.exist? filename
         filename = File.realpath(filename)
         t = Torrent.new(@config.content[:grabber])
-        File.readlines(filename).each { |show| download(get_link(t, show.chomp)) }
+        to_download = File.readlines(filename, chomp:true)
+        fix_names(to_download).each { |show| download(get_link(t, show)) }
       else
         puts "Error: #{filename} not found"
         exit 1
@@ -37,28 +42,34 @@ module DownloadTV
     end
 
     ##
-    # Finds download links for all new episodes aired since the last run of the program
-    # It connects to MyEpisodes in order to find which shows to track and which new episodes aired.
+    # Finds download links for all new episodes aired since
+    # the last run of the program
+    # It connects to MyEpisodes in order to find which shows
+    # to track and which new episodes aired.
     def run(dont_update_last_run, offset = 0)
+      pending = @config.content[:pending]
+      @config.content[:pending].clear
+      pending ||= []
       date = check_date(offset)
+      if pending.empty? and date.nil?
+        puts 'Everything up to date'
+        exit
+      end
 
-      myepisodes = MyEpisodes.new(@config.content[:myepisodes_user], @config.content[:cookie])
-      # Log in using cookie by default
-      myepisodes.load_cookie
-      shows = myepisodes.get_shows(date)
-      to_download = fix_names(shows)
+      to_download = shows_to_download(date)
+      to_download.concat pending
 
       if to_download.empty?
         puts 'Nothing to download'
 
       else
-        t = Torrent.new(@config.content[:grabber])
+        t = Torrent.new()
 
         queue = Queue.new
 
         # Adds a link (or empty string to the queue)
         link_t = Thread.new do
-          to_download.each { |show| queue << get_link(t, show) }
+          to_download.each { |show| queue << get_link(t, show, true) }
         end
 
         # Downloads the links as they are added
@@ -66,6 +77,7 @@ module DownloadTV
           to_download.size.times do
             magnet = queue.pop
             next if magnet == '' # Doesn't download if no torrents are found
+
             download(magnet)
           end
         end
@@ -88,45 +100,64 @@ module DownloadTV
       warn 'Wrong username/password combination'
     end
 
+    def shows_to_download(date)
+      myepisodes = MyEpisodes.new(@config.content[:myepisodes_user],
+                                  @config.content[:cookie])
+      # Log in using cookie by default
+      myepisodes.load_cookie
+      shows = myepisodes.get_shows(date)
+      shows = reject_ignored(shows)
+      fix_names(shows)
+    end
+
     ##
     # Uses a Torrent object to obtain links to the given tv show
-    # When :auto is true it will try to find the best match based on a set of filters
+    # When :auto is true it will try to find the best match
+    # based on a set of filters.
     # When it's false it will prompt the user to select the preferred result
     # Returns either a magnet link or an emptry string
-    def get_link(t, show)
-      links = t.get_links(show)
+    def get_link(torrent, show, save_pending=false)
+      links = torrent.get_links(show)
 
-      return '' if links.empty?
+      if links.empty?
+        @config.content[:pending] << show if save_pending
+        return '' 
+      end
 
       if @config.content[:auto]
         links = filter_shows(links)
         links.first[1]
       else
-        puts "Collecting links for #{show}"
-        links.each_with_index { |data, i| puts "#{i}\t\t#{data[0]}" }
+        prompt_links(links)
+        get_link_from_user(links)
+      end
+    end
 
-        puts
-        print 'Select the torrent you want to download [-1 to skip]: '
+    def get_link_from_user(links)
+      i = $stdin.gets.chomp.to_i
 
+      until i.between?(-1, links.size - 1)
+        puts 'Index out of bounds. Try again [-1 to skip]: '
         i = $stdin.gets.chomp.to_i
+      end
 
-        while i >= links.size || i < -1
-          puts 'Index out of bounds. Try again [-1 to skip]: '
-          i = $stdin.gets.chomp.to_i
-        end
+      i == -1 ? '' : links[i][1]
+    end
 
-        # Use -1 to skip the download
-        i == -1 ? '' : links[i][1]
-      end
+    def prompt_links(links)
+      links.each_with_index { |data, i| puts "#{i}\t\t#{data[0]}" }
+
+      puts
+      print 'Select the torrent you want to download [-1 to skip]: '
     end
 
+    ##
+    # Returns the date from which to check for shows
+    # Or nil if the date is today
     def check_date(offset)
       last = @config.content[:date]
       if last - offset != Date.today
         last - offset
-      else
-        puts 'Everything up to date'
-        exit
       end
     end
 
@@ -134,19 +165,26 @@ module DownloadTV
     # Given a list of shows and episodes:
     #
     # * Removes ignored shows
-    # * Removes apostrophes, colons and parens
-    def fix_names(shows)
-      # Ignored shows
-      s = shows.reject do |i|
+    def reject_ignored(shows)
+      shows.reject do |i|
         # Remove season+episode
-        @config.content[:ignored].include?(i.split(' ')[0..-2].join(' ').downcase)
+        @config.content[:ignored]
+               .include?(i.split(' ')[0..-2].join(' ').downcase)
       end
+      
+    end
 
-      s.map { |i| i.gsub(/ \(.+\)|[':]/, '') }
+    ##
+    # Given a list of shows and episodes:
+    #
+    # * Removes apostrophes, colons and parens
+    def fix_names(shows)
+      shows.map { |i| i.gsub(/ \(.+\)|[':]/, '') }
     end
 
     ##
-    # Iteratively applies filters until they've all been applied or applying the next filter would result in no results
+    # Iteratively applies filters until they've all been applied
+    # or applying the next filter would result in no results
     # These filters are defined at @filters
     def filter_shows(links)
       @filters.each do |f| # Apply each filter

data/lib/download_tv/grabbers/addic7ed.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module DownloadTV
   ##
   # Addic7ed prototype (WIP)
   class Addic7ed < LinkGrabber
     def initialize
-      super('http://www.addic7ed.com/search.php?search=%s&Submit=Search')
+      super('http://www.addic7ed.com/search.php?search=%s'\
+            '&Submit=Search')
     end
 
     def get_subs(show)

data/lib/download_tv/grabbers/eztv.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DownloadTV
   ##
   # EZTV.ag grabber
@@ -6,9 +8,9 @@ module DownloadTV
       super('https://eztv.ag/search/%s')
     end
 
-    def get_links(s)
+    def get_links(show)
       # Format the url
-      search = format(@url, s)
+      search = format(@url, show)
 
       data = @agent.get(search).search('a.magnet')
 
@@ -18,8 +20,15 @@ module DownloadTV
       # EZTV shows 50 latest releases if it can't find the torrent
       raise NoTorrentsError if data.size == 50
 
-      names = data.collect { |i| i.attribute('title').text.chomp(' Magnet Link') }
-      links = data.collect { |i| i.attribute('href').text }
+      names = data.collect do |i|
+        i.attribute('title')
+         .text
+         .chomp(' Magnet Link')
+      end
+      links = data.collect do |i|
+        i.attribute('href')
+         .text
+      end
 
       names.zip(links)
     end

data/lib/download_tv/grabbers/kat.rb

@@ -1,32 +1,47 @@
+# frozen_string_literal: true
+
 module DownloadTV
   ##
   # KATcr.co grabber
   class KAT < LinkGrabber
+    attr_reader :max_tries
+
     def initialize
       super('https://katcr.co/advanced-usearch/')
+      @max_tries = 5
     end
 
-    def get_links(s)
+    def get_links(show)
       tries = 0
-      max_tries = 5
 
       params = {
         'category': 'TV',
         'orderby': 'seeds-desc',
-        'search': s
+        'search': show
       }
 
-      data = @agent.post(@url, params).search('tbody tr td[1]')
+      data = @agent.post(@url, params)
+                   .search('tbody tr td[1]')
 
-      names = data.map { |i| i.search('a.torrents_table__torrent_title b').text }
-      links = data.map { |i| i.search('div.torrents_table__actions a[3]').first.attribute('href').text }
+      names = data.map do |i|
+        i.search('a.torrents_table__torrent_title b')
+         .text
+      end
+
+      links = data.map do |i|
+        i.search('div.torrents_table__actions a[3]')
+         .first
+         .attribute('href')
+         .text
+      end
 
       raise NoTorrentsError if data.empty?
 
       names.zip(links)
     rescue Net::HTTP::Persistent::Error => e
       raise unless e.message =~ /too many connection resets/
-      raise if tries >= max_tries
+      raise if tries >= @max_tries
+
       tries += 1
       retry
     end

data/lib/download_tv/grabbers/torrentapi.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DownloadTV
   ##
   # TorrentAPI.org grabber
@@ -7,7 +9,9 @@ module DownloadTV
     attr_reader :wait
 
     def initialize
-      super('https://torrentapi.org/pubapi_v2.php?mode=search&search_string=%s&token=%s&app_id=DownloadTV&sort=seeders')
+      super('https://torrentapi.org/pubapi_v2.php?'\
+            'mode=search&search_string=%s&token=%s&'\
+            'app_id=DownloadTV&sort=seeders')
       @wait = 0.1
     end
 
@@ -26,37 +30,41 @@ module DownloadTV
       end
     end
 
+    ##
+    # 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
+      JSON.parse(page)
+    end
+
     ##
     # Connects to Torrentapi.org and requests a token, returning it
     # Tokens automatically expire every 15 minutes
     def renew_token
-      page = @agent.get('https://torrentapi.org/pubapi_v2.php?get_token=get_token&app_id=DownloadTV').content
-
-      obj = JSON.parse(page)
+      obj = request_and_parse('https://torrentapi.org/pubapi_v2'\
+                              '.php?get_token=get_token&app_id='\
+                              'DownloadTV')
 
       @token = obj['token']
     end
 
-    def get_links(s)
+    def get_links(show)
       @token ||= renew_token
 
-      # Format the url
-      search = format(@url, s, @token)
+      search = format(@url, show, @token)
 
-      page = @agent.get(search).content
-      obj = JSON.parse(page)
+      obj = request_and_parse(search)
 
       if obj['error_code'] == 4 # Token expired
         renew_token
-        search = format(@url, s, @token)
-        page = @agent.get(search).content
-        obj = JSON.parse(page)
+        search = format(@url, show, @token)
+        obj = request_and_parse(search)
       end
 
       while obj['error_code'] == 5 # Violate 1req/2s limit
         sleep(@wait)
-        page = @agent.get(search).content
-        obj = JSON.parse(page)
+        obj = request_and_parse(search)
       end
 
       raise NoTorrentsError if obj['error']

data/lib/download_tv/grabbers/tpb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DownloadTV
   ##
   # ThePirateBay grabber
@@ -8,13 +10,11 @@ module DownloadTV
       super("#{proxy}/search/%s/0/7/0")
     end
 
-    def get_links(s)
-      # Format the url
-      search = format(@url, s)
+    def get_links(show)
+      search = format(@url, show)
 
-      data = @agent.get(search).search('#searchResult tr')
       # Skip the header
-      data = data.drop 1
+      data = @agent.get(search).search('#searchResult tr').drop 1
 
       raise NoTorrentsError if data.empty?
 

data/lib/download_tv/linkgrabber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DownloadTV
   ##
   # Interface for the grabbers
@@ -12,13 +14,18 @@ module DownloadTV
 
     def online?
       @agent.read_timeout = 2
-      @agent.head(format(@url, 'test'))
+      url = if @url.include? '%s'
+              format(@url, 'test')
+            else
+              @url
+            end
+      @agent.head(url)
       true
     rescue Mechanize::ResponseCodeError, Net::HTTP::Persistent::Error
       false
     end
 
-    def get_links(_s)
+    def get_links(_show)
       raise NotImplementedError
     end
   end

data/lib/download_tv/myepisodes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DownloadTV
   ##
   # API wrapper for MyEpisodes
@@ -11,15 +13,7 @@ module DownloadTV
     end
 
     def login
-      if !@user || @user == ''
-        print 'Enter your MyEpisodes username: '
-        @user = STDIN.gets.chomp
-      end
-
-      print 'Enter your MyEpisodes password: '
-      pass = STDIN.noecho(&:gets).chomp
-      puts
-
+      pass = prompt_user_data
       page = @agent.get 'https://www.myepisodes.com/login.php'
 
       login_form = page.forms[1]
@@ -35,19 +29,34 @@ module DownloadTV
       @agent
     end
 
+    def prompt_user_data
+      if !@user || @user == ''
+        print 'Enter your MyEpisodes username: '
+        @user = STDIN.gets.chomp
+      end
+
+      print 'Enter your MyEpisodes password: '
+      pass = STDIN.noecho(&:gets).chomp
+      puts
+      pass
+    end
+
     def load_cookie
       if File.exist? @cookie_path
         @agent.cookie_jar.load @cookie_path
-        page = @agent.get 'https://www.myepisodes.com/login.php'
-        if page.links[1].text == 'Register'
-          puts 'The cookie is invalid/has expired.'
-          login
-        end
-        @agent
+        return @agent if logged_in?
+
+        puts 'The cookie is invalid/has expired.'
       else
         puts 'Cookie file not found'
-        login
       end
+
+      login
+    end
+
+    def logged_in?
+      page = @agent.get 'https://www.myepisodes.com/login.php'
+      page.links[1].text != 'Register'
     end
 
     def save_cookie
@@ -56,22 +65,31 @@ module DownloadTV
     end
 
     def get_shows(last)
+      return [] if last.nil?
       page = @agent.get 'https://www.myepisodes.com/ajax/service.php?mode=view_privatelist'
       shows = page.parser.css('tr.past')
 
-      s = shows.select do |i|
+      shows = filter_newer_shows(shows, last)
+
+      build_show_strings(shows)
+    end
+
+    def filter_newer_shows(shows, date)
+      shows.select do |i|
         airdate = i.css('td.date')[0].text
-        Date.parse(airdate) >= last
+        Date.parse(airdate) >= date
       end
+    end
 
-      s.map do |i|
-        name = i.css('td.showname').text
+    def build_show_strings(shows)
+      shows.map do |i|
+        sname = i.css('td.showname').text
         ep = i.css('td.longnumber').text
 
         ep.insert(0, 'S')
         ep.sub!('x', 'E')
 
-        "#{name} #{ep}"
+        "#{sname} #{ep}"
       end
     end
   end

data/lib/download_tv/subtitles.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DownloadTV
   ##
   # Manages the subtitles (WIP)

data/lib/download_tv/torrent.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DownloadTV
   ##
   # Class in charge of managing the link grabbers
@@ -5,7 +7,8 @@ module DownloadTV
     attr_reader :g_instances, :tries
 
     def grabbers
-      %w[TorrentAPI ThePirateBay Eztv KAT]
+      # %w[TorrentAPI ThePirateBay Eztv KAT]
+      %w[TorrentAPI ThePirateBay Eztv]
     end
 
     def initialize(default_grabber = nil)
@@ -27,6 +30,7 @@ module DownloadTV
         exit 1
       end
       return if @g_instances.first.online?
+
       # We won't be using this grabber
       warn "Problem accessing #{@g_instances.first.class.name}"
       @tries -= 1
@@ -48,7 +52,6 @@ module DownloadTV
 
       links
     rescue NoTorrentsError
-      puts "No torrents found for #{show} using #{@g_instances.first.class.name}"
 
       # Use next grabber
       if @tries.positive?
@@ -59,7 +62,7 @@ module DownloadTV
       else
         reset_grabbers_order
         reset_tries
-        # Handle show not found here!!
+        puts "No torrents found for #{show}"
         return []
       end
     end

data/lib/download_tv/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DownloadTV
-  VERSION = '2.4.7'.freeze
+  VERSION = '2.5.0'
 end

data/test/config_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe DownloadTV::Configuration do
@@ -104,6 +106,7 @@ describe DownloadTV::Configuration do
       c.content[:ignored].must_equal ['anything']
       c.content[:auto].must_equal true
       c.content[:subs].must_equal true
+      c.content[:pending].must_equal []
       c.content[:grabber].must_equal 'TorrentAPI'
       c.content[:date].must_equal(Date.today - 1)
       c.content[:version].must_equal DownloadTV::VERSION
@@ -149,6 +152,7 @@ describe DownloadTV::Configuration do
       content[:ignored].must_equal ['anything']
       content[:auto].must_equal true
       content[:subs].must_equal true
+      content[:pending].must_equal []
       content[:grabber].must_equal 'TorrentAPI'
       content[:date].must_equal Date.today - 1
       content[:version].must_equal DownloadTV::VERSION

data/test/downloader_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe DownloadTV::Downloader do
@@ -22,27 +24,32 @@ describe DownloadTV::Downloader do
 
   describe 'the fix_names method' do
     it 'should remove apostrophes, colons and parens' do
-      shows = ['Mr. Foo S01E02', 'Bar (UK) S00E22', "Let's S05E03", 'Baz: The Story S05E22']
-      result = ['Mr. Foo S01E02', 'Bar S00E22', 'Lets S05E03', 'Baz The Story S05E22']
+      shows = ['Mr. Foo S01E02', 'Bar (UK) S00E22', "Let's S05E03",
+               'Baz: The Story S05E22']
+      result = ['Mr. Foo S01E02', 'Bar S00E22', 'Lets S05E03',
+                'Baz The Story S05E22']
 
       dl = DownloadTV::Downloader.new(ignored: [], path: config_path)
       dl.fix_names(shows).must_equal result
     end
 
+  end
+
+  describe 'the reject_ignored method' do
     it 'should remove ignored shows' do
-      shows = ['Mr. Foo S01E02', 'Bar (UK) S00E22', 'Ignored S20E22', "Let's S05E03"]
-      result = ['Mr. Foo S01E02', 'Bar S00E22', 'Lets S05E03']
+      shows = ['Bar S00E22', 'Ignored S20E22']
+      result = ['Bar S00E22']
 
       dl = DownloadTV::Downloader.new(ignored: ['ignored'], path: config_path)
-      dl.fix_names(shows).must_equal result
+      dl.reject_ignored(shows).must_equal result
     end
+    
   end
 
   describe 'the check_date method' do
     it 'exits the script when up to date' do
       dl = DownloadTV::Downloader.new(date: Date.today, path: config_path)
-      to_run = -> { run_silently { dl.check_date(0) } }
-      to_run.must_raise SystemExit
+      dl.check_date(0).must_be_nil
     end
 
     it 'uses the offset to adjust the date' do
@@ -80,7 +87,8 @@ describe DownloadTV::Downloader do
 
     it 'removes names without PROPER or REPACK in them' do
       dl = DownloadTV::Downloader.new(path: config_path)
-      links = [['Link 1', ''], ['Link 2 2160p', ''], ['Link 3', ''], ['Link 4 PROPER', ''], ['Link REPACK 5', '']]
+      links = [['Link 1', ''], ['Link 2 2160p', ''], ['Link 3', ''],
+               ['Link 4 PROPER', ''], ['Link REPACK 5', '']]
       res = [['Link 4 PROPER', ''], ['Link REPACK 5', '']]
       dl.filter_shows(links).must_equal res
     end
@@ -99,11 +107,15 @@ describe DownloadTV::Downloader do
       show = 'Example Show S01E01'
 
       t.expect(:get_links, [], [show])
-      dl = DownloadTV::Downloader.new(auto: true, path: config_path)
-      dl.get_link(t, show).must_equal ''
+      dl = DownloadTV::Downloader.new(auto: true, path: config_path, pending: ['show 11'])
+      dl.get_link(t, show, true).must_equal ''
+      dl.config.content[:pending].must_equal ['show 11', show]
+
       t.expect(:get_links, [], [show])
-      dl = DownloadTV::Downloader.new(auto: false, path: config_path)
-      dl.get_link(t, show).must_equal ''
+      dl = DownloadTV::Downloader.new(auto: false, path: config_path, pending: [])
+      dl.get_link(t, show, true).must_equal ''
+      dl.config.content[:pending].must_include show
+
       t.verify
     end
 

data/test/grabbers_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe DownloadTV::LinkGrabber do

data/test/test_helper.rb

@@ -1,4 +1,6 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'download_tv'
 require 'minitest/autorun'
 

data/test/torrent_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe DownloadTV::Torrent do
@@ -25,8 +27,8 @@ describe DownloadTV::Torrent do
   describe 'when giving it a default grabber' do
     it 'has a default order' do
       t = DownloadTV::Torrent.new(nil)
-      expected = grabber_names.map { |i| "DownloadTV::#{i}"}
-      t.g_instances.map { |i| i.class.name}.must_equal expected
+      expected = grabber_names.map { |i| "DownloadTV::#{i}" }
+      t.g_instances.map { |i| i.class.name }.must_equal expected
     end
 
     grabber_names.each do |g|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.5.0
 platform: ruby
 authors:
 - guille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement