download_tv 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ab8410da063b896958e54d0a18e2fdc19b4ed9b45919fc714f536444041bc3e
-  data.tar.gz: 8435e14058dedd5e269d7819e301936c1a636619acb7a506f66cc944b1055fbf
+  metadata.gz: 29c9837fef84c38a41063a8526525e12ce56c82bd8c8467289401dd8ae5453ba
+  data.tar.gz: c448ce24115b3cb19dcc128c56a47cdee61d072994dafcfe5ab3d53b5d799109
 SHA512:
-  metadata.gz: 90bb2c2d281914071bf70097f771c0bc1dec85a3a8054907edb3c1f05b4aef915e813f55b38aa2825cb8ad7835830c9beb127d183e441c37fa7c140ee3cc83f4
-  data.tar.gz: d8ac37531a40b571fe5dcfe4f73c316860c39034befb8f05b67cdaf3a05c060447fe2b09f717ff28236c2d9ef12f54986cb0a30425b0f0da385f99e6af478172
+  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/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,17 @@ 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
-        --season SEASON              Limit the show download to a specific season
+    -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
-    -q, --queue                      Add show episode to pending downloads list
+    -q, --queue SHOW                 Add show episode to pending downloads list
     -v, --version                    Print version
     -h, --help                       Show this message
 ```

data/bin/tv

@@ -30,7 +30,7 @@ opt_parser = OptionParser.new do |opts|
     options[:arg] = s
   end
 
-  opts.on('--season SEASON', 'Limit the show download to a specific season') do |s|
+  opts.on('-s', '--season SEASON', 'Limit the show download to a specific season') do |s|
     options[:cmd] = 'dl'
     options[:season] = s
   end
@@ -55,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
@@ -117,7 +113,7 @@ begin
     dl.download_from_file(options[:arg])
   when 'tomorrow'
     dl = DownloadTV::Downloader.new(config)
-    dl.run_ahead(options[:dry])
+    dl.run(options[:dry], options[:offset].abs, include_tomorrow: true)
   when 'config'
     DownloadTV::Configuration.new(config, true)
   when 'showconfig'

data/lib/download_tv/configuration.rb

@@ -26,7 +26,7 @@ module DownloadTV
       prompt_for_cookie
       prompt_for_ignored
       prompt_for_filters
-      STDOUT.flush
+      $stdout.flush
 
       set_default_values
       serialize
@@ -38,13 +38,13 @@ module DownloadTV
       else
         print 'Enter your MyEpisodes username: '
       end
-      input = 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
@@ -54,11 +54,11 @@ 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
@@ -68,19 +68,19 @@ module DownloadTV
 
       puts 'Enter a comma-separated list of terms to include: '
 
-      @content[:filters][:includes] = STDIN.gets
-                                           .chomp
-                                           .split(',')
-                                           .map(&:strip)
-                                           .map(&:upcase)
+      @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)
+      @content[:filters][:excludes] = $stdin.gets
+                                            .chomp
+                                            .split(',')
+                                            .map(&:strip)
+                                            .map(&:upcase)
     end
 
     def default_filters

data/lib/download_tv/downloader.rb

@@ -12,19 +12,26 @@ module DownloadTV
       Thread.abort_on_exception = true
     end
 
+    ##
+    # 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
       if 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
+        download_entire_season(show, season)
       else
         download(get_link(t, show))
       end
@@ -45,58 +52,45 @@ 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)
+      date = date_to_check_from(offset)
 
-      pending.concat shows_to_download(date) if date
+      pending.concat shows_to_download(date) if date < Date.today
+      pending.concat today_shows_to_download if include_tomorrow && date < Date.today.next
 
       if pending.empty?
         puts 'Nothing to download'
       else
-        find_and_download(pending)
+        find_and_download(pending.uniq)
         puts 'Completed. Exiting...'
       end
 
-      @config.content[:date] = [Date.today, @config.content[:date]].max unless dont_update_last_run
-      @config.serialize
-    rescue InvalidLoginError
-      warn 'Wrong username/password combination'
-    end
-
-    ##
-    # Finds download links for all the episodes set to air today.
-    # TODO: Refactor with #run()
-    def run_ahead(dont_update_last_run)
-      pending = @config.content[:pending].clone
-      @config.content[:pending].clear
-      pending ||= []
-
-      # Make normal run first if necessary
-      if @config.content[:date] < Date.today
-        pending.concat shows_to_download(@config.content[:date])
-      end
-
-      # Only do --tomorrow run if it hasn't happened already
-      if @config.content[:date] < Date.today.next
-        pending.concat today_shows_to_download
-      end
-
-      if pending.empty?
-        puts 'Nothing to download'
-      else
-        find_and_download(pending)
-        puts 'Completed. Exiting...'
+      unless dont_update_last_run
+        @config.content[:date] = if include_tomorrow
+                                   Date.today.next
+                                 else
+                                   [Date.today, @config.content[:date]].max
+                                 end
       end
-
-      @config.content[:date] = Date.today.next unless dont_update_last_run
       @config.serialize
     rescue InvalidLoginError
       warn 'Wrong username/password combination'
@@ -108,7 +102,7 @@ module DownloadTV
 
       # Adds a link (or empty string to the queue)
       link_t = Thread.new do
-        shows.each { |show| queue << get_link(t, show, true) }
+        shows.each { |show| queue << get_link(t, show, save_pending: true) }
       end
 
       # Downloads the links as they are added
@@ -121,20 +115,13 @@ module DownloadTV
         end
       end
 
-      # Downloading the subtitles
-      # subs_t = @config.content[:subs] and Thread.new do
-      #   shows.each { |show| @s.get_subs(show) }
-      # end
-
       link_t.join
       download_t.join
-      # subs_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_since(date)
       shows = reject_ignored(shows)
@@ -156,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?
@@ -191,19 +178,6 @@ module DownloadTV
       print 'Select the torrent you want to download [-1 to skip]: '
     end
 
-    ##
-    # Returns the date from which to check shows
-    # or nil if the program was already ran today
-    # Passing an offset skips this check
-    def check_date(offset)
-      if offset.zero?
-        last = @config.content[:date]
-        last if last < Date.today
-      else
-        Date.today - offset
-      end
-    end
-
     ##
     # Given a list of shows and episodes:
     #
@@ -235,7 +209,6 @@ module DownloadTV
 
     ##
     # 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/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

data/lib/download_tv/version.rb

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

data/test/config_test.rb

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - guille
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,6 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -162,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+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