download_tv 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01776f973e2d3bab1f88189cbf4315fc0f33923e
-  data.tar.gz: bf5057e5fbda8bb6724dd69f9d3633abe2fc2f98
+  metadata.gz: b52ab943213458fa9781f6aa6fc332f80eb42f11
+  data.tar.gz: 12187f1e431cbb5be09725f6439bb2a27681972d
 SHA512:
-  metadata.gz: d6dc22d8625510cf9f1a6aac9198d6f95d6bb4953fd43e175f6ec09b3a397a3ed28239bcc20ff2dd1025cdbe83e20fbc0930febaf42a190e93758c6e1687910a
-  data.tar.gz: b60c1b8b52b9c74a1328afb6da8ee3011eb975d187553c5b4f947fce6c07d3c228aa45e45202be21f38f6a3d491b7e24da88980b8136052388ec78b3ba6b3a66
+  metadata.gz: de173925b0f49d9bc22d76de843c2c86a3d12bb65cffe0613a91ea637f4caac154bae4db652a5a787e449b24b47a626880937d0d1aa980be95fa4c8070d33386
+  data.tar.gz: 95b903ada7b90ff403347e0a51a4686f332137e4e684ce0a595519e110bf61e56b5d71980bbda1f0794313c6649a92425e84debbdae9fb57e1d2d191b8edbba7

data/LICENSE.md

@@ -0,0 +1,10 @@
+MIT License
+===================
+
+Copyright © 2017 Guillermo Rodríguez
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -8,10 +8,4 @@ Rake::TestTask.new do |t|
 	t.libs << "test"
 	t.test_files = FileList["test/**/*_test.rb"]
 	t.verbose = false
-end
-
-task :clean do
-  rm_rf "config.rb"
-  rm_rf "cookie"
-  rm_rf "date"
-end
+end

data/download_tv.gemspec

@@ -28,9 +28,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency("json")
   s.add_dependency("mechanize")
-  s.add_dependency("date")
-  s.add_dependency("io-console")
-  s.add_dependency("fileutils")
 
   s.has_rdoc    = false
   s.license     = "MIT"

data/lib/download_tv.rb

@@ -2,6 +2,7 @@ require "json"
 require "mechanize"
 require "date"
 require "io/console"
+require "fileutils"
 
 require "download_tv/version"
 require "download_tv/configuration"

data/lib/download_tv/downloader.rb

@@ -5,9 +5,6 @@ module DownloadTV
 		attr_reader :offset, :config
 
 		def initialize(offset=0, config={})
-			# Change to installation directory
-			Dir.chdir(__dir__)
-
 			@offset = offset.abs
 			@config = Configuration.new(config).content # Load configuration
 			
@@ -173,10 +170,24 @@ module DownloadTV
 		# Spawns a silent process to download a given magnet link
 		# Uses xdg-open (not portable)
 		def download(link)
-			exec = "xdg-open \"#{link}\""
+			@cmd ||= detect_os
+			
+			exec = "#{@cmd} \"#{link}\""
 			
 			Process.detach(Process.spawn(exec, [:out, :err]=>"/dev/null"))
 
 		end
+
+		def detect_os
+			case RbConfig::CONFIG['host_os']
+			when /linux/
+				"xdg-open"
+			when /darwin/
+				"open"
+			else
+				warn "You're using an unsupported platform."
+				exit 1
+			end
+		end
 	end
 end

data/lib/download_tv/grabbers/torrentapi.rb

@@ -6,8 +6,7 @@ module DownloadTV
 		attr_reader :wait
 
 		def initialize
-			super("https://torrentapi.org/pubapi_v2.php?mode=search&search_string=%s&token=%s")
-			@token = get_token
+			super("https://torrentapi.org/pubapi_v2.php?mode=search&search_string=%s&token=%s&app_id=DownloadTV")
 			@wait = 2.1
 			
 		end
@@ -16,7 +15,7 @@ module DownloadTV
 		# Connects to Torrentapi.org and requests a token.
 		# Returns said token.
 		def get_token
-			page = @agent.get("https://torrentapi.org/pubapi_v2.php?get_token=get_token").content
+			page = @agent.get("https://torrentapi.org/pubapi_v2.php?get_token=get_token&app_id=DownloadTV").content
 			
 			obj = JSON.parse(page)
 
@@ -25,6 +24,7 @@ module DownloadTV
 		end
 
 		def get_links(s)
+			@token ||= get_token
 
 			# Format the url
 			search = @url % [s, @token]
@@ -54,6 +54,9 @@ module DownloadTV
 
 			names.zip(links)
 
+		rescue Mechanize::ResponseCodeError
+			# Temporary solution for Cloudflare being obnoxious
+			raise NoTorrentsError
 		end
 
 	end

data/lib/download_tv/torrent.rb

@@ -15,7 +15,7 @@ module DownloadTV
 			@tries = @n_grabbers - 1
 
 			# Silently ignores bad names
-			@g_names.rotate! @g_names.find_index(default_grabber).to_i
+			@g_names.rotate! @g_names.find_index(default_grabber).to_i+1
 
 			change_grabbers
 			
@@ -41,7 +41,7 @@ module DownloadTV
 			warn "Problem accessing #{newt.class.name}"
 			# We won't be using this grabber
 			@n_grabbers = @n_grabbers-1
-			@tries = @tries - 1
+			@tries = @n_grabbers - 1
 
 			change_grabbers
 

data/lib/download_tv/version.rb

@@ -1,3 +1,3 @@
 module DownloadTV
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/test/downloader_test.rb

@@ -143,4 +143,42 @@ describe DownloadTV::Downloader do
 		end
 	end
 
+	describe "the detect_os method" do
+		it "returns xdg open for linux" do
+			prev = RbConfig::CONFIG['host_os']
+			RbConfig::CONFIG['host_os'] = "linux-gnu"
+
+			dl = DownloadTV::Downloader.new(0, path: config_path)
+			dl.detect_os.must_equal "xdg-open"
+			
+			RbConfig::CONFIG['host_os'] = prev
+		end
+
+		it "returns open for mac" do
+			prev = RbConfig::CONFIG['host_os']
+			RbConfig::CONFIG['host_os'] = "darwin15.6.0"
+
+			dl = DownloadTV::Downloader.new(0, path: config_path)
+			dl.detect_os.must_equal "open"
+			
+			RbConfig::CONFIG['host_os'] = prev
+		end
+
+		it "exits when it can't detect the platform" do
+			prev = RbConfig::CONFIG['host_os']
+			RbConfig::CONFIG['host_os'] = "dummy"
+
+			dl = DownloadTV::Downloader.new(0, path: config_path)
+
+			begin
+				run_silently { dl.detect_os.must_equal "xdg-open" }
+				flunk
+			rescue SystemExit
+			
+			end
+			
+			RbConfig::CONFIG['host_os'] = prev
+		end
+	end
+
 end

data/test/test_helper.rb

@@ -11,8 +11,10 @@ end
 
 def run_silently
 	previous_stdout, $stdout = $stdout, StringIO.new
+	previous_stderr, $stderr = $stderr, StringIO.new
 	yield
 	$stdout.string
 ensure
 	$stdout = previous_stdout
+	$stderr = previous_stderr
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - guille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,48 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: date
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: io-console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fileutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - guillerg96@gmail.com
@@ -133,6 +91,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- LICENSE.md
 - README.md
 - Rakefile
 - bin/tv