download_tv 2.6.9 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f9321a9c253da7b28e0640b68e39be399dc0b4059f355c800d8e00b5f2457f3
-  data.tar.gz: c947bc5589c19dd04c9bfddab3b3ae76b6ee05d5276784a3fe7a67441d7d1c52
+  metadata.gz: 60baef524397c2e513b18700b0b12df3d0e50f4ce396d360d230132526484a70
+  data.tar.gz: 91d36e1b5de51e2b056a0fca5696c97fd930721491aeadd584e8e73811833e32
 SHA512:
-  metadata.gz: d40ceae3bea856057b13a6b492db047cdc4e190148d17697a737d92e36e2a334f48f722a0a8c9b4b56e3a1bad9649cd8e6be41f6606d5fcc103063e63e8bce48
-  data.tar.gz: ef5892b6411c9cdcbd29c93345c842809b02f5c816c29a9596a4e100ac4fd6fea766241a3d76a01b964602d6f76f073c25430bc5839ff7ec6043cf8dd24afd88
+  metadata.gz: 6cd4d4c64cc88873c307d12d2f4745f21b1a09ee8b69a6b78a5ee1ac2c838eabd98369e4d2b8725f3c11473a67ec47c787740d2ab805d3a5194c5ccb23d512d5
+  data.tar.gz: d68d9db7807b684a251be0f8a6c564c38e2df4fc868c3491ed19487a3b3056103c07dd4c0dc328844c701151b27548842dceb89a9f1fbc60637329b54fadfe7d

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # download_tv CHANGELOG
 
+## 2.7.0 (2023-05-31)
+
+* Grabbers
+	* TorrentAPI: Removed (RARBG)
+
+## 2.6.10 (2023-03-16)
+
+* Fixes
+	* Bug fixes on the TorrentAPI grabber.
+
 ## 2.6.9 (2023-03-08)
 
 * Fixes

data/README.md

@@ -69,7 +69,7 @@ The `-f` flag can be used to read the list of episodes to download from a file.
 
 ### Available link grabbers
 
-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 searches for torrents using TorrentAPI. When a grabber doesn't have a torrent for said episode, is offline, or causes any error to appear, it skips to the next grabber until exhausting the list.
+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 searches for torrents using Torrentz. When a grabber doesn't have a torrent for said episode, is offline, or causes any error to appear, it skips to the next grabber until exhausting the list.
 
 I usually publish a patch update to the gem when I detect one of them isn't working, disabling it or fixing it altogether. If a specific grabber is giving you problems, check whether you're running the latest version of the gem before opening an issue here.
 

data/lib/download_tv/configuration.rb

@@ -140,7 +140,7 @@ module DownloadTV
     # Maintains the previous values, in case it's an update from an existing file.
     def set_default_values
       self[:auto] ||= true
-      self[:grabber] ||= 'TorrentAPI'
+      self[:grabber] ||= 'Torrentz'
       self[:date] ||= Date.today - 1
       self[:filters] ||= default_filters
       self[:pending] ||= []

data/lib/download_tv/torrent.rb

@@ -6,7 +6,7 @@ module DownloadTV
   class Torrent
     class << self
       def grabbers
-        %w[TorrentAPI Torrentz Eztv]
+        %w[Torrentz Eztv]
       end
 
       def healthcheck

data/lib/download_tv/version.rb

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

data/spec/download_tv/torrent_spec.rb

@@ -3,19 +3,16 @@
 describe DownloadTV::Torrent do
   let(:default_grabber) { nil }
   let(:eztv_mock) { double('eztv') }
-  let(:torrentapi_mock) { double('torrentapi') }
   let(:torrentz_mock) { double('torrentz') }
   let(:tpb_mock) { double('tpb') }
   let(:test_show) { double('test_show') }
   subject { described_class.new(default_grabber) }
 
   before :each do
