download_tv 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0609cdca28acf2d4f0800aaf0b0534532838940
-  data.tar.gz: e1dcf35af5fd713796bf79d3281d44db5b14a45b
+  metadata.gz: 523099a5025846b793c54ead376345f8cb333012
+  data.tar.gz: 49e788cd21f2c40f3b4cc161c73a759cef1f873b
 SHA512:
-  metadata.gz: 280c785035e34c5b05c05a00cca09a2ac84dcc20c70bdc8515ad1bfa98414cfbcd91406f1ac9a587ba013b0c97b4e301ae2375c9dcc71b3e5306125c14402150
-  data.tar.gz: 1a82fccad76d549fd7afa47f51cb60a479aae2431b94cdf786f11adb880445814b142f812ceff21f975974dd6938114feb7e0c4f12a735d52c4c8e28d7e12d61
+  metadata.gz: 1a868b47c7d77f4b600bb487cbdb58553d7570920e8dd1b8a329d6d930744886cb5e8317f11e85c67cb42c6bd8f57327181d47e24af9c04f2d4e618496c9e4f5
+  data.tar.gz: d64ed3bebededda5d7c6da6b24265a88cd9bb049ed27ac829f5b4f53e172febaecf3d813b759817e543facd7358a7f9a1aea7e4d56a6edf64214731c494efa3b

data/bin/tv

@@ -34,7 +34,7 @@ opt_parser = OptionParser.new do |opts|
 		options[:cmd] = "config"
 	end
 
-	opts.on("--show-config", "Show current configuration values") do |n|
+	opts.on("--show-config", "Show current configuration values") do
 		options[:cmd] = "showconfig"
 	end
 
@@ -50,6 +50,20 @@ opt_parser = OptionParser.new do |opts|
 		options[:subs] = n
 	end
 
+	opts.on("-g", "--grabber GRABBER", "Use given grabber as first option") do |g|
+		options[:grabber] = g
+	end
+
+	opts.on("--show-grabbers", "List available grabbers") do
+		puts DownloadTV::Torrent.new.grabbers
+		exit
+	end
+
+	opts.on("-v", "Print version") do
+		puts DownloadTV::VERSION
+		exit
+	end
+
 	opts.on_tail("-h", "--help", "Show this message") do
 		puts opts
 		exit
@@ -59,7 +73,7 @@ end
 opt_parser.parse!(ARGV)
 
 begin
-	dl = DownloadTV::Downloader.new(options[:offset], options[:auto], options[:subs])
+	dl = DownloadTV::Downloader.new(options[:offset], options[:auto], options[:subs], options[:grabber])
 	case options[:cmd]
 		when "run"
 			dl.run(options[:dry])

data/lib/download_tv/downloader.rb

@@ -2,13 +2,14 @@ module DownloadTV
 
 	class Downloader
 
-		attr_reader :offset, :auto, :subs
+		attr_reader :offset, :auto, :subs, :grabber
 		attr_accessor :config
 
-		def initialize(offset, auto, subs, config={})
+		def initialize(offset, auto, subs, grabber, config={})
 			@offset = offset.abs
 			@auto = auto
 			@subs = subs
+			@grabber = grabber
 			if config.empty?
 				@config = Configuration.new.content # Load configuration
 			else
@@ -19,7 +20,7 @@ module DownloadTV
 		end
 
 		def download_single_show(show)
-			t = Torrent.new
+			t = Torrent.new(@grabber)
 			download(t.get_link(show, @auto))
 		end
 
@@ -27,7 +28,7 @@ module DownloadTV
 		def download_from_file(filename)
 			filename = File.realpath(filename)
 			raise "File doesn't exist" if !File.exists? filename
-			t = Torrent.new
+			t = Torrent.new(@grabber)
 			File.readlines(filename).each { |show| download(t.get_link(show, @auto)) }
 
 		end
@@ -49,7 +50,7 @@ module DownloadTV
 				puts "Nothing to download"
 
 			else
-				t = Torrent.new
+				t = Torrent.new(@grabber)
 				to_download = fix_names(shows)
 
 				queue = Queue.new

data/lib/download_tv/grabbers/kat.rb

@@ -0,0 +1,34 @@
+module DownloadTV
+	class KAT < LinkGrabber
+		def initialize
+			super('https://katcr.co/new/search-torrents.php?search="%s"&sort=seeders&order=desc')
+		end
+
+		def get_links(s)
+
+			# Format the url
+			search = @url % [s]
+
+			data = @agent.get(search).links.select {|i| i.href.include? "torrents-details.php?" }
+			
+			raise NoTorrentsError if data == []
+
+			# Remove duplicates
+			data.keep_if { |i| i.text != "" }
+
+			names = data.collect &:text
+			links = []
+
+			data.each do |res|
+				page = res.click
+				links << page.search('a.kaGiantButton[title="Magnet link"]').attribute("href").text
+			end
+
+			names.zip(links)
+			
+		end
+		
+		
+	end
+	
+end

data/lib/download_tv/torrent.rb

