download_tv 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdd3f78afeabc9f480b3c8ec5aa31029706328b175c8c65b0ab886982eecb71b
-  data.tar.gz: b94540fc9e5a49193a8dea70abbe1b91f83e767bb06e11a181dd81a9c2d558a6
+  metadata.gz: 7ab8410da063b896958e54d0a18e2fdc19b4ed9b45919fc714f536444041bc3e
+  data.tar.gz: 8435e14058dedd5e269d7819e301936c1a636619acb7a506f66cc944b1055fbf
 SHA512:
-  metadata.gz: f5b267c3a9502dbb034e31d4805d5aa6312d2d47adbace34c3b309281533f1831fb38834c0e2b957cc5ba56c72e0ef06e6a67d333d86731deb318756e4461743
-  data.tar.gz: ab7d015822c32df0a62e2e367cf246b28fa6e26d6d0e81a59e6c78131419d1b96d631c62157c5aece13e69b02c450afbed785aaf99e498e3711c3bbe867a6fe7
+  metadata.gz: 90bb2c2d281914071bf70097f771c0bc1dec85a3a8054907edb3c1f05b4aef915e813f55b38aa2825cb8ad7835830c9beb127d183e441c37fa7c140ee3cc83f4
+  data.tar.gz: d8ac37531a40b571fe5dcfe4f73c316860c39034befb8f05b67cdaf3a05c060447fe2b09f717ff28236c2d9ef12f54986cb0a30425b0f0da385f99e6af478172

data/.gitignore

@@ -1,3 +1,4 @@
 /Gemfile.lock
 /pkg/
-.rubocop.yml
+.rubocop.yml
+.byebug_history

data/bin/tv

@@ -92,7 +92,13 @@ opt_parser = OptionParser.new do |opts|
   end
 end
 
-opt_parser.parse!(ARGV)
+begin
+  opt_parser.parse!(ARGV)
+rescue OptionParser::InvalidOption => e
+  warn e.message
+  puts opt_parser.help
+  exit 1
+end
 
 begin
   case options[:cmd]

data/download_tv.gemspec

@@ -24,7 +24,9 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', '~> 2.0'
   s.add_development_dependency 'minitest', '~> 5.0'
-  s.add_development_dependency 'rake', '~> 10.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_dependency('json')
   s.add_dependency('mechanize')

data/lib/download_tv.rb

@@ -24,4 +24,4 @@ module DownloadTV
   class NoSubtitlesError < StandardError; end
 end
 
-Dir[File.join(__dir__, 'download_tv', 'grabbers', '*.rb')].each { |file| require file }
+Dir[File.join(__dir__, 'download_tv', 'grabbers', '*.rb')].sort.each { |file| require file }

data/lib/download_tv/downloader.rb

@@ -21,6 +21,7 @@ module DownloadTV
         loop do
           link = get_link(t, episode)
           break if link.empty?
+
           download(link)
           episode = episode.next
         end

data/lib/download_tv/grabbers/eztv.rb

@@ -12,20 +12,23 @@ module DownloadTV
       # Format the url
       search = format(@url, show)
 
-      data = @agent.get(search).search('a.magnet')
+      raw_data = @agent.get(search)
+      raw_links = raw_data.search('a.magnet')
+      raw_seeders = raw_data.search('td.forum_thread_post_end').map { |e| e.children[0].text.to_i }
+      raw_links = raw_links.sort_by.with_index { |_, index| raw_seeders[index] }.reverse
 
-      # Torrent name in data[i].attribute 'title'
+      # Torrent name in raw_links[i].attribute 'title'
       # 'Suits S04E01 HDTV x264-LOL Torrent: Magnet Link'
 
       # EZTV shows 50 latest releases if it can't find the torrent
-      raise NoTorrentsError if data.size == 50
+      raise NoTorrentsError if raw_links.size == 50
 
-      names = data.collect do |i|
+      names = raw_links.collect do |i|
         i.attribute('title')
          .text
          .chomp(' Magnet Link')
       end
-      links = data.collect do |i|
+      links = raw_links.collect do |i|
         i.attribute('href')
          .text
       end

data/lib/download_tv/grabbers/torrentapi.rb