-    allow(DownloadTV::TorrentAPI).to receive(:new).and_return torrentapi_mock
     allow(DownloadTV::Torrentz).to receive(:new).and_return torrentz_mock
     allow(DownloadTV::Eztv).to receive(:new).and_return eztv_mock
     # allow(DownloadTV::ThePirateBay).to receive(:new).and_return tpb_mock
 
-    allow(torrentapi_mock).to receive(:online?).and_return(true)
     allow(torrentz_mock).to receive(:online?).and_return(true)
     allow(eztv_mock).to receive(:online?).and_return(true)
   end
@@ -23,7 +20,7 @@ describe DownloadTV::Torrent do
   describe 'Torrent.grabbers' do
     it 'returns the list of grabbers' do
       # This order is assumed in the other specs, so explicitly checking it here
-      expect(described_class.grabbers).to eq %w[TorrentAPI Torrentz Eztv]
+      expect(described_class.grabbers).to eq %w[Torrentz Eztv]
 
     end
   end
@@ -31,20 +28,20 @@ describe DownloadTV::Torrent do
   describe '#get_links' do
     it 'will use the first grabber and return its #get_link result' do
       result = double('result')
-      expect(torrentapi_mock).to receive(:get_links).with(test_show).and_return(result)
+      expect(torrentz_mock).to receive(:get_links).with(test_show).and_return(result)
 
       result = subject.get_links(test_show)
     end
 
     context 'when the first grabber is offline' do
       before do
-        allow(torrentapi_mock).to receive(:online?).and_return(false)
+        allow(torrentz_mock).to receive(:online?).and_return(false)
       end
 
       it 'will use the second grabber' do
-        expect(torrentapi_mock).not_to receive(:get_links)
-        expect(eztv_mock).not_to receive(:get_links)
-        expect(torrentz_mock).to receive(:get_links).with(test_show)
+        expect(torrentz_mock).not_to receive(:get_links)
+        expect(eztv_mock).to receive(:get_links).with(test_show)
+        # Add other torrents here with expectation #not_to receive
 
         result = subject.get_links(test_show)
       end
@@ -52,13 +49,11 @@ describe DownloadTV::Torrent do
 
     context 'when all the grabbers are offline' do
       before do
-        allow(torrentapi_mock).to receive(:online?).and_return(false)
         allow(torrentz_mock).to receive(:online?).and_return(false)
         allow(eztv_mock).to receive(:online?).and_return(false)
       end
 
       it 'will exit' do
-        expect(torrentapi_mock).not_to receive(:get_links)
         expect(torrentz_mock).not_to receive(:get_links)
         expect(eztv_mock).not_to receive(:get_links)
 
@@ -68,12 +63,10 @@ describe DownloadTV::Torrent do
 
     context 'when one grabber does not find a link' do
       before do
-        allow(torrentapi_mock).to receive(:get_links).with(test_show).and_raise(DownloadTV::NoTorrentsError)
         allow(torrentz_mock).to receive(:get_links).with(test_show).and_raise(DownloadTV::NoTorrentsError)
       end
 
       it 'will keep trying until one does' do
-        expect(torrentapi_mock).to receive(:get_links).ordered
         expect(torrentz_mock).to receive(:get_links).ordered
         expect(eztv_mock).to receive(:get_links).ordered
 
@@ -83,13 +76,11 @@ describe DownloadTV::Torrent do
 
     context 'when no grabber can find a link' do
       before do
-        allow(torrentapi_mock).to receive(:get_links).with(test_show).and_raise(DownloadTV::NoTorrentsError)
         allow(torrentz_mock).to receive(:get_links).with(test_show).and_raise(DownloadTV::NoTorrentsError)
         allow(eztv_mock).to receive(:get_links).with(test_show).and_raise(DownloadTV::NoTorrentsError)
       end
 
       it 'will return an empty array' do
-        expect(torrentapi_mock).to receive(:get_links).ordered
         expect(torrentz_mock).to receive(:get_links).ordered
         expect(eztv_mock).to receive(:get_links).ordered
 
