download_tv 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16bd7893a980f0e82a8679f7c3325e9b31e91841
-  data.tar.gz: 7ed719b758086d4f0bc5811fc27f8e212dd592f7
+  metadata.gz: cd6399aa4f4c7b47b11bfef2797f874a009e9336
+  data.tar.gz: 6db536e4abc9ff2e58090ca782a29d2dc28149d1
 SHA512:
-  metadata.gz: c4354d813ded87ee149c79cd99112a1a08d5abf86a52e8e0b04f32445186c2806454412f3cd52bd32e9587d79bff3e48a941aaf8426bace28676466e2795e2bd
-  data.tar.gz: f6e4ae1b8e80a3f9c0f7be4f8a19ec0e7426b9470caf8cc006d6eb14fca7e9d164eac42c5a4599ad95f023281144c48a657daba0d0b19f2f73084a78fd0682ac
+  metadata.gz: 88d2844361b6213fe0eea64d0e14cbdcacd42a9f8ce75e29c5136c9fc4a9c748ebc6fb60226d186eee17080c7b5ae40953b8af304f52daaba09bd4d359a00eb6
+  data.tar.gz: ed7969953514c6e45be2ee25c808426c4ae3e66482a1e79bd11c632e801cc5f60e941675105a236d9bc652d306f13ed8b3133a4293f08f4d5e46f4b21f0426e4

data/.gitignore

@@ -1,4 +1,5 @@
 date
-config.rb
+config
 cookie
-/Gemfile.lock
+/Gemfile.lock
+/pkg/

data/.travis.yml

@@ -3,5 +3,3 @@ language: ruby
 
 rvm:
   - ruby-head
-
-before_install: cp lib/download_tv/config_example.rb lib/download_tv/config.rb

data/bin/tv

@@ -5,6 +5,8 @@ require 'download_tv'
 
 options = {}
 options[:offset] = 0
+options[:auto] = true
+options[:subs] = true
 options[:dry] = false
 options[:cmd] = "run"
 
@@ -28,10 +30,22 @@ opt_parser = OptionParser.new do |opts|
 		options[:arg] = s
 	end
 
+	opts.on("-c", "--configure", "Configures defaults") do
+		options[:cmd] = "config"
+	end
+
 	opts.on("--dry-run", "Don't write to the date file") do |n|
 		options[:dry] = n
 	end
 
+	opts.on("-a", "--[no-]auto", "Automatically find links") do |n|
+		options[:auto] = n
+	end
+
+	opts.on("-s", "--[no-]subtitles", "Download subtitles") do |n|
+		options[:subs] = n
+	end
+
 	opts.on_tail("-h", "--help", "Show this message") do
 		puts opts
 		exit
@@ -49,6 +63,8 @@ begin
 			dl.download_single_show(options[:arg])
 		when "file"
 			dl.download_from_file(options[:arg])
+		when "config"
+			DownloadTV::Configuration.new.change_configuration
 	end
 rescue Interrupt
 	puts "Interrupt signal detected. Exiting..."

data/lib/download_tv/configuration.rb

@@ -0,0 +1,39 @@
+module DownloadTV
+	class Configuration
+		attr_reader :content
+		
+		def initialize
+			if File.exists? "config.rb"
+				@content = File.open("config", "rb") {|f| Marshal.load(f)}
+			else
+				@content = {}
+				change_configuration
+			end
+		end
+
+
+		def change_configuration
+			if @content[:myepisodes_user]
+				print "Enter your MyEpisodes username (#{@content[:myepisodes_user]}) : "
+			else
+				print "Enter your MyEpisodes username : "
+			end
+			@content[:myepisodes_user] = STDIN.gets.chomp
+			puts
+
+			print "Save cookie? (y)/n: "
+			@content[:cookie] = STDIN.gets.chomp.downcase != "n"
+			puts
+
+			puts "Enter a comma-separated list of shows to ignore: (#{@content[:ignored]})"
+			@content[:ignored] = STDIN.gets.chomp
+			puts
+
+			serialize()
+		end
+
+		def serialize()
+			File.open("config", "wb") {|f| Marshal.dump(@content, f)}			
+		end
+	end
+end