@@ -21,13 +21,15 @@ module DownloadTV
       @agent.read_timeout = 2
       renew_token
       true
-    rescue Mechanize::ResponseCodeError, Net::HTTP::Persistent::Error => e
+    rescue Mechanize::ResponseCodeError => e
       if e.response_code == '429'
         sleep(@wait)
         retry
       else
         false
       end
+    rescue Net::HTTP::Persistent::Error => e
+      false
     end
 
     ##

data/lib/download_tv/torrent.rb

@@ -8,7 +8,7 @@ module DownloadTV
 
     def grabbers
       # %w[TorrentAPI ThePirateBay Eztv KAT]
-      %w[TorrentAPI ThePirateBay Eztv]
+      %w[TorrentAPI Eztv]
     end
 
     def initialize(default_grabber = nil)

data/lib/download_tv/version.rb

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

data/test/config_test.rb

@@ -18,28 +18,28 @@ describe DownloadTV::Configuration do
       create_dummy_config(config_path)
 
       c = DownloadTV::Configuration.new(path: config_path)
-      c.content.must_equal(path: config_path, version: DownloadTV::VERSION)
+      _(c.content).must_equal(path: config_path, version: DownloadTV::VERSION)
     end
 
     it 'will load the existing configuration (existing)' do
       create_dummy_config(config_path, auto: false, myepisodes_user: 'dummy')
 
       c = DownloadTV::Configuration.new(path: config_path)
-      c.content.must_equal(path: config_path, auto: false, myepisodes_user: 'dummy', version: DownloadTV::VERSION)
+      _(c.content).must_equal(path: config_path, auto: false, myepisodes_user: 'dummy', version: DownloadTV::VERSION)
     end
 
     it 'will get overwritten by the parameters given' do
       create_dummy_config(config_path, myepisodes_user: 'dummy')
 
       c = DownloadTV::Configuration.new(path: config_path, myepisodes_user: 'fake')
-      c.content.must_equal(path: config_path, myepisodes_user: 'fake', version: DownloadTV::VERSION)
+      _(c.content).must_equal(path: config_path, myepisodes_user: 'fake', version: DownloadTV::VERSION)
     end
 
     it 'will downcase ignored shows' do
       create_dummy_config(config_path, ignored: %w[duMMy String])
 
       c = DownloadTV::Configuration.new(path: config_path)
-      c.content[:ignored].must_equal %w[dummy string]
+      _(c.content[:ignored]).must_equal %w[dummy string]
     end
   end
 
@@ -58,7 +58,7 @@ describe DownloadTV::Configuration do
       split[0] = (split[0].to_i - 1).to_s
       new_version = split.join('.')
       c = DownloadTV::Configuration.new(path: config_path)
-      c.breaking_changes?(new_version).must_equal true
+      _(c.breaking_changes?(new_version)).must_equal true
     end
 
     it "returns true when there's been a minor update" do
@@ -68,7 +68,7 @@ describe DownloadTV::Configuration do
       split[1] = (split[1].to_i - 1).to_s
       new_version = split.join('.')
       c = DownloadTV::Configuration.new(path: config_path)
-      c.breaking_changes?(new_version).must_equal true
+      _(c.breaking_changes?(new_version)).must_equal true
     end
 
     it "returns false when it's a small patch" do
@@ -78,7 +78,7 @@ describe DownloadTV::Configuration do
       split[2] = (split[2].to_i - 1).to_s
       new_version = split.join('.')
       c = DownloadTV::Configuration.new(path: config_path)
-      c.breaking_changes?(new_version).must_equal false
+      _(c.breaking_changes?(new_version)).must_equal false
     end
   end
 
@@ -90,7 +90,7 @@ describe DownloadTV::Configuration do
         end
       end
 
-      File.exist?(config_path).must_equal true
+      _(File.exist?(config_path)).must_equal true
     end
 
     it 'will have the right values' do
@@ -101,15 +101,15 @@ describe DownloadTV::Configuration do
         end
       end
 
