download_tv 2.6.0 → 2.6.5

data/lib/download_tv/downloader.rb

@@ -12,18 +12,27 @@ 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)
+      t = Torrent.new(@config.content[:grabber])
+      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
@@ -44,96 +53,82 @@ 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
+      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
 
-    ##
-    # 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
+    def find_links(torrent, shows, queue)
+      Thread.new do
+        shows.each { |show| queue << get_link(torrent, show, save_pending: true) }
+        queue.close
       end
+    end
 
-      if pending.empty?
-        puts 'Nothing to download'
-      else
-        find_and_download(pending)
-        puts 'Completed. Exiting...'
+    def download_from_queue(queue)
+      Thread.new do
+        until queue.closed?
+          magnet = queue.pop
+          download(magnet) if magnet # Doesn't download if no torrents are found
+        end
       end
-
-      @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
+      link_t = find_links(t, shows, queue)
 
       # 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
+      download_t = download_from_queue(queue)
 
       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)
@@ -154,18 +149,17 @@ module DownloadTV
     # 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(torrent, show, save_pending = false)
+    # Returns either a magnet link or nil
+    def get_link(torrent, show, save_pending: false)
       links = torrent.get_links(show)
 
       if links.empty?
         @config.content[:pending] << show if save_pending
-        return ''
+        return
       end
 
       if @config.content[:auto]
-        links = filter_shows(links)
-        links.first[1]
+        filter_shows(links).first[1]
       else
         prompt_links(links)
         get_link_from_user(links)
@@ -180,7 +174,7 @@ module DownloadTV
         i = $stdin.gets.chomp.to_i
       end
 
-      i == -1 ? '' : links[i][1]
+      i == -1 ? nil : links[i][1]
     end
 
     def prompt_links(links)
@@ -190,19 +184,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:
     #
@@ -228,13 +209,12 @@ module DownloadTV
     # Runs until no filters are left to be applied or applying
     # a filter would leave no results
     def filter_shows(links)
-      f = Filterer.new(@config.content[:filters])
-      f.filter(links)
+      @filterer ||= Filterer.new(@config.content[:filters])
+      @filterer.filter(links)
     end
 
     ##
     # Spawns a silent process to download a given magnet link
-    # Uses xdg-open (not portable)
     def download(link)
       @cmd ||= detect_os
 
@@ -250,7 +230,7 @@ module DownloadTV
       when /darwin/
         'open'
       else
-        warn "You're using an unsupported platform."
+        warn "You're using an unsupported platform (#{RbConfig::CONFIG['host_os']})."
         exit 1
       end
     end

data/lib/download_tv/grabbers/eztv.rb

@@ -9,28 +9,17 @@ module DownloadTV
     end
 
     def get_links(show)
-      # Format the url
-      search = format(@url, show)
-
-      data = @agent.get(search).search('a.magnet')
-
-      # Torrent name in data[i].attribute 'title'
-      # 'Suits S04E01 HDTV x264-LOL Torrent: Magnet Link'
+      raw_data = @agent.get(format(@url, show))
+      raw_seeders = raw_data.search('td.forum_thread_post_end').map { |e| e.children[0].text.to_i }
+      raw_links = raw_data.search('a.magnet').sort_by.with_index { |_, index| raw_seeders[index] }.reverse
 
       # 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|
-        i.attribute('title')
-         .text
-         .chomp(' Magnet Link')
+      raw_links.collect do |i|
+        [i.attribute('title').text.chomp(' Magnet Link'),
+         i.attribute('href').text]
       end
-      links = data.collect do |i|
-        i.attribute('href')
-         .text
-      end
-
-      names.zip(links)
     end
   end
 end

data/lib/download_tv/grabbers/torrentapi.rb

@@ -5,29 +5,30 @@ module DownloadTV
   # TorrentAPI.org grabber
   # Interfaces with http://torrentapi.org/apidocs_v2.txt
   class TorrentAPI < LinkGrabber
-    attr_accessor :token
-    attr_reader :wait
+    TOKEN_EXPIRED_ERROR = 4
+    TOO_MANY_REQUESTS_ERROR = 5 # 1req/2s
 
     def initialize
       super('https://torrentapi.org/pubapi_v2.php?'\
             'mode=search&search_string=%s&token=%s&'\
             'app_id=DownloadTV&sort=seeders')
