download_tv 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f8dda689a52414ffbba9c500ddd35c559726b77e
-  data.tar.gz: 34a781bc82bde130397290dc0038bbb3e842198d
+SHA256:
+  metadata.gz: 6e71de7a1656a868e74d337bc5d449adcaa4dadd71ad6c2d6948046de1b86d82
+  data.tar.gz: 6005ca37c600b71d97a5c724b5790b7c13a34fd99256e2196e0c39461736bdbc
 SHA512:
-  metadata.gz: ab18d3786f2b7ca4b7a5757355f50a7e1cfcfb871e375dc165841e8212a2518b48d64970a0a069699fecbf6b6b422880bf15704d53b8f87b68b168790d72d8b6
-  data.tar.gz: c5cbe9275f0174e56da29fa4ba3f90054e663b05f1dc2633b36dc05254af3c3cf74dec11f3db5f80996975f27add8e1d1f231525d0556ff796dc37f214b875ec
+  metadata.gz: d886c71d0106d3420e8228d95b3b4a7715b0fc0402785ab6a06aa47f9b28a737114f92514745c2d62d43272b5a7b12c1ade39e31d5e925dc63aaaf3c9cc04bf6
+  data.tar.gz: 6f4c082d0332f4baeaedc864a8d17487540a4723f8e1fd2b8096f98974ace3cc0c3fef0235de784150dc43d2a1e0fd166d003530479071012e1e33a8cf606254

data/README.md

@@ -45,7 +45,7 @@ The options -c and --show-config allow the user to change or view the current co
 
 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).
 
-With -g and --show-grabbers, the user can see what grabbers are available and choose one of these as their preferred option. By default, the application searchs for torrents in TorrentAPI, ThePirateBay, KAT and EZTV, in that order, skipping to the next when one of them is down/doesn't have a torrent for said episode.
+With -g and --show-grabbers, the user can see what grabbers are available and choose one of these as their preferred option. By default, the application searchs for torrents in TorrentAPI, ThePirateBay, EZTV and KAT, in that order, skipping to the next when one of them is down/doesn't have a torrent for said episode.
 
 ### License
 

data/bin/tv

@@ -90,7 +90,7 @@ begin
 rescue Interrupt
   puts 'Interrupt signal detected. Exiting...'
   exit 1
-rescue SocketError, Errno::ECONNRESET, Net::OpenTimeout
+rescue SocketError, Errno::ECONNRESET, Net::OpenTimeout, Net::ReadTimeout
   warn 'Connection error.'
   exit 1
 end

data/lib/download_tv/downloader.rb

@@ -26,13 +26,14 @@ module DownloadTV
     ##
     # 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
+      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)) }
+      else
         puts "Error: #{filename} not found"
         exit 1
       end
-      filename = File.realpath(filename)
-      t = Torrent.new(@config.content[:grabber])
-      File.readlines(filename).each { |show| download(get_link(t, show)) }
     end
 
     ##
@@ -45,13 +46,13 @@ module DownloadTV
       # Log in using cookie by default
       myepisodes.load_cookie
       shows = myepisodes.get_shows(date)
+      to_download = fix_names(shows)
 
-      if shows.empty?
+      if to_download.empty?
         puts 'Nothing to download'
 
       else
         t = Torrent.new(@config.content[:grabber])
-        to_download = fix_names(shows)
 
         queue = Queue.new
 

data/lib/download_tv/grabbers/kat.rb

@@ -3,26 +3,22 @@ module DownloadTV
   # KATcr.co grabber
   class KAT < LinkGrabber
     def initialize
-      super('https://katcr.co/new/search-torrents.php?search="%s"&sort=seeders&order=desc')
+      super('https://katcr.co/advanced-usearch/')
     end
 
     def get_links(s)
-      # Format the url
-      search = format(@url, s)
+      params = {
+        'category': 'TV',
+        'orderby': 'seeds-desc',
+        'search': s
+      }
 
-      data = @agent.get(search).links.select { |i| i.href.include? 'torrents-details.php?' }
+      data = @agent.post(@url, params).search('table.torrents_table tbody tr td[1]')
 
-      raise NoTorrentsError if data == []
+      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 }
 
-      # Remove duplicates
-      data.keep_if { |i| i.text != '' }
-
-      names = data.collect(&:text)
-      links = []
-
-      data.each do |res|
-        links << res.click.search('a.kaGiantButton[title="Magnet link"]').attribute('href').text
-      end
+      raise NoTorrentsError if data.empty?
 
       names.zip(links)
     end

data/lib/download_tv/grabbers/torrentapi.rb

@@ -1,6 +1,7 @@
 module DownloadTV
   ##
   # TorrentAPI.org grabber
+  # Interfaces with http://torrentapi.org/apidocs_v2.txt
   class TorrentAPI < LinkGrabber
     attr_accessor :token
     attr_reader :wait
@@ -14,24 +15,21 @@ module DownloadTV
     # Specific implementation for TorrentAPI (requires token)
     def online?
       @agent.read_timeout = 2
