download_tv 2.8.3 → 2.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c202232c01422b793ebb302b44517ae6e81e8d95fa9f30dbd5a87014b88386f
-  data.tar.gz: fdff3db7c0590cfce73cef42cb8775734bb980867901a087c8af362a764ffa9f
+  metadata.gz: c39ab8c419d632acdd80ea9a072dbb119e27bec036d8e631bd1fe677a7cdc133
+  data.tar.gz: 6df0b53c0faedfa474631b8fb9c071b2bb3465a0b2172e599e2cd57d3d07b995
 SHA512:
-  metadata.gz: f725cb5dff565e302ce166be63c142e5aeb3693e7379e135f3d7cb21de1f8fdae1a7df53f6a96abdf44ef94fcc16f4412c9a2d3d64da6c060ee5de6844eae5b6
-  data.tar.gz: 07576b4a5194b8929a1107ef233154f72237c72d72d2e9c8ba787613a0f8047cdc9dade2a83501b1434b99181149f161cf946d33211caefe0ef7b269314e10fc
+  metadata.gz: e455efa1fb3c2a86b480f3e1cbc814dc97297e45f26eb3b611cd740d19033682980e2f4a85a69b8f9b16f2575806d625a63290b631966788838bde3001b9c803
+  data.tar.gz: 65d73597d67dc3f03280d18d32d11a1b32d10e1c53ea3b8bac6cdda910de4af2800e90010d6a558906830837d770a2e96229059a620d62307b8935832b20ec61

data/.github/workflows/ruby.yml

@@ -15,19 +15,15 @@ on:
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ['2.7', '3.0']
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Next (unreleased)
 
+## 2.8.4 (2024-08-19)
+
+* Grabbers
+	* ThePirateBay: fix with upstream. Use tpb api.
+
 ## 2.8.3 (2024-02-20)
 
 * Grabbers

data/lib/download_tv/downloader.rb

@@ -180,8 +180,9 @@ module DownloadTV
     def reject_ignored(shows)
       shows.reject do |i|
         # Remove season+episode
-        @config[:ignored]
-               .include?(i.split(' ')[0..-2].join(' ').downcase)
+        @config[:ignored].include?(
+          i.split(' ')[0..-2].join(' ').downcase
+        )
       end
     end
 

data/lib/download_tv/grabbers/tpb.rb

@@ -4,27 +4,42 @@ module DownloadTV
   ##
   # ThePirateBay grabber
   class ThePirateBay < LinkGrabber
-    def initialize(tpb_proxy = 'https://tpb30.ukpass.co/')
-      proxy = tpb_proxy.gsub(%r{/+$}, '')
-
-      super("#{proxy}/search/%s/0/7/0")
+    TRACKERS = %w[
+      udp://tracker.coppersurfer.tk:6969/announce
+      udp://tracker.openbittorrent.com:6969/announce
+      udp://tracker.opentrackr.org:1337
+      udp://movies.zsw.ca:6969/announce
+      udp://tracker.dler.org:6969/announce
+      udp://opentracker.i2p.rocks:6969/announce
+      udp://open.stealth.si:80/announce
+      udp://tracker.0x.tf:6969/announce
+    ]
+
+    def initialize
+      super("https://tpb36.ukpass.co/apibay/q.php?q=%s&cat=")
     end
 
     def get_links(show)
       search = format(@url, show)
 
-      # Skip the header
-      data = agent.get(search).search('#searchResult tr').drop 1
+      data = agent.get(search)
+      parsed = JSON.parse(data.body)
+
+      raise NoTorrentsError if parsed.size == 1 && parsed.first['name'] == 'No results returned'
 
-      raise NoTorrentsError if data.empty?
+      parsed.map do |elem|
+        [elem['name'], build_magnet(elem['info_hash'], elem['name'])]
+      end
+    end
 
-      # Second cell of each row contains links and name
-      results = data.map { |d| d.search('td')[1] }
+    private
 
-      names = results.collect { |i| i.search('.detName').text.strip }
-      links = results.collect { |i| i.search('a')[1].attribute('href').text }
+    def build_magnet(torrent_hash, name)
+      "magnet:?xt=urn:btih:#{torrent_hash}&dn=#{CGI.escape(name)}#{trackers_params}"
+    end
 
-      names.zip(links)
+    def trackers_params
+      trackers_params ||= "&tr=#{TRACKERS.map { |tracker| CGI.escape(tracker) }.join('&tr=')}"
     end
   end
 end

data/lib/download_tv/version.rb

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

data/spec/download_tv/torrent_spec.rb

@@ -2,28 +2,29 @@
 
 describe DownloadTV::Torrent do
   let(:default_grabber) { nil }