-      @wait = 0.1
+      @wait = 0.5
+      @token = nil
     end
 
     ##
     # Specific implementation for TorrentAPI (requires token)
     def online?
-      @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
+      false
+    rescue Net::HTTP::Persistent::Error
+      false
     end
 
     ##
@@ -50,19 +51,19 @@ module DownloadTV
     end
 
     def get_links(show)
-      @token ||= renew_token
+      renew_token if @token.nil?
 
       search = format(@url, show, @token)
 
       obj = request_and_parse(search)
 
-      if obj['error_code'] == 4 # Token expired
+      if obj['error_code'] == TOKEN_EXPIRED_ERROR
         renew_token
         search = format(@url, show, @token)
         obj = request_and_parse(search)
       end
 
-      while obj['error_code'] == 5 # Violate 1req/2s limit
+      while obj['error_code'] == TOO_MANY_REQUESTS_ERROR
         sleep(@wait)
         obj = request_and_parse(search)
       end
@@ -77,9 +78,6 @@ module DownloadTV
       if e.response_code == '429'
         sleep(@wait)
         retry
-      else
-        warn 'An unexpected error has occurred. Try updating the gem.'
-        exit 1
       end
     end
   end

data/lib/download_tv/grabbers/torrentz2.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module DownloadTV
+  ##
+  # EZTV.ag grabber
+  class Torrentz < LinkGrabber
+    def initialize
+      super('https://torrentzeu.org/kick.php?q=%s')
+    end
+
+    def get_links(show)
+      raw_data = @agent.get(format(@url, show))
+      results = raw_data.search('tbody tr')
+
+      # require 'byebug'; byebug
+
+      raise NoTorrentsError if results.empty?
+
+      data = results.sort_by { |e| e.search('td[data-title="Last Updated"]')[1].text.to_i }.reverse
+
+      data.collect do |i|
+        [i.children[1].text.strip,
+         i.children[11].children[1].attribute('href').text]
+      end
+    end
+  end
+end

data/lib/download_tv/linkgrabber.rb

@@ -8,12 +8,13 @@ module DownloadTV
 
     def initialize(url)
       @url = url
-      @agent = Mechanize.new
-      @agent.user_agent = DownloadTV::USER_AGENT
+      @agent = Mechanize.new do |a|
+        a.user_agent = DownloadTV::USER_AGENT
+        a.read_timeout = 10
+      end
     end
 
     def online?
-      @agent.read_timeout = 2
       url = if @url.include? '%s'
               format(@url, 'test')
             else

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/torrent.rb

@@ -7,8 +7,7 @@ module DownloadTV
     attr_reader :g_instances, :tries
 
     def grabbers
-      # %w[TorrentAPI ThePirateBay Eztv KAT]
-      %w[TorrentAPI ThePirateBay Eztv]
+      %w[TorrentAPI Torrentz Eztv]
     end
 
     def initialize(default_grabber = nil)
@@ -39,31 +38,23 @@ module DownloadTV
     end
 
     def change_grabbers
-      # Rotates the instantiated grabbers
+      @tries -= 1
       @g_instances.rotate!
       check_grabber_online
     end
 
     def get_links(show)
-      links = @g_instances.first.get_links(show)
-
-      reset_grabbers_order
-      reset_tries
-
-      links
+      @g_instances.first.get_links(show)
     rescue NoTorrentsError
-      # Use next grabber
       if @tries.positive?
-        @tries -= 1
         change_grabbers
         retry
-
-      else
-        reset_grabbers_order
-        reset_tries
-        puts "No torrents found for #{show}"
-        []
       end
+      # We're out of grabbers to try
+      puts "No torrents found for #{show}"
+      []
+    ensure
+      reset_grabbers_order
     end
 
     def reset_tries
@@ -72,6 +63,7 @@ module DownloadTV
 
     def reset_grabbers_order
       @g_instances.rotate!(@tries + 1)
+      reset_tries
     end
   end
 end