-      @agent.get(format(@url, 'test', 'test'))
+      @agent.head(format(@url, 'test', 'test'))
       true
     rescue Mechanize::ResponseCodeError, Net::HTTP::Persistent::Error
       false
     end
 
     ##
-    # Connects to Torrentapi.org and requests a token.
-    # Returns said token.
+    # 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)
 
       @token = obj['token']
-      # Tokens automaticly expire in 15 minutes.
-      # The api has a 1req/2s limit.
-      # http://torrentapi.org/apidocs_v2.txt
     end
 
     def get_links(s)
@@ -51,11 +49,9 @@ module DownloadTV
       end
 
       while obj['error_code'] == 5 # Violate 1req/2s limit
-        # puts 'Torrentapi request limit hit. Wait a few seconds...'
         sleep(@wait)
         page = @agent.get(search).content
         obj = JSON.parse(page)
-
       end
 
       raise NoTorrentsError if obj['error']

data/lib/download_tv/grabbers/tpb.rb

@@ -2,8 +2,8 @@ module DownloadTV
   ##
   # ThePirateBay grabber
   class ThePirateBay < LinkGrabber
-    def initialize(tpb_proxy = 'https://thepiratebay.cr')
-      proxy = tpb_proxy.gsub(%r{/+$}, '') || 'https://thepiratebay.cr'
+    def initialize(tpb_proxy = 'https://pirateproxy.sh/')
+      proxy = tpb_proxy.gsub(%r{/+$}, '')
 
       super("#{proxy}/search/%s/0/7/0")
     end

data/lib/download_tv/linkgrabber.rb

@@ -12,7 +12,7 @@ module DownloadTV
 
     def online?
       @agent.read_timeout = 2
-      @agent.get(format(@url, 'test'))
+      @agent.head(format(@url, 'test'))
       true
     rescue Mechanize::ResponseCodeError, Net::HTTP::Persistent::Error
       false

data/lib/download_tv/torrent.rb

@@ -2,44 +2,43 @@ module DownloadTV
   ##
   # Class in charge of managing the link grabbers
   class Torrent
-    attr_reader :g_names, :g_instances, :tries
+    attr_reader :g_instances, :tries
 
     def grabbers
-      %w[Eztv KAT ThePirateBay TorrentAPI]
+      %w[TorrentAPI ThePirateBay Eztv KAT]
     end
 
     def initialize(default_grabber = nil)
-      @g_names = grabbers
-      @g_instances = []
-      reset_tries
+      g_names = grabbers
 
       # Silently ignores bad names
-      found = @g_names.find_index(default_grabber)
-      @g_names.rotate! found + 1 if found
+      found_default = g_names.find_index(default_grabber)
+      g_names.rotate! found_default if found_default
+
+      @g_instances = g_names.map { |g| (DownloadTV.const_get g).new }
+      reset_tries
 
-      change_grabbers
+      check_grabber_online
     end
 
-    def change_grabbers
-      if !@g_names.empty?
-        # Instantiates the last element from g_names, popping it
-        newt = (DownloadTV.const_get @g_names.pop).new
+    def check_grabber_online
+      return if @g_instances.first.online?
+      # We won't be using this grabber
+      warn "Problem accessing #{newt.class.name}"
+      @tries -= 1
+      @g_instances.drop 1
+    end
 
-        if newt.online?
-          @g_instances.unshift newt
-        else
-          warn "Problem accessing #{newt.class.name}"
-          @tries -= 1 # We won't be using this grabber
-          change_grabbers
-        end
-      else # Rotates the instantiated grabbers
-        @g_instances.rotate!
-      end
+    def change_grabbers
+      # Rotates the instantiated grabbers
+      @g_instances.rotate!
+      check_grabber_online
     end
 
     def get_links(show)
       links = @g_instances.first.get_links(show)
 
+      reset_grabbers_order
       reset_tries
 
       links
@@ -53,6 +52,7 @@ module DownloadTV
         retry
 
       else
+        reset_grabbers_order
         reset_tries
         # Handle show not found here!!
         return []
@@ -60,7 +60,11 @@ module DownloadTV
     end
 
     def reset_tries
-      @tries = @g_names.size + @g_instances.size - 1
+      @tries = @g_instances.size - 1
+    end
+
+    def reset_grabbers_order
+      @g_instances.rotate!(@tries + 1)
     end
   end
 end

data/lib/download_tv/version.rb

@@ -1,3 +1,3 @@
 module DownloadTV
-  VERSION = '2.3.0'.freeze
+  VERSION = '2.4.0'.freeze
 end

data/test/torrent_test.rb

@@ -6,14 +6,7 @@ describe DownloadTV::Torrent do
       @t = DownloadTV::Torrent.new
     end
 
-    it 'will have the right amount of grabbers' do
-      @t.g_names.size.must_equal @t.grabbers.size - 1
-      @t.g_instances.size.must_equal 1
-    end
-
     it 'will populate the instances' do
-      @t.grabbers.size.times.each { @t.change_grabbers }
-      @t.g_names.empty?.must_equal true
       @t.g_instances.size.must_equal @t.grabbers.size
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - guille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: DownloadTV is a tool that allows the user to find magnet links for tv show