-      c.content[:myepisodes_user].must_equal 'anything'
-      c.content[:cookie].must_equal true
-      c.content[:ignored].must_equal ['anything']
-      c.content[:auto].must_equal true
-      c.content[:subs].must_equal true
-      c.content[:pending].must_equal []
-      c.content[:grabber].must_equal 'TorrentAPI'
-      c.content[:date].must_equal(Date.today - 1)
-      c.content[:version].must_equal DownloadTV::VERSION
+      _(c.content[:myepisodes_user]).must_equal 'anything'
+      _(c.content[:cookie]).must_equal true
+      _(c.content[:ignored]).must_equal ['anything']
+      _(c.content[:auto]).must_equal true
+      _(c.content[:subs]).must_equal true
+      _(c.content[:pending]).must_equal []
+      _(c.content[:grabber]).must_equal 'TorrentAPI'
+      _(c.content[:date]).must_equal(Date.today - 1)
+      _(c.content[:version]).must_equal DownloadTV::VERSION
     end
 
     it 'will set the cookie value to false when explicitly told so' do
@@ -120,7 +120,7 @@ describe DownloadTV::Configuration do
         end
       end
 
-      c.content[:cookie].must_equal false
+      _(c.content[:cookie]).must_equal false
     end
 
     it 'will separate the ignored values by commas' do
@@ -130,7 +130,7 @@ describe DownloadTV::Configuration do
           c = DownloadTV::Configuration.new(path: config_path)
         end
       end
-      c.content[:ignored].must_equal ['ignored1', 'itsgone', 'ignored 2']
+      _(c.content[:ignored]).must_equal ['ignored1', 'itsgone', 'ignored 2']
     end
   end
 
@@ -147,22 +147,22 @@ describe DownloadTV::Configuration do
       content = JSON.parse(source, symbolize_names: true)
       content[:date] = Date.parse(content[:date])
 
-      content[:cookie].must_equal true
-      content[:myepisodes_user].must_equal 'anything'
-      content[:ignored].must_equal ['anything']
-      content[:auto].must_equal true
-      content[:subs].must_equal true
-      content[:pending].must_equal []
-      content[:grabber].must_equal 'TorrentAPI'
-      content[:date].must_equal Date.today - 1
-      content[:version].must_equal DownloadTV::VERSION
+      _(content[:cookie]).must_equal true
+      _(content[:myepisodes_user]).must_equal 'anything'
+      _(content[:ignored]).must_equal ['anything']
+      _(content[:auto]).must_equal true
+      _(content[:subs]).must_equal true
+      _(content[:pending]).must_equal []
+      _(content[:grabber]).must_equal 'TorrentAPI'
+      _(content[:date]).must_equal Date.today - 1
+      _(content[:version]).must_equal DownloadTV::VERSION
     end
   end
 
   describe 'the constructor' do
     it 'will trigger a configuration change when asked to' do
       create_dummy_config(config_path, auto: false)
-      File.exist?(config_path).must_equal true
+      _(File.exist?(config_path)).must_equal true
       c = nil
 
       run_silently do
@@ -171,7 +171,7 @@ describe DownloadTV::Configuration do
         end
       end
 
-      c.content[:auto].must_equal false
+      _(c.content[:auto]).must_equal false
     end
   end
 end

data/test/downloader_test.rb

@@ -17,8 +17,8 @@ describe DownloadTV::Downloader do
   describe 'when creating the object' do
     it 'can receive an optional configuration hash' do
       dl = DownloadTV::Downloader.new(auto: true, grabber: 'KAT', path: config_path)
-      dl.config.content[:auto].must_equal true
-      dl.config.content[:grabber].must_equal 'KAT'
+      _(dl.config.content[:auto]).must_equal true
+      _(dl.config.content[:grabber]).must_equal 'KAT'
     end
   end
 
@@ -30,7 +30,7 @@ describe DownloadTV::Downloader do
                 'Baz The Story S05E22']
 
       dl = DownloadTV::Downloader.new(ignored: [], path: config_path)
-      dl.fix_names(shows).must_equal result
+      _(dl.fix_names(shows)).must_equal result
     end
   end
 
@@ -40,14 +40,14 @@ describe DownloadTV::Downloader do
       result = ['Bar S00E22']
 
       dl = DownloadTV::Downloader.new(ignored: ['ignored'], path: config_path)