@@ -102,7 +93,6 @@ describe DownloadTV::Torrent do
 
       it 'will use that grabber preferently' do
         test_show = double('test_show')
-        expect(torrentapi_mock).not_to receive(:get_links)
         expect(torrentz_mock).not_to receive(:get_links)
         expect(eztv_mock).to receive(:get_links).with(test_show)
 
@@ -113,7 +103,7 @@ describe DownloadTV::Torrent do
     context 'when a grabber fails on a run and it is called twice' do
       before do
         count = 0
-        allow(torrentapi_mock).to receive(:get_links).exactly(2).times.with(test_show) do
+        allow(torrentz_mock).to receive(:get_links).exactly(2).times.with(test_show) do
           count += 1
           raise DownloadTV::NoTorrentsError if count == 1
         end
@@ -121,8 +111,8 @@ describe DownloadTV::Torrent do
       end
 
       it 'the second run will use the original order' do
-        expect(torrentapi_mock).to receive(:get_links).exactly(2).times
-        expect(torrentz_mock).to receive(:get_links).exactly(1).time
+        expect(torrentz_mock).to receive(:get_links).exactly(2).times
+        expect(eztv_mock).to receive(:get_links).exactly(1).time
 
         result = subject.get_links(test_show)
         result = subject.get_links(test_show)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.6.9
+  version: 2.7.0
 platform: ruby
 authors:
 - guille
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +132,6 @@ files:
 - lib/download_tv/downloader.rb
 - lib/download_tv/filterer.rb
 - lib/download_tv/grabbers/eztv.rb
-- lib/download_tv/grabbers/torrentapi.rb
 - lib/download_tv/grabbers/torrentz.rb
 - lib/download_tv/grabbers/tpb.rb
 - lib/download_tv/linkgrabber.rb

data/lib/download_tv/grabbers/torrentapi.rb

@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-module DownloadTV
-  ##
-  # TorrentAPI.org grabber
-  # Interfaces with http://torrentapi.org/apidocs_v2.txt
-  class TorrentAPI < LinkGrabber
-    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.5
-      @token = nil
-    end
-
-    ##
-    # Specific implementation for TorrentAPI (requires token)
-    def online?
-      renew_token
-      true
-    rescue Mechanize::ResponseCodeError => e
-      if e.response_code == '429'
-        sleep(@wait)
-        retry
-      end
-      false
-    rescue Net::HTTP::Persistent::Error
-      false
-    end
-
-    ##
-    # Makes a get request tp the given url.
-    # Returns the JSON response parsed into a hash
-    def request_and_parse(url)
-      page = agent.get(url).content
-      JSON.parse(page)
-    end
-
-    ##
-    # Connects to Torrentapi.org and requests a token, returning it
-    # Tokens automatically expire every 15 minutes
-    def renew_token
-      obj = request_and_parse('https://torrentapi.org/pubapi_v2'\
-                              '.php?get_token=get_token&app_id='\
-                              'DownloadTV')
-
-      @token = obj['token']
-    end
-
-    def get_links(show)
-      renew_token if @token.nil?
-
-      search = format(@url, show, @token)
-
-      obj = request_and_parse(search)
-
-      if obj['error_code'] == TOKEN_EXPIRED_ERROR
-        renew_token
-        search = format(@url, show, @token)
-        obj = request_and_parse(search)
-      end
-
-      until obj['error_code'] != TOO_MANY_REQUESTS_ERROR && (obj['rate_limit'].nil? || obj['rate_limit'] == false)
-        sleep(@wait)
-        obj = request_and_parse(search)
-      end
-
-      raise NoTorrentsError if obj['error']
-
-      names = obj['torrent_results'].collect { |i| i['filename'] }
-      links = obj['torrent_results'].collect { |i| i['download'] }
-
-      names.zip(links)
-    rescue Mechanize::ResponseCodeError => e
-      if e.response_code == '429'
-        sleep(@wait)
-        retry
-      end
-    end
-  end
-end