download_tv 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 523099a5025846b793c54ead376345f8cb333012
-  data.tar.gz: 49e788cd21f2c40f3b4cc161c73a759cef1f873b
+  metadata.gz: 358854a4a50e549541b64dfa8e3279998a3c7a12
+  data.tar.gz: 643f9a41e0c91866228469a26371c35cfda7be82
 SHA512:
-  metadata.gz: 1a868b47c7d77f4b600bb487cbdb58553d7570920e8dd1b8a329d6d930744886cb5e8317f11e85c67cb42c6bd8f57327181d47e24af9c04f2d4e618496c9e4f5
-  data.tar.gz: d64ed3bebededda5d7c6da6b24265a88cd9bb049ed27ac829f5b4f53e172febaecf3d813b759817e543facd7358a7f9a1aea7e4d56a6edf64214731c494efa3b
+  metadata.gz: f5ae32db31ab5bd149b5c8d1165142b61a7a2df3b41d91c96e9cbbe31f8846333de4b9a5d01b6b34f7f162c68623d0382b7e94dd55e6e1a20a239fa486bbac4d
+  data.tar.gz: 8b6423716c1bc322aed18bb778160cc5bd1a618a31cfcd3a984f788959c76009f7db80d78c44bf548a25646149f493476a2f16bdbf5e23410356902812457989

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/guille/download_tv.svg?branch=master)](https://travis-ci.org/guille/download_tv)
 [![Gem Version](https://badge.fury.io/rb/download_tv.svg)](https://badge.fury.io/rb/download_tv)
+[![Code Climate](https://codeclimate.com/github/guille/download_tv.svg)](https://codeclimate.com/github/guille/download_tv)
 
 download_tv is a Ruby command line application that automatically downloads the new episodes from the shows you follow. It grabs the list of shows from your MyEpisodes account.
 
@@ -21,10 +22,13 @@ Specific options:
     -f, --file PATH                  Download shows from a file
     -d, --download SHOW              Downloads given show
     -c, --configure                  Configures defaults
-    --show-config                Show current configuration values
-    --dry-run                    Don't write to the date file
+        --show-config                Show current configuration values
+        --dry-run                    Don't write to the date file
     -a, --[no-]auto                  Automatically find links
     -s, --[no-]subtitles             Download subtitles
+    -g, --grabber GRABBER            Use given grabber as first option
+        --show-grabbers              List available grabbers
+    -v                               Print version
     -h, --help                       Show this message
 
 ```

data/bin/tv

@@ -5,10 +5,9 @@ require 'download_tv'
 
 options = {}
 options[:offset] = 0
-options[:auto] = true
-options[:subs] = true
 options[:dry] = false
 options[:cmd] = "run"
+config = {}
 
 opt_parser = OptionParser.new do |opts|
 	opts.banner = "Usage: tv [options]"
@@ -43,15 +42,15 @@ opt_parser = OptionParser.new do |opts|
 	end
 
 	opts.on("-a", "--[no-]auto", "Automatically find links") do |n|
-		options[:auto] = n
+		config[:auto] = n
 	end
 
 	opts.on("-s", "--[no-]subtitles", "Download subtitles") do |n|
-		options[:subs] = n
+		config[:subs] = n
 	end
 
 	opts.on("-g", "--grabber GRABBER", "Use given grabber as first option") do |g|
-		options[:grabber] = g
+		config[:grabber] = g
 	end
 
 	opts.on("--show-grabbers", "List available grabbers") do
@@ -73,19 +72,20 @@ end
 opt_parser.parse!(ARGV)
 
 begin
-	dl = DownloadTV::Downloader.new(options[:offset], options[:auto], options[:subs], options[:grabber])
 	case options[:cmd]
 		when "run"
+			dl = DownloadTV::Downloader.new(options[:offset], config)
 			dl.run(options[:dry])
 		when "dl"
+			dl = DownloadTV::Downloader.new(options[:offset], config)
 			dl.download_single_show(options[:arg])
 		when "file"
+			dl = DownloadTV::Downloader.new(options[:offset], config)
 			dl.download_from_file(options[:arg])
 		when "config"
-			DownloadTV::Configuration.new true
+			DownloadTV::Configuration.new(config, true)
 		when "showconfig"
-			DownloadTV::Configuration.new.print_config
-
+			DownloadTV::Configuration.new(config).print_config
 	end
 rescue Interrupt
 	puts "Interrupt signal detected. Exiting..."

data/download_tv.gemspec

@@ -9,17 +9,16 @@ Gem::Specification.new do |s|
   s.authors       = ["guille"]
   s.email         = ["guillerg96@gmail.com"]
 
-  s.summary       = %q{DownloadTV finds the next episodes from shows you follow on MyEpisodes and downloads them.}
+  s.summary       = %q{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 MyEpisodes account.}
   s.homepage      = "https://github.com/guille/download_tv"
 
   s.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test)/})
   end
-  # s.files       = `git ls-files -- lib/*`.split($/)
+
   s.test_files  = `git ls-files -- test/*`.split($/)
   s.require_paths = ["lib"]
 
-  # s.bindir        = "exe"
   s.executables   = ["tv"]
   s.default_executable = 'tv'
 

data/lib/download_tv/configuration.rb

@@ -1,15 +1,18 @@
 module DownloadTV
 	class Configuration
-		attr_reader :content
+		attr_reader :content, :config_path
 		
-		def initialize(force_change=false)
+		def initialize(content={}, force_change=false)
 			Dir.chdir(__dir__)
+
+			@config_path = content[:path] || "config"
 			
-			if File.exists? "config"
-				@content = File.open("config", "rb") {|f| Marshal.load(f)}
+			if File.exist? @config_path
+				@content = File.open(@config_path, "rb") { |f| Marshal.load(f) }
+				@content.merge!(content) unless content.empty?
 				change_configuration if force_change
 			else
-				@content = {}
+				@content = content
 				change_configuration
 			end
 		end
@@ -32,15 +35,21 @@ module DownloadTV
 				puts "Enter a comma-separated list of shows to ignore: "
 			end
 			
-			@content[:ignored] = STDIN.gets.chomp.split(",").map(&:strip)
+			@content[:ignored] = STDIN.gets.chomp.split(",").map(&:strip).map(&:downcase)
 			STDOUT.flush
 
+			# When modifying existing config, keeps previous values
+			# When creating new one, sets defaults
+			@content[:auto] ||= true
+			@content[:subs] ||= true
+			@content[:grabber] ||= "TorrentAPI"
+
 			serialize()
 		end
 
 
 		def serialize
-			File.open("config", "wb") {|f| Marshal.dump(@content, f)}			
+			File.open(@config_path, "wb") { |f| Marshal.dump(@content, f) }
 		end
 		
 

data/lib/download_tv/downloader.rb

@@ -2,43 +2,48 @@ module DownloadTV
 
 	class Downloader
 
-		attr_reader :offset, :auto, :subs, :grabber
-		attr_accessor :config
+		attr_reader :offset, :config
+
+		def initialize(offset=0, config={})
+			# Change to installation directory
+			Dir.chdir(__dir__)
 
-		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
-				@config = config
-			end
+			@config = Configuration.new(config).content # Load configuration
+			
+			@filters = [
+				->(n){ n.include?("2160p") },
+				->(n){ n.include?("1080p") },
+				->(n){ n.include?("720p")  },
+				->(n){ n.include?("WEB")   },
+				->(n){ !n.include?("PROPER") && !n.include?("REPACK") },
+			]
 			
 			Thread.abort_on_exception = true
 		end
 
 		def download_single_show(show)
-			t = Torrent.new(@grabber)
-			download(t.get_link(show, @auto))
+			t = Torrent.new(@config[:grabber])
+			download(get_link(t, show))
 		end
 
 
+		##
+		# Given a file containing a list of episodes (one per line), it tries to find download links for each
 		def download_from_file(filename)
+			if !File.exist? filename
+				puts "Error: #{filename} not found" 
+				exit 1
+			end
 			filename = File.realpath(filename)
-			raise "File doesn't exist" if !File.exists? filename
-			t = Torrent.new(@grabber)
-			File.readlines(filename).each { |show| download(t.get_link(show, @auto)) }
-
+			t = Torrent.new(@config[:grabber])
+			File.readlines(filename).each { |show| download(get_link(t, show)) }
 		end
 
 		##
-		# Gets the links.
+		# Finds download links for all new episodes aired since the last run of the program
+		# It connects to MyEpisodes in order to find which shows to track and which new episodes aired.
 		def run(dont_write_to_date_file)
-			# Change to installation directory
-			Dir.chdir(__dir__)
-			
 			date = check_date
 
 			myepisodes = MyEpisodes.new(@config[:myepisodes_user], @config[:cookie])
@@ -50,14 +55,14 @@ module DownloadTV
 				puts "Nothing to download"
 
 			else
-				t = Torrent.new(@grabber)
+				t = Torrent.new(@config[:grabber])
 				to_download = fix_names(shows)
 
 				queue = Queue.new
 				
 				# Adds a link (or empty string to the queue)
 				link_t = Thread.new do
-					to_download.each { |show| queue << t.get_link(show, @auto) }
+					to_download.each { |show| queue << get_link(t, show) }
 				end
 
 				# Downloads the links as they are added
@@ -70,7 +75,7 @@ module DownloadTV
 				end
 
 				# Downloading the subtitles
-				# subs_t = @subs and Thread.new do
+				# subs_t = @config[:subs] and Thread.new do
 				# 	to_download.each { |show| @s.get_subs(show) }
 				# end
 
@@ -84,7 +89,41 @@ module DownloadTV
 			File.write("date", Date.today) unless dont_write_to_date_file
 
 		rescue InvalidLoginError
-			puts "Wrong username/password combination"
+			warn "Wrong username/password combination"
+		end
+
+		##
+		# Uses a Torrent object to obtain links to the given tv show
+		# When :auto is true it will try to find the best match based on a set of filters
+		# When it's false it will prompt the user to select the preferred result
+		# Returns either a magnet link or an emptry string
+		def get_link(t, show)
+			links = t.get_links(show)
+
+			return "" if links.empty?
+
+			if @config[:auto]
+				links = filter_shows(links)
+				links.first[1]
+			
+			else
+				puts "Collecting links for #{show}"
+				links.each_with_index { |data, i| puts "#{i}\t\t#{data[0]}" }
+				
+				puts
+				print "Select the torrent you want to download [-1 to skip]: "
+
+				i = $stdin.gets.chomp.to_i
+
+				while i >= links.size || i < -1
+					puts "Index out of bounds. Try again [-1 to skip]: "
+					i = $stdin.gets.chomp.to_i
+				end
+
+				# Use -1 to skip the download
+				i == -1 ? "" : links[i][1]
+			end
+			
 		end
 
 
@@ -105,18 +144,40 @@ module DownloadTV
 		end
 
 
+		##
+		# Given a list of shows and episodes:
+		#
+		# * Removes ignored shows
+		# * Removes apostrophes, colons and parens
 		def fix_names(shows)
 			# Ignored shows
 			s = shows.reject do |i|
 				# Remove season+episode
-				@config[:ignored].include?(i.split(" ")[0..-2].join(" "))
+				@config[:ignored].include?(i.split(" ")[0..-2].join(" ").downcase)
 			end
 
-			# Removes apostrophes, colons and parens
-			s.map { |t| t.gsub(/ \(.+\)|[':]/, "") }
+			s.map { |i| i.gsub(/ \(.+\)|[':]/, "") }
 		end
 
+		##
+		# Iteratively applies filters until they've all been applied or applying the next filter would result in no results
+		# These filters are defined at @filters
+		def filter_shows(links)
+			@filters.each do |f| # Apply each filter
+				new_links = links.reject { |name, _link| f.(name) }
+				# Stop if the filter removes every release
+				break if new_links.size == 0
+
+				links = new_links
+			end
 
+			links
+		end
+
+
+		##
+		# Spawns a silent process to download a given magnet link
+		# Uses xdg-open (not portable)
 		def download(link)
 			exec = "xdg-open \"#{link}\""
 			

data/lib/download_tv/grabbers/addic7ed.rb

@@ -42,7 +42,7 @@ module DownloadTV
 			# ADDIC7ED PROVIDES RSS
 
 			agent = Mechanize.new
-			page = agent.get(url2, [], @url)
+			page = agent.get(url, [], @url)
 			puts page.save("Hi")
 			
 		end

data/lib/download_tv/grabbers/kat.rb

@@ -16,7 +16,7 @@ module DownloadTV
 			# Remove duplicates
 			data.keep_if { |i| i.text != "" }
 
-			names = data.collect &:text
+			names = data.collect(&:text)
 			links = []
 
 			data.each do |res|

data/lib/download_tv/linkgrabber.rb

@@ -15,7 +15,7 @@ module DownloadTV
 			agent.get(@url)
 		end
 
-		def get_links(s)
+		def get_links(_s)
 			raise NotImplementedError
 		end
 		

data/lib/download_tv/myepisodes.rb

@@ -35,7 +35,7 @@ module DownloadTV
 		end
 
 		def load_cookie
-			if File.exists? "cookie"
+			if File.exist? "cookie"
 				@agent.cookie_jar.load "cookie"
 				page = @agent.get "https://www.myepisodes.com/login.php"
 				if page.links[1].text == "Register"

data/lib/download_tv/torrent.rb

@@ -17,14 +17,6 @@ module DownloadTV
 			# Silently ignores bad names
 			@g_names.rotate! @g_names.find_index(default_grabber).to_i
 
-			@filters = [
-				->(n){n.include?("2160")},
-				->(n){n.include?("1080")},
-				->(n){n.include?("720")},
-				->(n){n.include?("WEB")},
-				->(n){!n.include?("PROPER") || !n.include?("REPACK")},
-			]
-
 			change_grabbers
 			
 		end
@@ -46,7 +38,7 @@ module DownloadTV
 
 		rescue Mechanize::ResponseCodeError, Net::HTTP::Persistent::Error
 
-			puts "Problem accessing #{newt.class.name}"
+			warn "Problem accessing #{newt.class.name}"
 			# We won't be using this grabber
 			@n_grabbers = @n_grabbers-1
 			@tries = @tries - 1
@@ -54,48 +46,19 @@ module DownloadTV
 			change_grabbers
 
 		rescue SocketError, Errno::ECONNRESET, Net::OpenTimeout
-			puts "Connection error."
-			exit
+			warn "Connection error."
+			exit 1
 			
 		end
 
 
-		def get_link(show, auto)
+		def get_links(show)
 			links = @g_instances.first.get_links(show)
 
-			if !auto
-				links.each_with_index do |data, i|
-					puts "#{i}\t\t#{data[0]}"
-					
-				end
-
-				puts
-				print "Select the torrent you want to download [-1 to skip]: "
-
-				i = $stdin.gets.chomp.to_i
-
-				while i >= links.size || i < -1
-					puts "Index out of bounds. Try again: "
-					i = $stdin.gets.chomp.to_i
-				end
-
-				# Reset the counter
-				@tries = @n_grabbers - 1
-
-				# Use -1 to skip the download
-				i == -1 ? "" : links[i][1]
+			# Reset the counter
+			@tries = @n_grabbers - 1
 			
-			else # Automatically get the links
-
-				links = filter_shows(links)
-
-				# Reset the counter
-				@tries = @n_grabbers - 1
-
-				# Get the first result left
-				links[0][1]
-				
-			end
+			links
 
 		rescue NoTorrentsError
 			puts "No torrents found for #{show} using #{@g_instances.first.class.name}"
@@ -108,23 +71,14 @@ module DownloadTV
 
 			else # Reset the counter
 				@tries = @n_grabbers - 1
-				# TODO: Handle show not found here!!
-				return ""
+				# Handle show not found here!!
+				return []
 			
 			end
 			
 		end
 
-		def filter_shows(links)
-			@filters.each do |f| # Apply each filter
-				new_links = links.reject {|name, link| f.(name)}
-				# Stop if the filter removes every release
-				break if new_links.size == 0
-
-				links = new_links
-			end
-			links
-		end
+		
 	end
 
 end

data/lib/download_tv/version.rb

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

data/test/config_test.rb

@@ -0,0 +1,52 @@
+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})
+		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"})
+		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"})
+		end
+	end
+
+	# describe "when the file doesn't exist" do
+	# 	it "will create a new one" do
+	# 		# Send stuff to stdin
+	# 		flunk
+	# 		DownloadTV::Configuration.new(path: config_path)
+	# 		File.exist?(config_path).must_equal true			
+	# 	end
+
+	# 	it "will trigger a configuration change when asked to" do
+	# 		DownloadTV::Configuration.new(path: config_path, true)
+	# 	end
+	# end
+
+	# test [:ignored] gets turned to lowercase
+
+end

data/test/downloader_test.rb

@@ -1,75 +1,67 @@
 require "test_helper"
 
 describe DownloadTV::Downloader do
+	config_path = File.realdirpath("#{__dir__}/test_config")
+
 	before do
-		Dir.chdir(File.dirname(__FILE__))
+		Dir.chdir(__dir__)
 		File.delete("date") if File.exist?("date")
+		create_dummy_config(config_path) unless File.exist?(config_path)
 	end
 
-	describe "when creating the object" 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, nil, {:hi => 1}).config.must_equal ({:hi => 1})
-		end
-
-		it "should receive an integer for the offset" do
-			->{ DownloadTV::Downloader.new("foo", true, true, nil, {1=>1}) }.must_raise NoMethodError
-		end
+	after do
+		File.delete(config_path) if File.exist?(config_path)
+	end
 
+	describe "when creating the object" do
 		it "should store the first argument as @offset" do
-			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, nil, {1=>1}).auto.must_equal true
-			DownloadTV::Downloader.new(3, false, true, nil, {1=>1}).auto.must_equal false
+			DownloadTV::Downloader.new(3, path: config_path).offset.must_equal 3
+			DownloadTV::Downloader.new(-3, path: config_path).offset.must_equal 3
 		end
 
-		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
+		it "should receive an integer for the offset" do
+			->{ DownloadTV::Downloader.new("foo") }.must_raise NoMethodError
 		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
+		it "can receive an optional configuration hash" do
+			dl = DownloadTV::Downloader.new(0, auto: true, grabber: "KAT", path: config_path)
+			dl.config[:auto].must_equal true
+			dl.config[:grabber].must_equal "KAT"
 		end
 
 	end
 
-	describe "the fix_names function" do
-		config = {:ignored => ["Ignored"]}
-		dl = DownloadTV::Downloader.new(0, true, true, nil, config)
-
+	describe "the fix_names method" do
 		it "should remove apostrophes, colons and parens" do
 			shows = ["Mr. Foo S01E02", "Bar (UK) S00E22", "Let's S05E03", "Baz: The Story S05E22"]
 			result = ["Mr. Foo S01E02", "Bar S00E22", "Lets S05E03", "Baz The Story S05E22"]
+			
+			dl = DownloadTV::Downloader.new(0, ignored: [], path: config_path)
 			dl.fix_names(shows).must_equal result
 		end
 
 		it "should remove ignored shows" do
-			
 			shows = ["Mr. Foo S01E02", "Bar (UK) S00E22", "Ignored S20E22", "Let's S05E03"]
 			result = ["Mr. Foo S01E02", "Bar S00E22", "Lets S05E03"]
+			
+			dl = DownloadTV::Downloader.new(0, ignored: ["Ignored"], path: config_path)
 			dl.fix_names(shows).must_equal result
 		end
 	end
 
 
 	describe "the date file" do 
-		dl = DownloadTV::Downloader.new(0, true, true, nil, {1=>1})
 
 		it "should be created if it doesn't exist" do
+			dl = DownloadTV::Downloader.new(0, path: config_path)
+			Dir.chdir(__dir__) # Use date file in test directory
 			dl.check_date
 			File.exist?("date").must_equal true
 		end
 
 		it "contains a date after running the method" do
+			dl = DownloadTV::Downloader.new(0, path: config_path)
+			Dir.chdir(__dir__)
 			date = dl.check_date
 			date.must_equal (Date.today-1)
 			Date.parse(File.read("date")).must_equal Date.today-1
@@ -78,13 +70,99 @@ describe DownloadTV::Downloader do
 		it "exits the script when up to date" do
 			File.write("date", Date.today)
 			begin
+				dl = DownloadTV::Downloader.new(0, path: config_path)
+				Dir.chdir(__dir__)
 				dl.check_date
 				flunk
 			rescue SystemExit
 			
 			end
 		end
+
+		it "uses the offset to adjust the date" do
+			File.write("date", Date.today)
+
+			# Would exit with offset 0
+			dl = DownloadTV::Downloader.new(1, path: config_path)
+
+			Dir.chdir(__dir__)
+			date = dl.check_date
+
+			date.must_equal (Date.today-1)
+			Date.parse(File.read("date")).must_equal Date.today
+		end
 		
 	end
 
+	describe "the filter_shows method" do
+		it "removes names with 2160p in them" do
+			dl = DownloadTV::Downloader.new(0, path: config_path)
+			links = [["Link 1", ""], ["Link 2 2160p", ""], ["Link 3", ""]]
+			res = [["Link 1", ""], ["Link 3", ""]]
+			dl.filter_shows(links).must_equal res
+		end
+
+		it "removes names with 1080p in them" do
+			dl = DownloadTV::Downloader.new(0, path: config_path)
+			links = [["Link.1080p", ""], ["Link 2 2160p", ""], ["Link 3", ""]]
+			res = [["Link 3", ""]]
+			dl.filter_shows(links).must_equal res
+		end
+
+		it "removes names with 720p in them" do
+			dl = DownloadTV::Downloader.new(0, path: config_path)
+			links = [["Link 1", ""], ["Link 2 720p", ""], ["Link.720p.rip", ""]]
+			res = [["Link 1", ""]]
+			dl.filter_shows(links).must_equal res
+		end
+
+		it "removes names with WEB in them" do
+			dl = DownloadTV::Downloader.new(0, path: config_path)
+			links = [["Link 1 WEBRIP", ""], ["Link 2 rip", ""], ["Link.720p.rip", ""]]
+			res = [["Link 2 rip", ""]]
+			dl.filter_shows(links).must_equal res
+		end
+
+		it "removes names without PROPER or REPACK in them" do
+			dl = DownloadTV::Downloader.new(0, path: config_path)
+			links = [["Link 1", ""], ["Link 2 2160p", ""], ["Link 3", ""], ["Link 4 PROPER", ""], ["Link REPACK 5", ""]]
+			res = [["Link 4 PROPER", ""], ["Link REPACK 5", ""]]
+			dl.filter_shows(links).must_equal res			
+		end
+
+		it "doesn't apply a filter if it would reject every option" do
+			dl = DownloadTV::Downloader.new(0, path: config_path)
+			links = [["Link 1 720p", ""], ["Link 2 2160p", ""], ["Link 720p 3", ""]]
+			res = [["Link 1 720p", ""], ["Link 720p 3", ""]]
+			dl.filter_shows(links).must_equal res
+		end
+	end
+
+	describe "the get_link method" do
+		it "returns an empty string when it can't find links" do
+			t = Minitest::Mock.new
+			show = "Example Show S01E01"
+			
+			t.expect(:get_links, [], [show])
+			dl = DownloadTV::Downloader.new(0, auto: true, path: config_path)
+			dl.get_link(t, show).must_equal ""
+			t.expect(:get_links, [], [show])
+			dl = DownloadTV::Downloader.new(0, auto: false, path: config_path)
+			dl.get_link(t, show).must_equal ""
+
+
+		end
+
+		it "returns the first link when auto is set to true" do
+			t = Minitest::Mock.new
+			show = "Example Show S01E01"
+			
+			t.expect(:get_links, [["Name 1", "Link 1"], ["Name 2", "Link 2"]], [show])
+			dl = DownloadTV::Downloader.new(0, auto: true, path: config_path)
+			dl.get_link(t, show).must_equal "Link 1"
+
+
+		end
+	end
+
 end

data/test/grabbers_test.rb

@@ -7,28 +7,20 @@ describe DownloadTV::LinkGrabber do
 
 	instances.each do |grabber|
 		describe grabber do
-			# grabber = g#(Object.const_get "DownloadTV::#{g}").new
-
 			it "will have a url attribute on creation" do
-				# instance_eval("#{g}.new")
-				
 				grabber.url.wont_be_nil
 			end
 
 			it "should get a 200 code response" do
-				# grabber = (Object.const_get g).new
 				grabber.test_connection.code.must_equal "200"
 			end
 
 			it "will raise NoTorrentsError when torrent can't be found" do
-				# grabber = (Object.const_get g).new
 				notfound = ->{ grabber.get_links("Totally Fake Show askjdgsaudas") }
 				notfound.must_raise DownloadTV::NoTorrentsError
-
 			end
 
 			it "will return an array with names and links of results when a torrent can be found" do
-				# grabber = (Object.const_get g).new
 				result = grabber.get_links("Game Of Thrones S04E01")
 				result.must_be_instance_of Array
 				result.wont_be :empty?
@@ -37,6 +29,7 @@ describe DownloadTV::LinkGrabber do
 					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:"
 				end
 
 			end

data/test/test_helper.rb

@@ -3,3 +3,7 @@ require "download_tv"
 
 require "minitest/autorun"
 
+
+def create_dummy_config(in_path, config={})
+	File.open(in_path, "wb") { |f| Marshal.dump(config, f) }
+end

data/test/torrent_test.rb

@@ -26,8 +26,6 @@ describe DownloadTV::Torrent do
 			@t.g_instances.size.must_equal @t.n_grabbers
 			
 		end
-
-		# TODO: Test filter_shows(links)
 		
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - guille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,7 @@ files:
 - lib/download_tv/subtitles.rb
 - lib/download_tv/torrent.rb
 - lib/download_tv/version.rb
+- test/config_test.rb
 - test/downloader_test.rb
 - test/grabbers_test.rb
 - test/test_helper.rb
@@ -162,9 +163,11 @@ rubyforge_project:
 rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: DownloadTV finds the next episodes from shows you follow on MyEpisodes and
-  downloads them.
+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
+  MyEpisodes account.
 test_files:
+- test/config_test.rb
 - test/downloader_test.rb
 - test/grabbers_test.rb
 - test/test_helper.rb