-      dl.reject_ignored(shows).must_equal result
+      _(dl.reject_ignored(shows)).must_equal result
     end
   end
 
   describe 'the check_date method' do
     it 'exits the script when up to date' do
       dl = DownloadTV::Downloader.new(date: Date.today, path: config_path)
-      dl.check_date(0).must_be_nil
+      _(dl.check_date(0)).must_be_nil
     end
 
     it 'uses the offset to adjust the date' do
@@ -56,8 +56,8 @@ describe DownloadTV::Downloader do
 
       date = dl.check_date(1)
 
-      date.must_equal(Date.today - 1)
-      dl.config.content[:date].must_equal Date.today
+      _(date).must_equal(Date.today - 1)
+      _(dl.config.content[:date]).must_equal Date.today
     end
   end
 
@@ -67,7 +67,7 @@ describe DownloadTV::Downloader do
       dl = DownloadTV::Downloader.new(path: config_path, filters: f)
       links = [['Link 1', ''], ['Link 2 2160p', ''], ['Link 3', '']]
       res = [['Link 1', ''], ['Link 3', '']]
-      dl.filter_shows(links).must_equal res
+      _(dl.filter_shows(links)).must_equal res
     end
 
     it 'removes names without include words in them' do
@@ -76,7 +76,7 @@ describe DownloadTV::Downloader do
       links = [['Link 1', ''], ['Link 2 2160p', ''], ['Link 3', ''],
                ['Link REPACK 5', '']]
       res = [['Link REPACK 5', '']]
-      dl.filter_shows(links).must_equal res
+      _(dl.filter_shows(links)).must_equal res
     end
 
     it "doesn't apply a filter if it would reject every option" do
@@ -84,7 +84,7 @@ describe DownloadTV::Downloader do
       dl = DownloadTV::Downloader.new(path: config_path, filters: f)
       links = [['Link 1 720p', ''], ['Link 2 2160p', ''], ['Link 720p 3', '']]
       res = [['Link 1 720p', ''], ['Link 720p 3', '']]
-      dl.filter_shows(links).must_equal res
+      _(dl.filter_shows(links)).must_equal res
     end
   end
 
@@ -95,13 +95,13 @@ describe DownloadTV::Downloader do
 
       t.expect(:get_links, [], [show])
       dl = DownloadTV::Downloader.new(auto: true, path: config_path, pending: ['show 11'])
-      dl.get_link(t, show, true).must_equal ''
-      dl.config.content[:pending].must_equal ['show 11', show]
+      _(dl.get_link(t, show, true)).must_equal ''
+      _(dl.config.content[:pending]).must_equal ['show 11', show]
 
       t.expect(:get_links, [], [show])
       dl = DownloadTV::Downloader.new(auto: false, path: config_path, pending: [])
-      dl.get_link(t, show, true).must_equal ''
-      dl.config.content[:pending].must_include show
+      _(dl.get_link(t, show, true)).must_equal ''
+      _(dl.config.content[:pending]).must_include show
 
       t.verify
     end
@@ -112,7 +112,7 @@ describe DownloadTV::Downloader do
 
       t.expect(:get_links, [['Name 1', 'Link 1'], ['Name 2', 'Link 2']], [show])
       dl = DownloadTV::Downloader.new(auto: true, path: config_path)
-      dl.get_link(t, show).must_equal 'Link 1'
+      _(dl.get_link(t, show)).must_equal 'Link 1'
       t.verify
     end
   end
@@ -123,7 +123,7 @@ describe DownloadTV::Downloader do
       RbConfig::CONFIG['host_os'] = 'linux-gnu'
 
       dl = DownloadTV::Downloader.new(path: config_path)
-      dl.detect_os.must_equal 'xdg-open'
+      _(dl.detect_os).must_equal 'xdg-open'
 
       RbConfig::CONFIG['host_os'] = prev
     end
@@ -133,7 +133,7 @@ describe DownloadTV::Downloader do
       RbConfig::CONFIG['host_os'] = 'darwin15.6.0'
 
       dl = DownloadTV::Downloader.new(path: config_path)