-  let(:eztv_mock) { double('eztv') }
-  let(:torrentz_mock) { double('torrentz') }
-  let(:tpb_mock) { double('tpb') }
-  let(:torrentgalaxy_mock) { double('torrentgalaxy') }
+  let(:third_grabber) { double('eztv') }
+  let(:second_grabber) { double('torrentz') }
+  let(:fourth_grabber) { double('tpb') }
+  let(:first_grabber) { double('torrentgalaxy') }
   let(:test_show) { double('test_show') }
   subject { described_class.new(default_grabber) }
 
   before :each do
-    allow(DownloadTV::TorrentGalaxy).to receive(:new).and_return torrentgalaxy_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(torrentgalaxy_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)
+    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(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)
   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[TorrentGalaxy Torrentz Eztv]
+      expect(described_class.grabbers).to eq %w[Torrentz ThePirateBay Eztv]
 
     end
   end
@@ -31,20 +32,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(torrentgalaxy_mock).to receive(:get_links).with(test_show).and_return(result)
+      expect(first_grabber).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(torrentgalaxy_mock).to receive(:online?).and_return(false)
+        allow(first_grabber).to receive(:online?).and_return(false)
       end
 
       it 'will use the second grabber' do
-        expect(torrentgalaxy_mock).not_to receive(:get_links)
-        expect(torrentz_mock).to receive(:get_links).with(test_show)
-        expect(eztv_mock).not_to receive(:get_links)
+        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)
         # Add other torrents here with expectation #not_to receive
 
         result = subject.get_links(test_show)
@@ -53,15 +54,15 @@ describe DownloadTV::Torrent do
 
     context 'when all the grabbers are offline' do
       before do
-        allow(torrentgalaxy_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)
+        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)
       end
 
       it 'will exit' do
-        expect(torrentgalaxy_mock).not_to receive(:get_links)
-        expect(torrentz_mock).not_to receive(:get_links)
-        expect(eztv_mock).not_to receive(:get_links)
+        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 { subject.get_links(test_show) }.to raise_error(SystemExit)
       end
@@ -69,12 +70,12 @@ describe DownloadTV::Torrent do
 
     context 'when one grabber does not find a link' do
       before do
-        allow(torrentgalaxy_mock).to receive(:get_links).with(test_show).and_raise(DownloadTV::NoTorrentsError)
+        allow(first_grabber).to receive(:get_links).with(test_show).and_raise(DownloadTV::NoTorrentsError)
       end
 
       it 'will keep trying until one does' do
-        expect(torrentgalaxy_mock).to receive(:get_links).ordered
-        expect(torrentz_mock).to receive(:get_links).ordered
+        expect(first_grabber).to receive(:get_links).ordered
+        expect(second_grabber).to receive(:get_links).ordered
 
         result = subject.get_links(test_show)
       end
@@ -82,15 +83,15 @@ describe DownloadTV::Torrent do
 
     context 'when no grabber can find a link' do
       before do
-        allow(torrentgalaxy_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)
+        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)
       end
 
       it 'will return an empty array' do
-        expect(torrentgalaxy_mock).to receive(:get_links).ordered
-        expect(torrentz_mock).to receive(:get_links).ordered
-        expect(eztv_mock).to receive(:get_links).ordered
+        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(subject.get_links(test_show)).to eq []
       end
@@ -101,9 +102,9 @@ describe DownloadTV::Torrent do
 
       it 'will use that grabber preferently' do
         test_show = double('test_show')
-        expect(torrentgalaxy_mock).not_to receive(:get_links)
-        expect(torrentz_mock).not_to receive(:get_links)
-        expect(eztv_mock).to receive(:get_links).with(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)
 
         result = subject.get_links(test_show)
       end
@@ -112,7 +113,7 @@ describe DownloadTV::Torrent do
     context 'when a grabber fails on a run and it is called twice' do
       before do
         count = 0
-        allow(torrentgalaxy_mock).to receive(:get_links).exactly(2).times.with(test_show) do
+        allow(first_grabber).to receive(:get_links).exactly(2).times.with(test_show) do
           count += 1
           raise DownloadTV::NoTorrentsError if count == 1
         end
@@ -120,9 +121,9 @@ describe DownloadTV::Torrent do
       end
 
       it 'the second run will use the original order' do
-        expect(torrentgalaxy_mock).to receive(:get_links).exactly(2).times
-        expect(torrentz_mock).to receive(:get_links).exactly(1).time
-        expect(eztv_mock).not_to receive(:get_links)
+        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)
 
         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.8.3
+  version: 2.8.4
 platform: ruby
 authors:
 - guille
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler