download_tv 2.6.6 → 2.6.7

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[:auto]).must_equal true
+      _(dl.config[:grabber]).must_equal 'KAT'
     end
   end
 
@@ -57,7 +57,7 @@ describe DownloadTV::Downloader do
       date = dl.date_to_check_from(1)
 
       _(date).must_equal(Date.today - 1)
-      _(dl.config.content[:date]).must_equal Date.today
+      _(dl.config[:date]).must_equal Date.today
     end
   end
 
@@ -96,12 +96,12 @@ 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, save_pending: true)).must_be_nil
-      _(dl.config.content[:pending]).must_equal ['show 11', show]
+      _(dl.config[: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, save_pending: true)).must_be_nil
-      _(dl.config.content[:pending]).must_include show
+      _(dl.config[:pending]).must_include show
 
       t.verify
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.6.7
 platform: ruby
 authors:
 - guille
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -131,19 +132,22 @@ files:
 - lib/download_tv/downloader.rb
 - lib/download_tv/filterer.rb
 - lib/download_tv/grabbers/eztv.rb
-- lib/download_tv/grabbers/kat.rb
 - lib/download_tv/grabbers/torrentapi.rb
-- lib/download_tv/grabbers/torrentz2.rb
+- lib/download_tv/grabbers/torrentz.rb
 - lib/download_tv/grabbers/tpb.rb
 - lib/download_tv/linkgrabber.rb
 - lib/download_tv/myepisodes.rb
 - lib/download_tv/torrent.rb
 - lib/download_tv/version.rb
-- test/config_test.rb
+- spec/download_tv/configuration_spec.rb
+- spec/download_tv/filterer_spec.rb
+- spec/download_tv/linkgrabber_spec.rb
+- spec/download_tv/myepisodes_spec.rb
+- spec/download_tv/torrent_spec.rb
+- spec/spec_helper.rb
 - test/downloader_test.rb
 - test/grabbers_test.rb
 - test/test_helper.rb
-- test/torrent_test.rb
 homepage: https://github.com/guille/download_tv
 licenses:
 - MIT
@@ -170,8 +174,6 @@ summary: DownloadTV is a tool that allows the user to find magnet links for tv s
   episodes. It accepts shows as arguments, from a file or it can integrate with your
   MyEpisodes account.
 test_files:
-- test/config_test.rb
 - test/downloader_test.rb
 - test/grabbers_test.rb
 - test/test_helper.rb
-- test/torrent_test.rb

data/lib/download_tv/grabbers/kat.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module DownloadTV
-  ##
-  # KATcr.co grabber
-  class KAT < LinkGrabber
-    attr_reader :max_tries
-
-    def initialize
-      super('https://katcr.co/advanced-usearch/')
-      @max_tries = 5
-    end
-
-    def get_links(show)
-      tries = 0
-
-      params = {
-        'category': 'TV',
-        'orderby': 'seeds-desc',
-        'search': show
-      }
-
-      data = @agent.post(@url, params)
-                   .search('tbody tr td[1]')
-
-      names = data.map do |i|
-        i.search('a.torrents_table__torrent_title b')
-         .text
-      end
-
-      links = data.map do |i|
-        i.search('div.torrents_table__actions a[3]')
-         .first
-         .attribute('href')
-         .text
-      end
-
-      raise NoTorrentsError if data.empty?
-
-      names.zip(links)
-    rescue Net::HTTP::Persistent::Error => e
-      raise unless e.message =~ /too many connection resets/
-      raise if tries >= @max_tries
-
-      tries += 1
-      retry
-    end
-  end
-end

data/lib/download_tv/grabbers/torrentz2.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module DownloadTV
-  ##
-  # EZTV.ag grabber
-  class Torrentz < LinkGrabber
-    def initialize
-      super('https://torrentzeu.org/kick.php?q=%s')
-    end
-
-    def get_links(show)
-      raw_data = @agent.get(format(@url, show))
-      results = raw_data.search('tbody tr')
-
-      # require 'byebug'; byebug
-
-      raise NoTorrentsError if results.empty?
-
-      data = results.sort_by { |e| e.search('td[data-title="Last Updated"]')[1].text.to_i }.reverse
-
-      data.collect do |i|
-        [i.children[1].text.strip,
-         i.children[11].children[1].attribute('href').text]
-      end
-    end
-  end
-end

data/test/config_test.rb

@@ -1,175 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-describe DownloadTV::Configuration do
-  config_path = File.realdirpath("#{__dir__}/test_config")
-
-  before do
-    Dir.chdir(__dir__)
-  end
-
-  after do
-    File.delete(config_path) if File.exist?(config_path)
-  end
-
-  describe 'when the file already exists' do
-    it 'will load the existing configuration (blank)' do
-      create_dummy_config(config_path)
-
-      c = DownloadTV::Configuration.new(path: config_path)
-      _(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)
-    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)
-    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]
-    end
-  end
-
-  describe 'the breaking_changes method' do
-    it 'returns nil when both versions are equal' do
-      create_dummy_config(config_path)
-
-      c = DownloadTV::Configuration.new(path: config_path)
-      _(c.breaking_changes?(DownloadTV::VERSION)).must_be_nil
-    end
-
-    it "returns true when there's been a major update" do
-      create_dummy_config(config_path)
-
-      split = DownloadTV::VERSION.split('.')
-      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
-    end
-
-    it "returns true when there's been a minor update" do
-      create_dummy_config(config_path)
-
-      split = DownloadTV::VERSION.split('.')
-      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
-    end
-
-    it "returns false when it's a small patch" do
-      create_dummy_config(config_path)
-
-      split = DownloadTV::VERSION.split('.')
-      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
-    end
-  end
-
-  describe "when the file doesn't exist" do
-    it 'will create a new one' do
-      run_silently do
-        STDIN.stub :gets, 'myepisodes\ncookie\nignored' do
-          DownloadTV::Configuration.new(path: config_path)
-        end
-      end
-
-      _(File.exist?(config_path)).must_equal true
-    end
-
-    it 'will have the right values' do
-      c = nil
-      run_silently do
-        STDIN.stub :gets, 'anything' do
-          c = DownloadTV::Configuration.new(path: config_path)
-        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[: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
-      c = nil
-      run_silently do
-        STDIN.stub :gets, 'n' do
-          c = DownloadTV::Configuration.new(path: config_path)
-        end
-      end
-
-      _(c.content[:cookie]).must_equal false
-    end
-
-    it 'will separate the ignored values by commas' do
-      c = nil
-      run_silently do
-        STDIN.stub :gets, 'ignored1, itsgone, ignored 2' do
-          c = DownloadTV::Configuration.new(path: config_path)
-        end
-      end
-      _(c.content[:ignored]).must_equal ['ignored1', 'itsgone', 'ignored 2']
-    end
-  end
-
-  describe 'the serialize method' do
-    it 'stores the configuration in a JSON file' do
-      # Calls serialize
-      run_silently do
-        STDIN.stub :gets, 'anything' do
-          DownloadTV::Configuration.new(path: config_path)
-        end
-      end
-      # content = File.open(config_path, 'rb') { |f| Marshal.load(f) }
-      source = File.read(config_path)
-      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[: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
-      c = nil
-
-      run_silently do
-        STDIN.stub :gets, 'anything' do
-          c = DownloadTV::Configuration.new(path: config_path)
-        end
-      end
-
-      _(c.content[:auto]).must_equal false
-    end
-  end
-end

data/test/torrent_test.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-describe DownloadTV::Torrent do
-  grabber_names = DownloadTV::Torrent.new(nil).grabbers
-  describe 'when creating the object' do
-    before do
-      @t = DownloadTV::Torrent.new
-    end
-
-    it 'will populate the instances' do
-      _(@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
-    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]
-      end
-    end
-  end
-
-  describe 'when giving it a default grabber' 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
-    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}"
-      end
-    end
-  end
-end