-      dl.detect_os.must_equal 'open'
+      _(dl.detect_os).must_equal 'open'
 
       RbConfig::CONFIG['host_os'] = prev
     end
@@ -144,8 +144,8 @@ describe DownloadTV::Downloader do
 
       dl = DownloadTV::Downloader.new(path: config_path)
 
-      to_run = -> { run_silently { dl.detect_os.must_equal 'xdg-open' } }
-      to_run.must_raise SystemExit
+      to_run = -> { run_silently { _(dl.detect_os).must_equal 'xdg-open' } }
+      _(to_run).must_raise SystemExit
 
       RbConfig::CONFIG['host_os'] = prev
     end

data/test/grabbers_test.rb

@@ -11,30 +11,30 @@ describe DownloadTV::LinkGrabber do
       next unless grabber.online?
 
       it 'will have a url attribute on creation' do
-        grabber.url.wont_be_nil
+        _(grabber.url).wont_be_nil
       end
 
       it "will raise NoTorrentsError when torrent can't be found" do
         notfound = -> { grabber.get_links('Totally Fake Show askjdgsaudas') }
-        notfound.must_raise DownloadTV::NoTorrentsError
+        _(notfound).must_raise DownloadTV::NoTorrentsError
       end
 
       it 'will return an array with names and links of results when a torrent can be found' do
-        result = grabber.get_links('Game Of Thrones S04E01')
-        result.must_be_instance_of Array
-        result.wont_be :empty?
+        result = grabber.get_links('The Boys S01E01')
+        _(result).must_be_instance_of Array
+        _(result).wont_be :empty?
         result.each do |r|
-          r.size.must_equal 2
-          r[0].must_be_instance_of String
-          r[0].upcase.must_include 'THRONES'
-          r[1].must_be_instance_of String
-          r[1].must_include 'magnet:'
+          _(r.size).must_equal 2
+          _(r[0]).must_be_instance_of String
+          _(r[0].upcase).must_include 'BOYS'
+          _(r[1]).must_be_instance_of String
+          _(r[1]).must_include 'magnet:'
         end
       end
     end
   end
 
   it "raises an error if the instance doesn't implement get_links" do
-    -> { DownloadTV::LinkGrabber.new('').get_links('test') }.must_raise NotImplementedError
+    _(-> { DownloadTV::LinkGrabber.new('').get_links('test') }).must_raise NotImplementedError
   end
 end

data/test/torrent_test.rb

@@ -10,16 +10,16 @@ describe DownloadTV::Torrent do
     end
 
     it 'will populate the instances' do
-      @t.g_instances.size.must_equal grabber_names.size
+      _(@t.g_instances.size).must_equal grabber_names.size
     end
 
     it 'will start with all tries available' do
-      @t.tries.must_equal grabber_names.size - 1
+      _(@t.tries).must_equal grabber_names.size - 1
     end
 
     it 'will call get_links on its grabber' do
       @t.g_instances.first.stub :get_links, %w[test result] do
-        @t.get_links('test show').must_equal %w[test result]
+        _(@t.get_links('test show')).must_equal %w[test result]
       end
     end
   end
@@ -28,13 +28,13 @@ describe DownloadTV::Torrent do
     it 'has a default order' do
       t = DownloadTV::Torrent.new(nil)
       expected = grabber_names.map { |i| "DownloadTV::#{i}" }
-      t.g_instances.map { |i| i.class.name }.must_equal expected
+      _(t.g_instances.map { |i| i.class.name }).must_equal expected
     end
 
     grabber_names.each do |g|
       it 'correctly uses the given grabber first' do
         t = DownloadTV::Torrent.new(g)
-        t.g_instances.first.class.name.must_equal "DownloadTV::#{g}"
+        _(t.g_instances.first.class.name).must_equal "DownloadTV::#{g}"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - guille
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,18 +40,46 @@ dependencies:
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - guillerg96@gmail.com
 executables:
@@ -119,7 +147,7 @@ homepage: https://github.com/guille/download_tv
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: DownloadTV is a tool that allows the user to find magnet links for tv show
   episodes. It accepts shows as arguments, from a file or it can integrate with your