download_tv 2.9.1 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cdb39e4207086f289d3e0d2dcabe074cf24e4e74bd3aaefaabceb68e4958113
-  data.tar.gz: f960d0ef1b358b4d84d4e28cc470b96211f690d22f70e9ad4931e3536944519f
+  metadata.gz: 3f0cca5d2bc54450e34f7ab30a9cb79abe1019929e19ac3ce7465ad7c2248f7d
+  data.tar.gz: eba05f15716ea83c3c1c5f7671054018c4e4b693e9fcf4f58e8e516d9591d51b
 SHA512:
-  metadata.gz: 8de56b35aab493b54e628670c232d9ee920d26ac47afdf217f9a92ad4ef48929916e8964881b75c2e1d0b16237ea47654c26e64187e761233c67a15d2d681c61
-  data.tar.gz: '0670878252cc519acd6b8967229998b37ceaae6ce17127ac7a65d14728ae551094e88908cf6873d165d98a56693881288c185666999ed4ba712830116dbeb25a'
+  metadata.gz: b40a876f14b73d29e5d94d50efd4c634fa39fb2cf1eb6fd684496f1fb3b57f29ecbaeda0e19e309a3346dbd44202c576a5963b698af09f9313b7805208fc926c
+  data.tar.gz: 217c3a359d809439a63d5288cd414c48bd3032956f48595f1d657e48923c4524b7b3b157d8d0a9f4c117192be3cc4d2134d905261b19436af8c9acb4bd5b406a

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Next (unreleased)
 
+## 2.9.2 (2025-03-14)
+
+* Grabbers
+	* ThePirateBay: update URL
+	* Torrentz: remove grabber
+
 ## 2.9.1 (2024-09-24)
 
 * Grabbers

data/README.md

@@ -70,7 +70,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 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.
+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 ThePirateBay. 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/download_tv.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |s|
   s.executables = ['tv']
 
   s.add_development_dependency 'bundler', '~> 2.0'
+  s.add_development_dependency 'byebug', '~> 11.1'
   s.add_development_dependency 'minitest', '~> 5.0'
-  s.add_development_dependency "rake", ">= 12.3.3"
   s.add_development_dependency 'pry', '~> 0.13'
-  s.add_development_dependency 'byebug', '~> 11.1'
+  s.add_development_dependency 'rake', '>= 12.3.3'
 
   s.add_dependency('json')
   s.add_dependency('mechanize')

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] ||= 'Torrentz'
+      self[:grabber] ||= 'ThePirateBay'
       self[:date] ||= Date.today - 1
       self[:filters] ||= default_filters
       self[:pending] ||= []

data/lib/download_tv/grabbers/torrentgalaxy.rb

@@ -12,7 +12,7 @@ module DownloadTV
       raw_data = agent.get(format(@url, show))
       rows = raw_data.search('div.tgxtablerow')
 