@@ -4,12 +4,19 @@ module DownloadTV
 
 		attr_reader :g_names, :g_instances, :n_grabbers
 
-		def initialize
-			@g_names = ["Eztv", "ThePirateBay", "TorrentAPI"]
+		def grabbers
+			["Eztv", "KAT", "ThePirateBay", "TorrentAPI"]
+		end
+
+		def initialize(default_grabber=nil)
+			@g_names = grabbers
 			@g_instances = Array.new
 			@n_grabbers = @g_names.size # Initial size
 			@tries = @n_grabbers - 1
 
+			# Silently ignores bad names
+			@g_names.rotate! @g_names.find_index(default_grabber).to_i
+
 			@filters = [
 				->(n){n.include?("2160")},
 				->(n){n.include?("1080")},

data/lib/download_tv/version.rb

@@ -1,3 +1,3 @@
 module DownloadTV
-  VERSION = "2.0.6"
+  VERSION = "2.1.0"
 end

data/test/downloader_test.rb

@@ -7,38 +7,44 @@ describe DownloadTV::Downloader do
 	end
 
 	describe "when creating the object" do
-		it "should receive three parameters" do
+		it "should receive four parameters" do
 			->{ DownloadTV::Downloader.new(0) }.must_raise ArgumentError
 			->{ DownloadTV::Downloader.new(0, true) }.must_raise ArgumentError
+			->{ DownloadTV::Downloader.new(0, true, true) }.must_raise ArgumentError
 		end
 
 		it "can receive an optional configuration hash" do
-			DownloadTV::Downloader.new(0, true, true, {:hi => 1}).config.must_equal ({:hi => 1})
+			DownloadTV::Downloader.new(0, true, true, nil, {:hi => 1}).config.must_equal ({:hi => 1})
 		end
 
 		it "should receive an integer for the offset" do
-			->{ DownloadTV::Downloader.new("foo", true, true, {1=>1}) }.must_raise NoMethodError
+			->{ DownloadTV::Downloader.new("foo", true, true, nil, {1=>1}) }.must_raise NoMethodError
 		end
 
 		it "should store the first argument as @offset" do
-			DownloadTV::Downloader.new(3, true, true, {1=>1}).offset.must_equal 3
+			DownloadTV::Downloader.new(3, true, true, nil, {1=>1}).offset.must_equal 3
 		end
 
 		it "should store the second argument as @auto" do
-			DownloadTV::Downloader.new(3, true, true, {1=>1}).auto.must_equal true
-			DownloadTV::Downloader.new(3, false, true, {1=>1}).auto.must_equal false
+			DownloadTV::Downloader.new(3, true, true, nil, {1=>1}).auto.must_equal true
+			DownloadTV::Downloader.new(3, false, true, nil, {1=>1}).auto.must_equal false
 		end
 
-		it "should store the second argument as @subs" do
-			DownloadTV::Downloader.new(3, true, true, {1=>1}).subs.must_equal true
-			DownloadTV::Downloader.new(3, true, false, {1=>1}).subs.must_equal false
+		it "should store the third argument as @subs" do
+			DownloadTV::Downloader.new(3, true, true, nil, {1=>1}).subs.must_equal true
+			DownloadTV::Downloader.new(3, true, false, nil, {1=>1}).subs.must_equal false
+		end
+
+		it "should store the fourth argument as @grabber" do
+			DownloadTV::Downloader.new(3, true, true, "KAT", {1=>1}).grabber.must_equal "KAT"
+			DownloadTV::Downloader.new(3, true, false, nil, {1=>1}).grabber.must_be_nil
 		end
 
 	end
 
 	describe "the fix_names function" do
 		config = {:ignored => ["Ignored"]}
-		dl = DownloadTV::Downloader.new(0, true, true, config)
+		dl = DownloadTV::Downloader.new(0, true, true, nil, config)
 
 		it "should remove apostrophes, colons and parens" do
 			shows = ["Mr. Foo S01E02", "Bar (UK) S00E22", "Let's S05E03", "Baz: The Story S05E22"]
@@ -56,7 +62,7 @@ describe DownloadTV::Downloader do
 
 
 	describe "the date file" do 
-		dl = DownloadTV::Downloader.new(0, true, true, {1=>1})
+		dl = DownloadTV::Downloader.new(0, true, true, nil, {1=>1})
 
 		it "should be created if it doesn't exist" do
 			dl.check_date

data/test/grabbers_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 describe DownloadTV::LinkGrabber do
 
-	grabbers = ["Eztv", "ThePirateBay", "TorrentAPI"]
+	grabbers = DownloadTV::Torrent.new.grabbers
 	instances = grabbers.map { |g| (DownloadTV.const_get g).new }
 
 	instances.each do |grabber|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - guille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,7 @@ files:
 - lib/download_tv/downloader.rb
 - lib/download_tv/grabbers/addic7ed.rb
 - lib/download_tv/grabbers/eztv.rb
+- lib/download_tv/grabbers/kat.rb
 - lib/download_tv/grabbers/torrentapi.rb
 - lib/download_tv/grabbers/tpb.rb
 - lib/download_tv/linkgrabber.rb