download_tv 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee5a753ef1f164e3be414b4dc72bd25f0ee067aabb50f213da09655e5ec6e3a
-  data.tar.gz: 50ba6c3f7641ac1b36b3b63a1a34528d6d5645f69364416e756e126f951be95e
+  metadata.gz: 14480f4df75d1bd924641e70896710bdbaadbd61e7cdc2988c802f094c5841e1
+  data.tar.gz: cdee66d0f1c699e56b2b48c3376d4654ded93d17d6ea5851acf79e728e1b792e
 SHA512:
-  metadata.gz: 7bbbbcdfd925e8afc3857f4160a4f0dd7d6094163b43421117465fbc38acfe890d9ce27af62d400cdf9018732f6a6868d72f1ea5d796682254dd535ff83b33a6
-  data.tar.gz: c4df241a888c8248c356640e89d45aa1d961aaa00232321037601cf312f65c6721e5bd68d62aed8a018a335cca192fd4d3a0619d6b71fdf19bcecab9587209fa
+  metadata.gz: e65a989bc27f5741d656ea853f660fc50e2c2fd46fcb03794e50afd03f47b698b354d73845b940b03f6809d31cd5bf84108627ebb09410bb76c924cc36964730
+  data.tar.gz: 27afaf52a2aa2c699d7f95333aefcb8c3c622e3c9b2a1e1cce801fb9705f4f5824d9e16a5e6b01585960f9f0f3b4fd464e64e5ecafab2b5ed6e2ed9242e9e897

data/README.md

@@ -21,6 +21,8 @@ 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
+    -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
@@ -30,9 +32,8 @@ Specific options:
         --show-grabbers              List available grabbers
     -p, --pending                    Show list of pending downloads
         --clear-pending              Clear list of pending downloads
-    -v                               Print version
+    -v, --version                    Print version
     -h, --help                       Show this message
-
 ```
 
 ### MyEpisodes integration
@@ -53,6 +54,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,7 +68,7 @@ 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.
 
 ### License
 

data/bin/tv

@@ -30,6 +30,15 @@ opt_parser = OptionParser.new do |opts|
     options[:arg] = s
   end
 
+  opts.on('--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
@@ -86,11 +95,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_ahead(options[:dry])
   when 'config'
     DownloadTV::Configuration.new(config, true)
   when 'showconfig'

data/lib/download_tv.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'set'
 require 'json'
 require 'mechanize'
 require 'date'

data/lib/download_tv/configuration.rb

@@ -71,6 +71,7 @@ module DownloadTV
     end
 
     def serialize
+      @content[:pending] = @content[:pending].uniq
       File.write(@config_path, JSON.generate(@content))
     end
 

data/lib/download_tv/downloader.rb

@@ -20,10 +20,21 @@ module DownloadTV
       Thread.abort_on_exception = true
     end
 
-    def download_single_show(show)
+    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
+        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
+      else
+        download(get_link(t, show))
+      end
     end
 
     ##
@@ -51,61 +62,92 @@ module DownloadTV
       @config.content[:pending].clear
       pending ||= []
       date = check_date(offset)
-      if pending.empty? && date.nil?
-        puts 'Everything up to date'
-        exit
-      end
 
-      to_download = shows_to_download(date)
-      to_download.concat pending
+      pending.concat shows_to_download(date) if date
 
-      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
-
-        # 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
+        find_and_download(pending)
+        puts 'Completed. Exiting...'
+      end
 
-            download(magnet)
-          end
-        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
 
-        # Downloading the subtitles
-        # subs_t = @config.content[:subs] and Thread.new do
-        #   to_download.each { |show| @s.get_subs(show) }
-        # 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 ||= []
 
-        link_t.join
-        download_t.join
-        # subs_t.join
+      # Has the program already been run with --tomorrow
+      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...'
       end
 
-      @config.content[:date] = Date.today unless dont_update_last_run
+      @config.content[:date] = Date.today.next unless dont_update_last_run
       @config.serialize
     rescue InvalidLoginError
       warn 'Wrong username/password combination'
     end
 
+    def find_and_download(shows)
+      t = Torrent.new
+      queue = Queue.new
+
+      # Adds a link (or empty string to the queue)
+      link_t = Thread.new do
+        shows.each { |show| queue << get_link(t, show, true) }
+      end
+
+      # 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
+
+          download(magnet)
+        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(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
@@ -152,12 +194,16 @@ module DownloadTV
     end
 
     ##
-    # Returns the date from which to check for shows
-    # Or nil if the date is today
+    # 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)
-      last = @config.content[:date]
-      last -= offset
-      last if last != Date.today
+      if offset.zero?
+        last = @config.content[:date]
+        last if last < Date.today
+      else
+        Date.today - offset
+      end
     end
 
     ##

data/lib/download_tv/myepisodes.rb

@@ -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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - guille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2019-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler