download_tv 2.5.3 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee5a753ef1f164e3be414b4dc72bd25f0ee067aabb50f213da09655e5ec6e3a
-  data.tar.gz: 50ba6c3f7641ac1b36b3b63a1a34528d6d5645f69364416e756e126f951be95e
+  metadata.gz: 29c9837fef84c38a41063a8526525e12ce56c82bd8c8467289401dd8ae5453ba
+  data.tar.gz: c448ce24115b3cb19dcc128c56a47cdee61d072994dafcfe5ab3d53b5d799109
 SHA512:
-  metadata.gz: 7bbbbcdfd925e8afc3857f4160a4f0dd7d6094163b43421117465fbc38acfe890d9ce27af62d400cdf9018732f6a6868d72f1ea5d796682254dd535ff83b33a6
-  data.tar.gz: c4df241a888c8248c356640e89d45aa1d961aaa00232321037601cf312f65c6721e5bd68d62aed8a018a335cca192fd4d3a0619d6b71fdf19bcecab9587209fa
+  metadata.gz: a00092c93cc8076bf41d2a43a198f16be217ef251f74586387f92303e2db9baf0db8008f09271a7f086788578368dec2a881429136caf0d9c71d4fc2ff00be22
+  data.tar.gz: b79f9e1625c27bd2c3f2c6c33b8092dcd0c1fb8c29a4e0f950619d0484d20d7fa175398e5d9e67cc6e8e7c268f137715e3c7e04e1c5c1e323c45d436a084eb4c

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

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

data/README.md

@@ -1,6 +1,6 @@
 # download_tv
 