data/lib/download_tv/downloader.rb

@@ -1,20 +1,20 @@
-begin
-	require_relative 'config'
-rescue LoadError
-	puts "Config file not found. Try renaming the config_example file to config.rb"
-	exit
-end
-
 module DownloadTV
 
 	class Downloader
 
 		attr_reader :offset, :auto, :subs
+		attr_accessor :config
 
-		def initialize(offset)
+		def initialize(offset, auto, subs, config={})
 			@offset = offset.abs
-			@auto = DownloadTV::CONFIG[:auto]
-			# @subs = DownloadTV::CONFIG[:subs]
+			@auto = auto
+			@subs = subs
+			if config.empty?
+				@config = Configuration.new.content # Load configuration
+			else
+				@config = config
+			end
+			
 			Thread.abort_on_exception = true
 		end
 
@@ -39,7 +39,7 @@ module DownloadTV
 			
 			date = check_date
 
-			myepisodes = MyEpisodes.new(DownloadTV::CONFIG[:myepisodes_user], DownloadTV::CONFIG[:cookie_path])
+			myepisodes = MyEpisodes.new(@config[:myepisodes_user], @config[:cookie])
 			# Log in using cookie by default
 			myepisodes.load_cookie
 			shows = myepisodes.get_shows(date)
@@ -107,7 +107,7 @@ module DownloadTV
 			# Ignored shows
 			s = shows.reject do |i|
 				# Remove season+episode
-				DownloadTV::CONFIG[:ignored].include?(i.split(" ")[0..-2].join(" "))
+				@config[:ignored].include?(i.split(" ")[0..-2].join(" "))
 			end
 
 			# Removes apostrophes and parens

data/lib/download_tv/grabbers/tpb.rb

@@ -2,8 +2,8 @@ module DownloadTV
 
 	class ThePirateBay < LinkGrabber
 
-		def initialize()
-			proxy = DownloadTV::CONFIG[:tpb_proxy].gsub(/\/+$/, "") || "https://thepiratebay.cr"
+		def initialize(tpb_proxy = "https://pirateproxy.cc")
+			proxy = tpb_proxy.gsub(/\/+$/, "") || "https://thepiratebay.cr"
 
 			super("#{proxy}/search/%s/0/7/0")
 			

data/lib/download_tv/myepisodes.rb

@@ -2,11 +2,10 @@ module DownloadTV
 
 	class MyEpisodes
 
-		def initialize(user=nil, cookie_path="")
+		def initialize(user=nil, save_cookie)
 			@agent = Mechanize.new
 			@user = user
-			@cookie_path = cookie_path
-			@save_cookie = cookie_path != ""
+			@save_cookie = save_cookie
 		end
 
 		def login
@@ -36,8 +35,8 @@ module DownloadTV
 		end
 
 		def load_cookie
-			if File.exists? @cookie_path
-				@agent.cookie_jar.load @cookie_path
+			if File.exists? "cookie"
+				@agent.cookie_jar.load "cookie"
 				page = @agent.get "https://www.myepisodes.com/login.php"
 				if page.links[1].text == "Register"
 					puts "The cookie is invalid/has expired."
@@ -52,7 +51,7 @@ module DownloadTV
 		end
 
 		def save_cookie
-			@agent.cookie_jar.save(@cookie_path, session: true)
+			@agent.cookie_jar.save("cookie", session: true)
 			@agent
 			
 		end

data/lib/download_tv/torrent.rb

@@ -5,7 +5,7 @@ module DownloadTV
 		attr_reader :g_names, :g_instances, :n_grabbers
 
 		def initialize
-			@g_names = DownloadTV::CONFIG[:grabbers].clone 
+			@g_names = ["Eztv", "ThePirateBay", "TorrentAPI"]
 			@g_instances = Array.new
 			@n_grabbers = @g_names.size # Initial size
 			@tries = @n_grabbers - 1