-      raise NoTorrentsError if rows.size == 0
+      raise NoTorrentsError if rows.size.zero?
 
       rows.map do |row|
         [row.children[4].text.strip,

data/lib/download_tv/grabbers/tpb.rb

@@ -4,7 +4,7 @@ module DownloadTV
   ##
   # ThePirateBay grabber
   class ThePirateBay < LinkGrabber
-    def initialize(tpb_proxy = 'https://tpb30.ukpass.co/')
+    def initialize(tpb_proxy = 'https://tpirbay.site/')
       proxy = tpb_proxy.gsub(%r{/+$}, '')
 
       super("#{proxy}/search/%s/0/7/0")

data/lib/download_tv/torrent.rb

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

data/lib/download_tv/version.rb

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

data/spec/download_tv/torrent_spec.rb

@@ -2,30 +2,26 @@
 
 describe DownloadTV::Torrent do
   let(:default_grabber) { nil }
-  let(:third_grabber) { double('eztv') }
-  let(:second_grabber) { double('torrentz') }
-  let(:fourth_grabber) { double('tpb') }
-  let(:first_grabber) { double('torrentgalaxy') }
+  # let(:third_grabber) { double('eztv') }
+  let(:second_grabber) { double('eztv') }
+  let(:first_grabber) { double('tpb') }
   let(:test_show) { double('test_show') }
   subject { described_class.new(default_grabber) }
 
   before :each do
-    allow(DownloadTV::Torrentz).to receive(:new).and_return first_grabber
-    allow(DownloadTV::ThePirateBay).to receive(:new).and_return second_grabber
-    allow(DownloadTV::Eztv).to receive(:new).and_return third_grabber
-    # allow(DownloadTV::TorrentGalaxy).to receive(:new).and_return fourth_grabber
+    allow(DownloadTV::ThePirateBay).to receive(:new).and_return first_grabber
+    allow(DownloadTV::Eztv).to receive(:new).and_return second_grabber
+    # allow(DownloadTV::TorrentGalaxy).to receive(:new).and_return third_grabber
 
     allow(first_grabber).to receive(:online?).and_return(true)
     allow(second_grabber).to receive(:online?).and_return(true)
-    allow(third_grabber).to receive(:online?).and_return(true)
-    # allow(fourth_grabber).to receive(:online?).and_return(true)
+    # allow(third_grabber).to receive(:online?).and_return(true)
   end
 
   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[Torrentz ThePirateBay Eztv]
-
+      expect(described_class.grabbers).to eq %w[ThePirateBay Eztv]
     end
   end
 
@@ -34,7 +30,7 @@ describe DownloadTV::Torrent do
       result = double('result')
       expect(first_grabber).to receive(:get_links).with(test_show).and_return(result)
 
-      result = subject.get_links(test_show)
+      subject.get_links(test_show)
     end
 
     context 'when the first grabber is offline' do
@@ -45,10 +41,10 @@ describe DownloadTV::Torrent do
       it 'will use the second grabber' do
         expect(first_grabber).not_to receive(:get_links)
         expect(second_grabber).to receive(:get_links).with(test_show)
-        expect(third_grabber).not_to receive(:get_links)
+        # expect(third_grabber).not_to receive(:get_links)
         # Add other torrents here with expectation #not_to receive
 
-        result = subject.get_links(test_show)
+        subject.get_links(test_show)
       end
     end
 
@@ -56,13 +52,13 @@ describe DownloadTV::Torrent do
       before do
         allow(first_grabber).to receive(:online?).and_return(false)
         allow(second_grabber).to receive(:online?).and_return(false)
-        allow(third_grabber).to receive(:online?).and_return(false)
+        # allow(third_grabber).to receive(:online?).and_return(false)
       end
 
       it 'will exit' do
         expect(first_grabber).not_to receive(:get_links)
         expect(second_grabber).not_to receive(:get_links)
-        expect(third_grabber).not_to receive(:get_links)
+        # expect(third_grabber).not_to receive(:get_links)
 
         expect { subject.get_links(test_show) }.to raise_error(SystemExit)
       end
@@ -77,7 +73,7 @@ describe DownloadTV::Torrent do
         expect(first_grabber).to receive(:get_links).ordered
         expect(second_grabber).to receive(:get_links).ordered
 
-        result = subject.get_links(test_show)
+        subject.get_links(test_show)
       end
     end
 
@@ -85,13 +81,13 @@ describe DownloadTV::Torrent do
       before do
         allow(first_grabber).to receive(:get_links).with(test_show).and_raise(DownloadTV::NoTorrentsError)
         allow(second_grabber).to receive(:get_links).with(test_show).and_raise(DownloadTV::NoTorrentsError)
-        allow(third_grabber).to receive(:get_links).with(test_show).and_raise(DownloadTV::NoTorrentsError)
+        # allow(third_grabber).to receive(:get_links).with(test_show).and_raise(DownloadTV::NoTorrentsError)
       end
 
       it 'will return an empty array' do
         expect(first_grabber).to receive(:get_links).ordered
         expect(second_grabber).to receive(:get_links).ordered
-        expect(third_grabber).to receive(:get_links).ordered
+        # expect(third_grabber).to receive(:get_links).ordered
 
         expect(subject.get_links(test_show)).to eq []
       end
@@ -103,10 +99,10 @@ describe DownloadTV::Torrent do
       it 'will use that grabber preferently' do
         test_show = double('test_show')
         expect(first_grabber).not_to receive(:get_links)
-        expect(second_grabber).not_to receive(:get_links)
-        expect(third_grabber).to receive(:get_links).with(test_show)
+        expect(second_grabber).to receive(:get_links)
+        # expect(third_grabber).to receive(:get_links).with(test_show)
 
-        result = subject.get_links(test_show)
+        subject.get_links(test_show)
       end
     end
 
@@ -117,16 +113,15 @@ describe DownloadTV::Torrent do
           count += 1
           raise DownloadTV::NoTorrentsError if count == 1
         end
-
       end
 
       it 'the second run will use the original order' do
         expect(first_grabber).to receive(:get_links).exactly(2).times
         expect(second_grabber).to receive(:get_links).exactly(1).time
-        expect(third_grabber).not_to receive(:get_links)
+        # expect(third_grabber).not_to receive(:get_links)
 
-        result = subject.get_links(test_show)
-        result = subject.get_links(test_show)
+        subject.get_links(test_show)
+        subject.get_links(test_show)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.2
 platform: ruby
 authors:
 - guille
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-24 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,6 @@ files:
 - lib/download_tv/filterer.rb
 - lib/download_tv/grabbers/eztv.rb
 - lib/download_tv/grabbers/torrentgalaxy.rb
-- lib/download_tv/grabbers/torrentz.rb
 - lib/download_tv/grabbers/tpb.rb
 - lib/download_tv/grabbers/tpbapi.rb
 - lib/download_tv/linkgrabber.rb

data/lib/download_tv/grabbers/torrentz.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module DownloadTV
-  ##
-  # Torrentz2 grabber
-  class Torrentz < LinkGrabber
-    def initialize
-      super('https://torrentz2.nz/search?q=%s')
-    end
-
-    def get_links(show)
-      raw_data = agent.get(format(@url, show))
-      results = raw_data.search('dl')
-
-      raise NoTorrentsError if results.empty?
-
-      data = results.sort_by { |e| e.search('dd span')[3].text.to_i }.reverse
-
-      data.collect do |i|
-        [i.children[0].text.strip,
-         i.search('dd span a').first.attribute('href').text]
-      end
-    end
-  end
-end