-[![Build Status](https://travis-ci.org/guille/download_tv.svg?branch=master)](https://travis-ci.org/guille/download_tv)
+![Build Status](https://github.com/guille/download_tv/actions/workflows/ruby.yml/badge.svg)
 [![Gem Version](https://badge.fury.io/rb/download_tv.svg)](https://badge.fury.io/rb/download_tv)
 [![Code Climate](https://codeclimate.com/github/guille/download_tv.svg)](https://codeclimate.com/github/guille/download_tv)
 
@@ -21,18 +21,19 @@ Specific options:
     -o, --offset OFFSET              Move back the last run offset
     -f, --file PATH                  Download shows from a file
     -d, --download SHOW              Downloads given show
+    -s, --season SEASON              Limit the show download to a specific season
+    -t, --tomorrow                   Download shows airing today
     -c, --configure                  Configures defaults
         --show-config                Show current configuration values
         --dry-run                    Don't write to the date file
     -a, --[no-]auto                  Automatically find links
-    -s, --[no-]subtitles             Download subtitles
     -g, --grabber GRABBER            Use given grabber as first option
         --show-grabbers              List available grabbers
     -p, --pending                    Show list of pending downloads
         --clear-pending              Clear list of pending downloads
-    -v                               Print version
+    -q, --queue SHOW                 Add show episode to pending downloads list
+    -v, --version                    Print version
     -h, --help                       Show this message
-
 ```
 
 ### MyEpisodes integration
@@ -41,11 +42,13 @@ By default, download_tv connects to your MyEpisodes.com account and fetches the
 
 The -o flag can be used in order to re-download the episodes from previous days. The --dry-run option is useful to prevent download_tv from updating the date (for example, when running the application shortly after an episode airs).
 
+Starting in version 2.5.4, download_tv includes the --tomorrow flag. By default, an execution of download_tv will download shows airing from the last execution of the program up to a day prior to the current day. Use this flag to include shows airing today in this search. This can be useful depending on your timezone or on the airtime of the shows you follow.
+
 **Note**: Due to API limitations, the gem won't find shows aired more than 14 days prior to the execution of the script.
 
 The options -c and --show-config allow the user to change or view the current configuration values, respectively. These options include your myepisodes username, whether to save cookies or ask for password on each run and the list of ignored shows among other things. The configuration files are (mostly) backwards compatible. The gem will force you to change your configuration after an update if there are breaking changes in it.
 
-The `auto` flag toggles whether all the results for each show are prompted to the user for him to choose or if the application should try to choose the download link automatically (by default, prioritizes PROPER/REPACK releases at 480p).
+The `auto` flag toggles whether all the results for each show are prompted to the user for him to choose or if the application should try to choose the download link automatically (see Section Filters).
 
 ### Single torrent download
 
@@ -53,6 +56,8 @@ In order to download a single episode, use the -d flag, quoting the string when
 
 Although it uses some settings and grabbers specific for TV shows, this option can also be used as a quick way to find and download any torrent.
 
+It can be used with the --season flag to try to find and download a whole season of the given show: *tv -d "Breaking Bad" --season 4*. It will start searching from episode 1 and continue until it can't find any torrent for the episode.
+
 ### Multi torrent download
 
 The -f flag can be used to read the list of episodes to download from a file. Each line of the file is interpreted as a episode to download: *tv -f /path/to/listofeps*
@@ -65,8 +70,18 @@ I usually publish a patch update to the gem when I detect one of them isn't work
 
 ### Pending shows
 
-download_tv version 2.5.0 persists the list of shows it can't find on a given execution (when connecting to MyEpisodes, not for single show or file downloads). This list can be viewed by passing the -p flag to the tv binary. The list can be cleared with the --clear-pending option.
+download_tv version 2.5.0 persists the list of shows it can't find on a given execution (when connecting to MyEpisodes, not for single show or file downloads) and it will try to find them again on following executions. This list can be viewed by passing the -p flag to the tv binary. The list can be cleared with the --clear-pending option.
+
+Version 2.6.0 adds functionality to queue an episode by running `tv --queue "show name"`. The --queue parameter cannot be used in conjunction with any other parameters. On the plus side, it doesn't need the show name to be quoted or the spaces escaped.
+
+### Filters
+
+download_tv version 2.5.5 adds the possibility of setting include/exclude filters for the automatic download of shows.
+
+Up until that version, the filters by default were excluding 1080p or 720p, as well as including PROPER or REPACK releases when available. From that version onwards, the user can specify in their configuration (`tv -c`) a list of words to include or exclude from their results.
+
+Please keep in mind that this is not a hard filter. The application will apply as many user-defined filters as possible **while still returning at least one result**.
 
 ### License
 
-This project is released under the terms of the MIT license. See [LICENSE.md](https://github.com/guille/download_tv/blob/master/LICENSE.md) file for details.
+This project is released under the terms of the MIT license. See [LICENSE.md](https://github.com/guille/download_tv/blob/master/LICENSE.md) file for details.

data/bin/tv

@@ -30,6 +30,15 @@ opt_parser = OptionParser.new do |opts|
     options[:arg] = s
   end
 
+  opts.on('-s', '--season SEASON', 'Limit the show download to a specific season') do |s|
+    options[:cmd] = 'dl'
+    options[:season] = s
+  end
+
+  opts.on('-t', '--tomorrow', 'Download shows airing today') do |s|
+    options[:cmd] = 'tomorrow'
+  end
+
   opts.on('-c', '--configure', 'Configures defaults') do
     options[:cmd] = 'config'
   end
@@ -46,10 +55,6 @@ opt_parser = OptionParser.new do |opts|
     config[:auto] = n
   end
 
-  opts.on('-s', '--[no-]subtitles', 'Download subtitles') do |n|
-    config[:subs] = n
-  end
-
   opts.on('-g', '--grabber GRABBER', 'Use given grabber as first option') do |g|
     config[:grabber] = g
   end
@@ -67,6 +72,11 @@ opt_parser = OptionParser.new do |opts|
     options[:cmd] = 'clearpending'
   end
 
+  opts.on('-q', '--queue SHOW', 'Add show episode to pending downloads list') do |s|
+    options[:cmd] = 'queue'
+    options[:arg] = s
+  end
+
   opts.on('-v', '--version', 'Print version') do
     puts DownloadTV::VERSION
     exit
@@ -78,7 +88,13 @@ opt_parser = OptionParser.new do |opts|
   end
 end
 
-opt_parser.parse!(ARGV)
+begin
+  opt_parser.parse!(ARGV)
+rescue OptionParser::InvalidOption => e
+  warn e.message
+  puts opt_parser.help
+  exit 1
+end
 
 begin
   case options[:cmd]
@@ -86,11 +102,18 @@ begin
     dl = DownloadTV::Downloader.new(config)
     dl.run(options[:dry], options[:offset].abs)
   when 'dl'
-    dl = DownloadTV::Downloader.new(config)
-    dl.download_single_show(options[:arg])
+    if options[:arg]
+      dl = DownloadTV::Downloader.new(config)
+      dl.download_single_show(options[:arg], options[:season])
+    else
+      warn 'You must use the season option with the -d option'
+    end
   when 'file'
     dl = DownloadTV::Downloader.new(config)
     dl.download_from_file(options[:arg])
+  when 'tomorrow'
+    dl = DownloadTV::Downloader.new(config)
+    dl.run(options[:dry], options[:offset].abs, include_tomorrow: true)
   when 'config'
     DownloadTV::Configuration.new(config, true)
   when 'showconfig'
@@ -99,6 +122,8 @@ begin
     DownloadTV::Configuration.new(config).print_attr(:pending)
   when 'clearpending'
     DownloadTV::Configuration.new(config).clear_pending
+  when 'queue'
+    DownloadTV::Configuration.new(config).queue_pending(options[:arg])
   end
 rescue Interrupt
   puts 'Interrupt signal detected. Exiting...'

data/download_tv.gemspec

@@ -22,9 +22,11 @@ Gem::Specification.new do |s|
 
   s.executables = ['tv']
 
-  s.add_development_dependency 'bundler', '~> 1.15'
+  s.add_development_dependency 'bundler', '~> 2.0'
   s.add_development_dependency 'minitest', '~> 5.0'
-  s.add_development_dependency 'rake', '~> 10.0'
+  s.add_development_dependency "rake", ">= 12.3.3"
+  s.add_development_dependency 'pry', '~> 0.13'
+  s.add_development_dependency 'byebug', '~> 11.1'
 
   s.add_dependency('json')
   s.add_dependency('mechanize')

data/lib/download_tv.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'set'
 require 'json'
 require 'mechanize'
 require 'date'
@@ -10,6 +11,7 @@ require 'download_tv/version'
 require 'download_tv/configuration'
 require 'download_tv/downloader'
 require 'download_tv/torrent'
+require 'download_tv/filterer'
 require 'download_tv/myepisodes'
 require 'download_tv/linkgrabber'
 require 'download_tv/subtitles'
@@ -22,4 +24,4 @@ module DownloadTV
   class NoSubtitlesError < StandardError; end
 end
 
-Dir[File.join(__dir__, 'download_tv', 'grabbers', '*.rb')].each { |file| require file }
+Dir[File.join(__dir__, 'download_tv', 'grabbers', '*.rb')].sort.each { |file| require file }

data/lib/download_tv/configuration.rb

@@ -25,7 +25,8 @@ module DownloadTV
       prompt_for_myep_user
       prompt_for_cookie
       prompt_for_ignored
-      STDOUT.flush
+      prompt_for_filters
+      $stdout.flush
 
       set_default_values
       serialize
@@ -37,12 +38,13 @@ module DownloadTV
       else
         print 'Enter your MyEpisodes username: '
       end
-      @content[:myepisodes_user] = STDIN.gets.chomp
+      input = $stdin.gets.chomp
+      @content[:myepisodes_user] = input if input
     end
 
     def prompt_for_cookie
       print 'Save cookie? (y)/n: '
-      @content[:cookie] = !(STDIN.gets.chomp.casecmp? 'n')
+      @content[:cookie] = !($stdin.gets.chomp.casecmp? 'n')
     end
 
     def prompt_for_ignored
@@ -52,11 +54,40 @@ module DownloadTV
         puts 'Enter a comma-separated list of shows to ignore: '
       end
 
-      @content[:ignored] = STDIN.gets
-                                .chomp
-                                .split(',')
-                                .map(&:strip)
-                                .map(&:downcase)
+      @content[:ignored] = $stdin.gets
+                                 .chomp
+                                 .split(',')
+                                 .map(&:strip)
+                                 .map(&:downcase)
+    end
+
+    def prompt_for_filters
+      puts "Current filters: (#{@content[:filters]})" if @content[:filters]
+
+      @content[:filters] = {}
+
+      puts 'Enter a comma-separated list of terms to include: '
+
+      @content[:filters][:includes] = $stdin.gets
+                                            .chomp
+                                            .split(',')
+                                            .map(&:strip)
+                                            .map(&:upcase)
+
+      puts 'Enter a comma-separated list of terms to exclude: '
+
+      @content[:filters][:excludes] = $stdin.gets
+                                            .chomp
+                                            .split(',')
+                                            .map(&:strip)
+                                            .map(&:upcase)
+    end
+
+    def default_filters
+      {
+        'includes' => %w[PROPER REPACK],
+        'excludes' => %w[2160P 1080P 720P]
+      }
     end
 
     def set_default_values
@@ -66,11 +97,13 @@ module DownloadTV
       @content[:subs] ||= 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
 
@@ -114,5 +147,10 @@ module DownloadTV
       @content[:pending].clear
       serialize
     end
+
+    def queue_pending(show)
+      @content[:pending] << show
+      serialize
+    end
   end
 end

data/lib/download_tv/downloader.rb

@@ -9,21 +9,32 @@ module DownloadTV
     def initialize(config = {})
       @config = Configuration.new(config) # Load configuration
 
-      @filters = [
-        ->(n) { n.include?('2160p') },
-        ->(n) { n.include?('1080p') },
-        ->(n) { n.include?('720p')  },
-        # ->(n) { n.include?('WEB')   },
-        ->(n) { !n.include?('PROPER') && !n.include?('REPACK') }
-      ]
-
       Thread.abort_on_exception = true
     end
 
-    def download_single_show(show)
+    ##
+    # Tries to download episodes in order for a given season,
+    # until it can't find any
+    def download_entire_season(show, season)
+      season.insert(0, '0') if season.size == 1
+      episode = "#{show} s#{season}e01"
+      loop do
+        link = get_link(t, episode)
+        break if link.empty?
+
+        download(link)
+        episode = episode.next
+      end
+    end
+
+    def download_single_show(show, season = nil)
       t = Torrent.new(@config.content[:grabber])
       show = fix_names([show]).first
-      download(get_link(t, show))
+      if season
+        download_entire_season(show, season)
+      else
+        download(get_link(t, show))
+      end
     end
 
     ##
@@ -41,71 +52,87 @@ module DownloadTV
       end
     end
 
+    ##
+    # Returns the date from which to check shows
+    def date_to_check_from(offset)
+      return @config.content[:date] if offset.zero?
+
+      Date.today - offset
+    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.
-    def run(dont_update_last_run, offset = 0)
+    # The param +dont_update_last_run+ prevents changing the configuration's date value
+    # 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(dont_update_last_run, offset = 0, include_tomorrow: false)
       pending = @config.content[:pending].clone
       @config.content[:pending].clear
       pending ||= []
-      date = check_date(offset)
-      if pending.empty? && date.nil?
-        puts 'Everything up to date'
-        exit
-      end
+      date = date_to_check_from(offset)
 
-      to_download = shows_to_download(date)
-      to_download.concat pending
+      pending.concat shows_to_download(date) if date < Date.today
+      pending.concat today_shows_to_download if include_tomorrow && date < Date.today.next
 
-      if to_download.empty?
+      if pending.empty?
         puts 'Nothing to download'
-
       else
-        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, true) }
-        end
+        find_and_download(pending.uniq)
+        puts 'Completed. Exiting...'
+      end
 
-        # Downloads the links as they are added
-        download_t = Thread.new do
-          to_download.size.times do
-            magnet = queue.pop
-            next if magnet == '' # Doesn't download if no torrents are found
+      unless dont_update_last_run
+        @config.content[:date] = if include_tomorrow
+                                   Date.today.next
+                                 else
+                                   [Date.today, @config.content[:date]].max
+                                 end
+      end
+      @config.serialize
+    rescue InvalidLoginError
+      warn 'Wrong username/password combination'
+    end
 
-            download(magnet)
-          end
-        end
+    def find_and_download(shows)
+      t = Torrent.new
+      queue = Queue.new
 
-        # Downloading the subtitles
-        # subs_t = @config.content[:subs] and Thread.new do
-        #   to_download.each { |show| @s.get_subs(show) }
-        # end
+      # Adds a link (or empty string to the queue)
+      link_t = Thread.new do
+        shows.each { |show| queue << get_link(t, show, save_pending: true) }
+      end
 
-        link_t.join
-        download_t.join
-        # subs_t.join
+      # Downloads the links as they are added
+      download_t = Thread.new do
+        shows.size.times do
+          magnet = queue.pop
+          next if magnet == '' # Doesn't download if no torrents are found
 
-        puts 'Completed. Exiting...'
+          download(magnet)
+        end
       end
 
-      @config.content[:date] = Date.today unless dont_update_last_run
-      @config.serialize
-    rescue InvalidLoginError
-      warn 'Wrong username/password combination'
+      link_t.join
+      download_t.join
     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 = myepisodes.get_shows_since(date)
+      shows = reject_ignored(shows)
+      fix_names(shows)
+    end
+
+    def today_shows_to_download
+      myepisodes = MyEpisodes.new(@config.content[:myepisodes_user],
+                                  @config.content[:cookie])
+      myepisodes.load_cookie
+      shows = myepisodes.today_shows
       shows = reject_ignored(shows)
       fix_names(shows)
     end
@@ -116,7 +143,7 @@ module DownloadTV
     # 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(torrent, show, save_pending = false)
+    def get_link(torrent, show, save_pending: false)
       links = torrent.get_links(show)
 
       if links.empty?
@@ -151,15 +178,6 @@ module DownloadTV
       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]
-      last -= offset
-      last if last != Date.today
-    end
-
     ##
     # Given a list of shows and episodes:
     #
@@ -181,24 +199,16 @@ module DownloadTV
     end
 
     ##
-    # 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
+    # Removes links whose names don't match the user filters
+    # Runs until no filters are left to be applied or applying
+    # a filter would leave no results
     def filter_shows(links)
-      @filters.each do |f| # Apply each filter
-        new_links = links.reject { |name, _link| f.call(name) }
-        # Stop if the filter removes every release
-        break if new_links.empty?
-
-        links = new_links
-      end
-
-      links
+      f = Filterer.new(@config.content[:filters])
+      f.filter(links)
     end
 
     ##
     # Spawns a silent process to download a given magnet link
-    # Uses xdg-open (not portable)
     def download(link)
       @cmd ||= detect_os
 

data/lib/download_tv/filterer.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+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
+    def filter(shows)
+      # shows is tuple (show name, link)
+      @filters.each do |f|
+        new_shows = shows.reject { |name, _link| f.call(name) }
+        # Go to next filter if the filter removes every release
+        next if new_shows.empty?
+
+        shows = new_shows
+      end
+
+      shows
+    end
+  end
+end

data/lib/download_tv/grabbers/eztv.rb

@@ -12,20 +12,23 @@ module DownloadTV
       # Format the url
       search = format(@url, show)
 
-      data = @agent.get(search).search('a.magnet')
+      raw_data = @agent.get(search)
+      raw_links = raw_data.search('a.magnet')
+      raw_seeders = raw_data.search('td.forum_thread_post_end').map { |e| e.children[0].text.to_i }
+      raw_links = raw_links.sort_by.with_index { |_, index| raw_seeders[index] }.reverse
 
-      # Torrent name in data[i].attribute 'title'
+      # Torrent name in raw_links[i].attribute 'title'
       # 'Suits S04E01 HDTV x264-LOL Torrent: Magnet Link'
 
       # EZTV shows 50 latest releases if it can't find the torrent
-      raise NoTorrentsError if data.size == 50
+      raise NoTorrentsError if raw_links.size == 50
 
-      names = data.collect do |i|
+      names = raw_links.collect do |i|
         i.attribute('title')
          .text
          .chomp(' Magnet Link')
       end
-      links = data.collect do |i|
+      links = raw_links.collect do |i|
         i.attribute('href')
          .text
       end

data/lib/download_tv/grabbers/torrentapi.rb

@@ -21,13 +21,15 @@ module DownloadTV
       @agent.read_timeout = 2
       renew_token
       true
-    rescue Mechanize::ResponseCodeError, Net::HTTP::Persistent::Error => e
+    rescue Mechanize::ResponseCodeError => e
       if e.response_code == '429'
         sleep(@wait)
         retry
       else
         false
       end
+    rescue Net::HTTP::Persistent::Error => e
+      false
     end
 
     ##

data/lib/download_tv/linkgrabber.rb

@@ -21,7 +21,7 @@ module DownloadTV
             end
       @agent.head(url)
       true
-    rescue Mechanize::ResponseCodeError, Net::HTTP::Persistent::Error
+    rescue Mechanize::ResponseCodeError, Net::HTTP::Persistent::Error, Errno::ECONNRESET
       false
     end
 

data/lib/download_tv/myepisodes.rb

@@ -32,11 +32,11 @@ module DownloadTV
     def prompt_user_data
       if !@user || @user == ''
         print 'Enter your MyEpisodes username: '
-        @user = STDIN.gets.chomp
+        @user = $stdin.gets.chomp
       end
 
       print 'Enter your MyEpisodes password: '
-      pass = STDIN.noecho(&:gets).chomp
+      pass = $stdin.noecho(&:gets).chomp
       puts
       pass
     end
@@ -64,17 +64,20 @@ module DownloadTV
       @agent
     end
 
-    def get_shows(last)
-      return [] if last.nil?
-
+    def get_shows_since(last)
       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)
+      build_show_strings(shows)
+    end
 
+    def today_shows
+      page = @agent.get 'https://www.myepisodes.com/ajax/service.php?mode=view_privatelist'
+      shows = page.parser.css('tr.today')
       build_show_strings(shows)
     end
 
+    # Only keep the shows that have aired since the given date
     def filter_newer_shows(shows, date)
       shows.select do |i|
         airdate = i.css('td.date')[0].text

data/lib/download_tv/torrent.rb

@@ -8,7 +8,7 @@ module DownloadTV
 
     def grabbers
       # %w[TorrentAPI ThePirateBay Eztv KAT]
-      %w[TorrentAPI ThePirateBay Eztv]
+      %w[TorrentAPI Eztv]
     end
 
     def initialize(default_grabber = nil)

data/lib/download_tv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DownloadTV
-  VERSION = '2.5.3'
+  VERSION = '2.6.2'
 end

data/test/config_test.rb

@@ -18,28 +18,28 @@ describe DownloadTV::Configuration do
       create_dummy_config(config_path)
 
       c = DownloadTV::Configuration.new(path: config_path)
-      c.content.must_equal(path: config_path, version: DownloadTV::VERSION)
+      _(c.content).must_equal(path: config_path, version: DownloadTV::VERSION)
     end
 
     it 'will load the existing configuration (existing)' do
       create_dummy_config(config_path, auto: false, myepisodes_user: 'dummy')
 
       c = DownloadTV::Configuration.new(path: config_path)
-      c.content.must_equal(path: config_path, auto: false, myepisodes_user: 'dummy', version: DownloadTV::VERSION)
+      _(c.content).must_equal(path: config_path, auto: false, myepisodes_user: 'dummy', version: DownloadTV::VERSION)
     end
 
     it 'will get overwritten by the parameters given' do
       create_dummy_config(config_path, myepisodes_user: 'dummy')
 
       c = DownloadTV::Configuration.new(path: config_path, myepisodes_user: 'fake')
-      c.content.must_equal(path: config_path, myepisodes_user: 'fake', version: DownloadTV::VERSION)
+      _(c.content).must_equal(path: config_path, myepisodes_user: 'fake', version: DownloadTV::VERSION)
     end
 
     it 'will downcase ignored shows' do
       create_dummy_config(config_path, ignored: %w[duMMy String])
 
       c = DownloadTV::Configuration.new(path: config_path)
-      c.content[:ignored].must_equal %w[dummy string]
+      _(c.content[:ignored]).must_equal %w[dummy string]
     end
   end
 
@@ -48,7 +48,7 @@ describe DownloadTV::Configuration do
       create_dummy_config(config_path)
 
       c = DownloadTV::Configuration.new(path: config_path)
-      c.breaking_changes?(DownloadTV::VERSION).must_be_nil
+      _(c.breaking_changes?(DownloadTV::VERSION)).must_be_nil
     end
 
     it "returns true when there's been a major update" do
@@ -58,7 +58,7 @@ describe DownloadTV::Configuration do
       split[0] = (split[0].to_i - 1).to_s
       new_version = split.join('.')
       c = DownloadTV::Configuration.new(path: config_path)
-      c.breaking_changes?(new_version).must_equal true
+      _(c.breaking_changes?(new_version)).must_equal true
     end
 
     it "returns true when there's been a minor update" do
@@ -68,7 +68,7 @@ describe DownloadTV::Configuration do
       split[1] = (split[1].to_i - 1).to_s
       new_version = split.join('.')
       c = DownloadTV::Configuration.new(path: config_path)
-      c.breaking_changes?(new_version).must_equal true
+      _(c.breaking_changes?(new_version)).must_equal true
     end
 
     it "returns false when it's a small patch" do
@@ -78,7 +78,7 @@ describe DownloadTV::Configuration do
       split[2] = (split[2].to_i - 1).to_s
       new_version = split.join('.')
       c = DownloadTV::Configuration.new(path: config_path)
-      c.breaking_changes?(new_version).must_equal false
+      _(c.breaking_changes?(new_version)).must_equal false
     end
   end
 
@@ -90,7 +90,7 @@ describe DownloadTV::Configuration do
         end
       end
 
-      File.exist?(config_path).must_equal true
+      _(File.exist?(config_path)).must_equal true
     end
 
     it 'will have the right values' do
@@ -101,15 +101,15 @@ describe DownloadTV::Configuration do
         end
       end
 
-      c.content[:myepisodes_user].must_equal 'anything'
-      c.content[:cookie].must_equal true
-      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
+      _(c.content[:myepisodes_user]).must_equal 'anything'
+      _(c.content[:cookie]).must_equal true
+      _(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
     end
 
     it 'will set the cookie value to false when explicitly told so' do
@@ -120,7 +120,7 @@ describe DownloadTV::Configuration do
         end
       end
 
-      c.content[:cookie].must_equal false
+      _(c.content[:cookie]).must_equal false
     end
 
     it 'will separate the ignored values by commas' do
@@ -130,7 +130,7 @@ describe DownloadTV::Configuration do
           c = DownloadTV::Configuration.new(path: config_path)
         end
       end
-      c.content[:ignored].must_equal ['ignored1', 'itsgone', 'ignored 2']
+      _(c.content[:ignored]).must_equal ['ignored1', 'itsgone', 'ignored 2']
     end
   end
 
@@ -147,22 +147,22 @@ describe DownloadTV::Configuration do
       content = JSON.parse(source, symbolize_names: true)
       content[:date] = Date.parse(content[:date])
 
-      content[:cookie].must_equal true
-      content[:myepisodes_user].must_equal 'anything'
-      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
+      _(content[:cookie]).must_equal true
+      _(content[:myepisodes_user]).must_equal 'anything'
+      _(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
     end
   end
 
   describe 'the constructor' do
     it 'will trigger a configuration change when asked to' do
       create_dummy_config(config_path, auto: false)
-      File.exist?(config_path).must_equal true
+      _(File.exist?(config_path)).must_equal true
       c = nil
 
       run_silently do
@@ -171,7 +171,7 @@ describe DownloadTV::Configuration do
         end
       end
 
-      c.content[:auto].must_equal false
+      _(c.content[:auto]).must_equal false
     end
   end
 end

data/test/downloader_test.rb

@@ -17,8 +17,8 @@ describe DownloadTV::Downloader do
   describe 'when creating the object' do
     it 'can receive an optional configuration hash' do
       dl = DownloadTV::Downloader.new(auto: true, grabber: 'KAT', path: config_path)
-      dl.config.content[:auto].must_equal true
-      dl.config.content[:grabber].must_equal 'KAT'
+      _(dl.config.content[:auto]).must_equal true
+      _(dl.config.content[:grabber]).must_equal 'KAT'
     end
   end
 
@@ -30,7 +30,7 @@ describe DownloadTV::Downloader do
                 'Baz The Story S05E22']
 
       dl = DownloadTV::Downloader.new(ignored: [], path: config_path)
-      dl.fix_names(shows).must_equal result
+      _(dl.fix_names(shows)).must_equal result
     end
   end
 
@@ -40,14 +40,14 @@ describe DownloadTV::Downloader do
       result = ['Bar S00E22']
 
       dl = DownloadTV::Downloader.new(ignored: ['ignored'], path: config_path)
-      dl.reject_ignored(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)
-      dl.check_date(0).must_be_nil
+      _(dl.check_date(0)).must_be_nil
     end
 
     it 'uses the offset to adjust the date' do
@@ -56,46 +56,35 @@ describe DownloadTV::Downloader do
 
       date = dl.check_date(1)
 
-      date.must_equal(Date.today - 1)
-      dl.config.content[:date].must_equal Date.today
+      _(date).must_equal(Date.today - 1)
+      _(dl.config.content[:date]).must_equal Date.today
     end
   end
 
   describe 'the filter_shows method' do
-    it 'removes names with 2160p in them' do
-      dl = DownloadTV::Downloader.new(path: config_path)
+    it 'removes names with exclude words in them' do
+      f = {:excludes => ["2160P"], :includes => []}
+      dl = DownloadTV::Downloader.new(path: config_path, filters: f)
       links = [['Link 1', ''], ['Link 2 2160p', ''], ['Link 3', '']]
       res = [['Link 1', ''], ['Link 3', '']]
-      dl.filter_shows(links).must_equal res
+      _(dl.filter_shows(links)).must_equal res
     end
 
-    it 'removes names with 1080p in them' do
-      dl = DownloadTV::Downloader.new(path: config_path)
-      links = [['Link.1080p', ''], ['Link 2 2160p', ''], ['Link 3', '']]
-      res = [['Link 3', '']]
-      dl.filter_shows(links).must_equal res
-    end
-
-    it 'removes names with 720p in them' do
-      dl = DownloadTV::Downloader.new(path: config_path)
-      links = [['Link 1', ''], ['Link 2 720p', ''], ['Link.720p.rip', '']]
-      res = [['Link 1', '']]
-      dl.filter_shows(links).must_equal res
-    end
-
-    it 'removes names without PROPER or REPACK in them' do
-      dl = DownloadTV::Downloader.new(path: config_path)
+    it 'removes names without include words in them' do
+      f = {:excludes => [], :includes => %w[REPACK]}
+      dl = DownloadTV::Downloader.new(path: config_path, filters: f)
       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
+               ['Link REPACK 5', '']]
+      res = [['Link REPACK 5', '']]
+      _(dl.filter_shows(links)).must_equal res
     end
 
     it "doesn't apply a filter if it would reject every option" do
-      dl = DownloadTV::Downloader.new(path: config_path)
+      f = {:excludes => %w[2160P 720P], :includes => []}
+      dl = DownloadTV::Downloader.new(path: config_path, filters: f)
       links = [['Link 1 720p', ''], ['Link 2 2160p', ''], ['Link 720p 3', '']]
       res = [['Link 1 720p', ''], ['Link 720p 3', '']]
-      dl.filter_shows(links).must_equal res
+      _(dl.filter_shows(links)).must_equal res
     end
   end
 
@@ -106,13 +95,13 @@ describe DownloadTV::Downloader do
 
       t.expect(:get_links, [], [show])
       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]
+      _(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, pending: [])
-      dl.get_link(t, show, true).must_equal ''
-      dl.config.content[:pending].must_include show
+      _(dl.get_link(t, show, true)).must_equal ''
+      _(dl.config.content[:pending]).must_include show
 
       t.verify
     end
@@ -123,7 +112,7 @@ describe DownloadTV::Downloader do
 
       t.expect(:get_links, [['Name 1', 'Link 1'], ['Name 2', 'Link 2']], [show])
       dl = DownloadTV::Downloader.new(auto: true, path: config_path)
-      dl.get_link(t, show).must_equal 'Link 1'
+      _(dl.get_link(t, show)).must_equal 'Link 1'
       t.verify
     end
   end
@@ -134,7 +123,7 @@ describe DownloadTV::Downloader do
       RbConfig::CONFIG['host_os'] = 'linux-gnu'
 
       dl = DownloadTV::Downloader.new(path: config_path)
-      dl.detect_os.must_equal 'xdg-open'
+      _(dl.detect_os).must_equal 'xdg-open'
 
       RbConfig::CONFIG['host_os'] = prev
     end
@@ -144,7 +133,7 @@ describe DownloadTV::Downloader do
       RbConfig::CONFIG['host_os'] = 'darwin15.6.0'
 
       dl = DownloadTV::Downloader.new(path: config_path)
-      dl.detect_os.must_equal 'open'
+      _(dl.detect_os).must_equal 'open'
 
       RbConfig::CONFIG['host_os'] = prev
     end
@@ -155,8 +144,8 @@ describe DownloadTV::Downloader do
 
       dl = DownloadTV::Downloader.new(path: config_path)
 
-      to_run = -> { run_silently { dl.detect_os.must_equal 'xdg-open' } }
-      to_run.must_raise SystemExit
+      to_run = -> { run_silently { _(dl.detect_os).must_equal 'xdg-open' } }
+      _(to_run).must_raise SystemExit
 
       RbConfig::CONFIG['host_os'] = prev
     end

data/test/grabbers_test.rb

@@ -11,30 +11,30 @@ describe DownloadTV::LinkGrabber do
       next unless grabber.online?
 
       it 'will have a url attribute on creation' do
-        grabber.url.wont_be_nil
+        _(grabber.url).wont_be_nil
       end
 
       it "will raise NoTorrentsError when torrent can't be found" do
         notfound = -> { grabber.get_links('Totally Fake Show askjdgsaudas') }
-        notfound.must_raise DownloadTV::NoTorrentsError
+        _(notfound).must_raise DownloadTV::NoTorrentsError
       end
 
       it 'will return an array with names and links of results when a torrent can be found' do
-        result = grabber.get_links('Game Of Thrones S04E01')
-        result.must_be_instance_of Array
-        result.wont_be :empty?
+        result = grabber.get_links('The Boys S01E01')
+        _(result).must_be_instance_of Array
+        _(result).wont_be :empty?
         result.each do |r|
-          r.size.must_equal 2
-          r[0].must_be_instance_of String
-          r[0].upcase.must_include 'THRONES'
-          r[1].must_be_instance_of String
-          r[1].must_include 'magnet:'
+          _(r.size).must_equal 2
+          _(r[0]).must_be_instance_of String
+          _(r[0].upcase).must_include 'BOYS'
+          _(r[1]).must_be_instance_of String
+          _(r[1]).must_include 'magnet:'
         end
       end
     end
   end
 
   it "raises an error if the instance doesn't implement get_links" do
-    -> { DownloadTV::LinkGrabber.new('').get_links('test') }.must_raise NotImplementedError
+    _(-> { DownloadTV::LinkGrabber.new('').get_links('test') }).must_raise NotImplementedError
   end
 end

data/test/torrent_test.rb

@@ -10,16 +10,16 @@ describe DownloadTV::Torrent do
     end
 
     it 'will populate the instances' do
-      @t.g_instances.size.must_equal grabber_names.size
+      _(@t.g_instances.size).must_equal grabber_names.size
     end
 
     it 'will start with all tries available' do
-      @t.tries.must_equal grabber_names.size - 1
+      _(@t.tries).must_equal grabber_names.size - 1
     end
 
     it 'will call get_links on its grabber' do
       @t.g_instances.first.stub :get_links, %w[test result] do
-        @t.get_links('test show').must_equal %w[test result]
+        _(@t.get_links('test show')).must_equal %w[test result]
       end
     end
   end
@@ -28,13 +28,13 @@ describe DownloadTV::Torrent 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
+      _(t.g_instances.map { |i| i.class.name }).must_equal expected
     end
 
     grabber_names.each do |g|
       it 'correctly uses the given grabber first' do
         t = DownloadTV::Torrent.new(g)
-        t.g_instances.first.class.name.must_equal "DownloadTV::#{g}"
+        _(t.g_instances.first.class.name).must_equal "DownloadTV::#{g}"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.6.2
 platform: ruby
 authors:
 - guille
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -40,18 +40,46 @@ dependencies:
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - guillerg96@gmail.com
 executables:
@@ -88,6 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -99,6 +128,7 @@ files:
 - lib/download_tv.rb
 - lib/download_tv/configuration.rb
 - lib/download_tv/downloader.rb
+- lib/download_tv/filterer.rb
 - lib/download_tv/grabbers/addic7ed.rb
 - lib/download_tv/grabbers/eztv.rb
 - lib/download_tv/grabbers/kat.rb
@@ -118,7 +148,7 @@ homepage: https://github.com/guille/download_tv
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,9 +163,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.17
+signing_key:
 specification_version: 4
 summary: DownloadTV is a tool that allows the user to find magnet links for tv show
   episodes. It accepts shows as arguments, from a file or it can integrate with your