data/lib/download_tv/version.rb

@@ -1,3 +1,3 @@
 module DownloadTV
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/lib/download_tv.rb

@@ -4,6 +4,7 @@ require "date"
 require "io/console"
 
 require "download_tv/version"
+require "download_tv/configuration"
 require "download_tv/downloader"
 require "download_tv/torrent"
 require "download_tv/myepisodes"

data/test/downloader_test.rb

@@ -7,36 +7,56 @@ describe DownloadTV::Downloader do
 	end
 
 	describe "when creating the object" do
-		it "should receive an integer" do
-			->{ DownloadTV::Downloader.new("foo") }.must_raise NoMethodError
+		it "should receive three parameters" do
+			->{ DownloadTV::Downloader.new(0) }.must_raise ArgumentError
+			->{ DownloadTV::Downloader.new(0, 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})
+		end
+
+		it "should receive an integer for the offset" do
+			->{ DownloadTV::Downloader.new("foo", true, true, {1=>1}) }.must_raise NoMethodError
 		end
 
 		it "should store the first argument as @offset" do
-			DownloadTV::Downloader.new(3).offset.must_equal 3
+			DownloadTV::Downloader.new(3, true, true, {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
+		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
 		end
 
 	end
 
 	describe "the fix_names function" do
+		config = {:ignored => ["Ignored"]}
+		dl = DownloadTV::Downloader.new(0, true, true, config)
+
 		it "should remove apostrophes and parens" do
 			shows = ["Mr. Foo S01E02", "Bar (UK) S00E22", "Let's S05E03"]
 			result = ["Mr. Foo S01E02", "Bar S00E22", "Lets S05E03"]
-			DownloadTV::Downloader.new(0).fix_names(shows).must_equal result
+			dl.fix_names(shows).must_equal result
 		end
 
 		it "should remove ignored shows" do
-			DownloadTV::CONFIG[:ignored] = ["Ignored"]
+			
 			shows = ["Mr. Foo S01E02", "Bar (UK) S00E22", "Ignored S20E22", "Let's S05E03"]
 			result = ["Mr. Foo S01E02", "Bar S00E22", "Lets S05E03"]
-			DownloadTV::Downloader.new(0).fix_names(shows).must_equal result
+			dl.fix_names(shows).must_equal result
 		end
 	end
 
 
 	describe "the date file" do 
-		dl = DownloadTV::Downloader.new(0)
-
-
+		dl = DownloadTV::Downloader.new(0, true, true, {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 = DownloadTV::CONFIG[:grabbers].clone
+	grabbers = ["Eztv", "ThePirateBay", "TorrentAPI"]
 	instances = grabbers.map { |g| (DownloadTV.const_get g).new }
 
 	instances.each do |grabber|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - guille
@@ -124,7 +124,7 @@ files:
 - bin/tv
 - download_tv.gemspec
 - lib/download_tv.rb
-- lib/download_tv/config_example.rb
+- lib/download_tv/configuration.rb
 - lib/download_tv/downloader.rb
 - lib/download_tv/grabbers/addic7ed.rb
 - lib/download_tv/grabbers/eztv.rb

data/lib/download_tv/config_example.rb

@@ -1,12 +0,0 @@
-module DownloadTV
-	CONFIG = {
-	 myepisodes_user: "", # MyEpisodes login username
-	 auto: true, # Try to automatically select the torrents
-	 subs: true, # Download subtitles (not implemented yet)
-	 cookie_path: "cookie", # Leave blank to prevent the app from storing cookies
-	 ignored: [], # list of strings that match show names as written in myepisodes
-	 tpb_proxy: "https://pirateproxy.cc", # URL of the TPB proxy to use
-	 grabbers: ["Eztv", "ThePirateBay", "TorrentAPI"], # names of the classes in /grabbers
-	}
-	
-end