download_tv 2.8.4 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c39ab8c419d632acdd80ea9a072dbb119e27bec036d8e631bd1fe677a7cdc133
-  data.tar.gz: 6df0b53c0faedfa474631b8fb9c071b2bb3465a0b2172e599e2cd57d3d07b995
+  metadata.gz: 7ac0cea3ddd27f103e007c188a563c03d1f815692bb2310ffe6afa30047765b5
+  data.tar.gz: ab4e79a7197b9cec989be91fd4229c45652d8c9cdaf938f4f09781f8a42ee458
 SHA512:
-  metadata.gz: e455efa1fb3c2a86b480f3e1cbc814dc97297e45f26eb3b611cd740d19033682980e2f4a85a69b8f9b16f2575806d625a63290b631966788838bde3001b9c803
-  data.tar.gz: 65d73597d67dc3f03280d18d32d11a1b32d10e1c53ea3b8bac6cdda910de4af2800e90010d6a558906830837d770a2e96229059a620d62307b8935832b20ec61
+  metadata.gz: ff1b66cb9a68975ba031638bcd66ab5ca01ad9555cdea8d1a42b2bb397dd5040564ddcc335e97a3976a28e87fa63b035b23b0344dcd5e1abbaeaa647b295bf7d
+  data.tar.gz: 3408d00841377fd73b8cc564c121ac1b9983362b72277b0563a942774de97081c247ffb138acb1bc83160407c575fddce02e10e388d24ff5bd3d4ccb1c430538

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Next (unreleased)
 
+## 2.9.0 (2024-09-22)
+
+* Improvements
+	* Add -e option to edit configuration manually.
+
+## 2.8.5 (2024-09-22)
+
+* Grabbers
+	* ThePirateBay: fix with upstream again...
+	* ThePirateBayAPI: added (disabled) in case they expose it again.
+
 ## 2.8.4 (2024-08-19)
 
 * Grabbers

data/README.md

@@ -33,6 +33,7 @@ Specific options:
     -p, --pending                    Show list of pending downloads
         --clear-pending              Clear list of pending downloads
     -q, --queue SHOW                 Add show episode to pending downloads list
+    -e, --edit                       Open configuration with $EDITOR
     -v, --version                    Print version
     -h, --help                       Show this message
 ```

data/bin/tv

@@ -82,6 +82,12 @@ opt_parser = OptionParser.new do |opts|
     options[:arg] = s
   end
 
+  opts.on('-e', '--edit', 'Open configuration with $EDITOR') do
+    path = DownloadTV::Configuration.new.config_path
+    Process.detach(Process.spawn("$EDITOR #{path}"))
+    exit
+  end
+
   opts.on('-v', '--version', 'Print version') do
     puts DownloadTV::VERSION
     exit

data/lib/download_tv/configuration.rb

@@ -44,6 +44,10 @@ module DownloadTV
       serialize
     end
 
+    def config_path
+      (content[:path] || default_config_path)
+    end
+
     private
 
     def content
@@ -127,10 +131,6 @@ module DownloadTV
       self[:filters][:excludes] = read_and_split_list :upcase
     end
 
-    def config_path
-      (content[:path] || default_config_path)
-    end
-
     def default_config_path
       File.join(ENV['HOME'], '.config', 'download_tv', 'config')
     end

data/lib/download_tv/grabbers/tpb.rb

@@ -4,42 +4,27 @@ module DownloadTV
   ##
   # ThePirateBay grabber
   class ThePirateBay < LinkGrabber
-    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=")
+    def initialize(tpb_proxy = 'https://tpb30.ukpass.co/')
+      proxy = tpb_proxy.gsub(%r{/+$}, '')
+
+      super("#{proxy}/search/%s/0/7/0")
     end
 
     def get_links(show)
       search = format(@url, show)
 
-      data = agent.get(search)
-      parsed = JSON.parse(data.body)
-
-      raise NoTorrentsError if parsed.size == 1 && parsed.first['name'] == 'No results returned'
+      # Skip the header
+      data = agent.get(search).search('#searchResult tr').drop 1
 
-      parsed.map do |elem|
-        [elem['name'], build_magnet(elem['info_hash'], elem['name'])]
-      end
-    end
+      raise NoTorrentsError if data.empty?
 
-    private
+      # Second cell of each row contains links and name
+      results = data.map { |d| d.search('td')[1] }
 
-    def build_magnet(torrent_hash, name)
-      "magnet:?xt=urn:btih:#{torrent_hash}&dn=#{CGI.escape(name)}#{trackers_params}"
-    end
+      names = results.collect { |i| i.search('.detName').text.strip }
+      links = results.collect { |i| i.search('a')[1].attribute('href').text }
 
-    def trackers_params
-      trackers_params ||= "&tr=#{TRACKERS.map { |tracker| CGI.escape(tracker) }.join('&tr=')}"
+      names.zip(links)
     end
   end
 end

data/lib/download_tv/grabbers/tpbapi.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module DownloadTV
+  ##
+  # ThePirateBay grabber
+  class ThePirateBayAPI < LinkGrabber
+    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)
+
+      data = agent.get(search)
+      parsed = JSON.parse(data.body)
+
+      raise NoTorrentsError if parsed.size == 1 && parsed.first['name'] == 'No results returned'
+
+      parsed.map do |elem|
+        [elem['name'], build_magnet(elem['info_hash'], elem['name'])]
+      end
+    end
+
+    private
+
+    def build_magnet(torrent_hash, name)
+      "magnet:?xt=urn:btih:#{torrent_hash}&dn=#{CGI.escape(name)}#{trackers_params}"
+    end
+
+    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.4'
+  VERSION = '2.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.8.4
+  version: 2.9.0
 platform: ruby
 authors:
 - guille
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-19 00:00:00.000000000 Z
+date: 2024-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,6 +134,7 @@ files:
 - 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
 - lib/download_tv/myepisodes.rb
 - lib/download_tv/torrent.rb