rget 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e7390b3e41059e8ecbd831444e486d8a4e53344
-  data.tar.gz: f9954fa00090ecef43a12e6a3edb1748b5d6a3e1
+  metadata.gz: 77d5b5444c527c81d9ccf64f5fa5679afec2f29d
+  data.tar.gz: 909b06eb3fce971d60bff406dfec32da68c69b42
 SHA512:
-  metadata.gz: aace3fa444aed6bbc74ff1e2f46cd010bdd6bae3e2749c6cbdd077bbd7dfe84cd511b37da5b291ce4fe8617d3c157717f553bbc62b7d6f25321de6fecada3fd4
-  data.tar.gz: ead867d95d7761594d021cf6619cb4c3415843ca43d67c1a8528faae5dc6ac13aa1e2af13d07d1dc654971af8cac5852b4e99260633f6bbc09f05414db35b106
+  metadata.gz: be8da2f75615ef51c693956f4ab2ece11c6e4cf77ae98cecb3320b5d84222d70261dc26f67fea47dccb6fc16176ab19c1c98cf590262e33f83f494a082e531c6
+  data.tar.gz: 7988434983f08de1c1347ee190386e6c91794d04c047160617ce0a48d43c1ed386560cc8566255ed740768b805e1c6ecc74e3438b14f6628f2926fd9f8767b61

data/lib/dropbox.rb

@@ -1,36 +1,53 @@
-require "dropbox-api"
-require "dropbox-api/tasks"
+require "dropbox_api"
 require 'pit'
 
-module DropboxAuth
-	def self.client
-		token = Pit::get('rget-dropbox')
-		unless token[:api_key]
-			print "Enter dropbox app key: "
-			token[:api_key] = $stdin.gets.chomp
-			print "Enter dropbox app secret: "
-			token[:api_secret] = $stdin.gets.chomp
-			Pit::set('rget-dropbox', data: token)
+module RGet
+	class Dropbox
+		def self.client
+			self.new
 		end
-		Dropbox::API::Config.app_key    = token[:api_key]
-		Dropbox::API::Config.app_secret = token[:api_secret]
-		Dropbox::API::Config.mode       = 'dropbox'
 
-		unless token[:access_token]
-			consumer = Dropbox::API::OAuth.consumer(:authorize)
-			request_token = consumer.get_request_token
-			puts "\nGo to this url and click 'Authorize' to get the token:"
-			puts request_token.authorize_url
-			query = request_token.authorize_url.split('?').last
-			verifier, = CGI.parse(query)['oauth_token']
-			print "\nOnce you authorize the app on Dropbox, press enter... "
-			$stdin.gets
-			access_token = request_token.get_access_token(oauth_verifier: verifier)
-			token[:access_token]  = access_token.token
-			token[:access_secret] = access_token.secret
-			Pit::set('rget-dropbox', data: token)
+		def initialize
+			token = Pit::get('rget-dropbox')
+			unless token[:api_token]
+				if token[:api_key]
+					api_key = token[:api_key]
+				else
+					print "Enter dropbox app key: "
+					api_key = $stdin.gets.chomp
+				end
+
+				if token[:api_secret]
+					api_secret = token[:api_secret]
+				else
+					print "Enter dropbox app secret: "
+					api_secret = $stdin.gets.chomp
+				end
+
+				authenticator = DropboxApi::Authenticator.new(api_key, api_secret)
+				puts "\nGo to this url and click 'Authorize' to get the token:"
+				puts authenticator.authorize_url
+
+				token.clear # delete all old settings
+				print "Enter the token: "
+				code = $stdin.gets.chomp
+				token[:api_token] = authenticator.get_token(code).token
+				Pit::set('rget-dropbox', data: token)
+			end
+			@client = DropboxApi::Client.new(token[:api_token])
 		end
 
-		Dropbox::API::Client.new(token: token[:access_token], secret: token[:access_secret])
+		def exist?(dst, dropbox_path)
+			!(@client.search(dst, dropbox_path).matches.size == 0)
+		end
+
+		def upload(dropbox_path)
+			info = DropboxApi::Metadata::CommitInfo.new('path'=>dropbox_path, 'mode'=>:add)
+			cursor = @client.upload_session_start('')
+			while data = yield
+				@client.upload_session_append_v2(cursor, data)
+			end
+			@client.upload_session_finish(cursor, info)
+		end
 	end
 end

data/lib/webradio.rb

@@ -35,7 +35,7 @@ class WebRadio
 		@options = options
 		if !@options.dump && @options.path =~ %r|^dropbox://|
 			require 'dropbox'
-			@dropbox = DropboxAuth.client
+			@dropbox = RGet::Dropbox.client
 		end
 	end
 
@@ -136,11 +136,7 @@ private
 
 	def exist?(dst)
 		if @dropbox
-			begin
-				!@dropbox.ls(dropbox_file(dst))[0]['is_deleted']
-			rescue Dropbox::API::Error::NotFound, NoMethodError
-				false
-			end
+			@dropbox.exist?(dst, dropbox_path)
 		elsif @options.path
 			File.exist?(File.join(@options.path, dst))
 		else
@@ -153,7 +149,12 @@ private
 			print "move to #{@options.path}..."
 			begin
 				if @dropbox
-					@dropbox.chunked_upload(dropbox_file(dst), open(dst))
+					open(dst) do |r|
+						@dropbox.upload(dropbox_file(dst)) do
+							print '.'
+							r.read(10_000_000)
+						end
+					end
 					File.delete(dst)
 				elsif @options.path
 					FileUtils.mv(dst, @options.path)
@@ -166,8 +167,12 @@ private
 		end
 	end
 
+	def dropbox_path
+		@options.path.sub(%r|^dropbox://|, '/')
+	end
+
 	def dropbox_file(file)
-		path = @options.path.sub(%r|^dropbox://|, '')
+		path = @options.path.sub(%r|^dropbox://|, '/')
 		File.join(path, file)
 	end
 end

data/rget.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rget"
-  spec.version       = "4.1.0"
+  spec.version       = "4.2.0"
   spec.authors       = ["TADA Tadashi"]
   spec.email         = ["t@tdtds.jp"]
   spec.description   = %q{Downloading newest radio programs on the web. Supported radio stations are hibiki, onsen, niconico and freshlive.}
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "nokogiri", ">= 1.7.0"
   spec.add_runtime_dependency "niconico", ">= 1.8.0"
   spec.add_runtime_dependency "pit"
-  spec.add_runtime_dependency "dropbox-api", ">= 0.4.6"
+  spec.add_runtime_dependency "dropbox_api"
   spec.add_runtime_dependency "mp3info"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dropbox-api
+  name: dropbox_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mp3info
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Downloading newest radio programs on the web.