rget 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 763df07003efcec47e65ac5451134be3337b4a67
-  data.tar.gz: 6177207f17ecfedaa34419b90f5f1e339dda937f
+  metadata.gz: 025b9f5f8c137bf257d8c267dc1586c43a2e9851
+  data.tar.gz: de457800bc506b8950548f7d7fca1b3b753840ac
 SHA512:
-  metadata.gz: ffe7d01d105939fb1db3a3b652c4878a5543d6970f680583a8fb17568365ea34b502d1831535d86e62d0230ec9733b251ecc321fa55eec8309a2b47fdd049961
-  data.tar.gz: 24bdd00f877774cd8b4f90d0879ab3148dabee61545e87e8fa08d1e237be53063c1057cd4184eb860e60eff51e487e2ec49f128e427c8657968c123a8c0a48f4
+  metadata.gz: 6ac3a4abdbba0cb87003feff1c584aecf87e13aa6eb1b018beb88d29631d634b13db49733febcaa882f06bf9cc74387ca3401a4b5e5fa9fc31c3bbfed2e5b49e
+  data.tar.gz: 31619930129f831a5ab63ec2ec4c8b0ae8b137cc19515e66b9316f79a138a7acd3c1f87f479c729cbceaa6f9f703c391c7aef9f789526317b6a1ddbfb7bce5b9

data/README.md

@@ -14,4 +14,7 @@ For customize radio programs, copy `rget.yaml` to `~/.rget` or current work dire
 
     rget imas_cg            # download and convert to mp3 THE iDOLM@STER Cinderella Girls Radio
     rget imastudio --no-mp3 # download imastudio only (saved .m4a file)
-
+    rget trysail --path=/home/hoge/radio
+                            # srore mp3 file to specified directory
+    rget suzakinishi --path=dropbpx://radio
+	                         # store mp3 file to radio folder of Dropbox

data/bin/rget

@@ -8,6 +8,7 @@ require 'podcast'
 
 class GetWebRadio < Thor
 	class_option :mp3, type: :boolean, default:true, desc:'convert to mp3 with ffmpeg'
+	class_option :path, type: :string, desc:'store path (accept "dropbox://~")'
 
 	config = nil
 	[

data/lib/dropbox.rb

@@ -0,0 +1,36 @@
+require "dropbox-api"
+require "dropbox-api/tasks"
+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)
+		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)
+		end
+
+		Dropbox::API::Client.new(token: token[:access_token], secret: token[:access_secret])
+	end
+end

data/lib/webradio.rb

@@ -35,6 +35,10 @@ class WebRadio
 		raise 'do not instanciate directly, use WebRadio method.' if self.class == WebRadio
 		@url = url
 		@options = options
+		if @options.path =~ %r|^dropbox://|
+			require 'dropbox'
+			@dropbox = DropboxAuth.client
+		end
 	end
 
 	def download(name)
@@ -43,37 +47,88 @@ class WebRadio
 
 private
 	def mp3ize(src, dst, delete_src = true)
+		if @options.mp3
+			if exist?(dst)
+				puts "#{dst} is existent, skipped."
+				return
+			end
+		else
+			if exist?(src)
+				puts "#{src} is existent, skipped."
+				return
+			end
+		end
+
+
 		# download src file
-		if !File.exist?(src) && !File.exist?(dst)
+		unless File.exist?(src)
 			print "getting #{src}..."
 			begin
 				yield
 				puts "done."
 			rescue DownloadError => e
-				puts "failed."
 				File.delete(src) if File.exist?(src)
+				puts "failed."
 				$stderr.puts e.message
 				return
 			end
 		end
+		if !@options.mp3 || src == dst
+			move(src) if @options.path
+			return
+		end
 
 		# convert to mp3
-		return self unless @options.mp3
-
 		print "converting to mp3..."
-		if File.exist? dst
-			puts "skipped."
+     	result = Open3.capture3("ffmpeg -i #{src} -ab 64k #{dst}")
+		if result[2].to_i == 0
+			File.delete(src) if delete_src
+			puts "done."
 		else
-      	result = Open3.capture3("ffmpeg -i #{src} -ab 64k #{dst}")
-			if result[2].to_i == 0
-				File.delete(src) if delete_src
+			File.delete(dst) if File.exist?(dst)
+			puts "failed."
+			$stderr.puts result[1]
+			return
+		end
+		move(dst) if @options.path
+	end
+
+	def exist?(dst)
+		if @dropbox
+			begin
+				!@dropbox.ls(dropbox_file(dst))[0]['is_deleted']
+			rescue Dropbox::API::Error::NotFound, NoMethodError
+				false
+			end
+		elsif @options.path
+			File.exist?(File.join(@options.path, dst))
+		else
+			File.exist?(dst)
+		end
+	end
+
+	def move(dst)
+		if @options.path
+			print "move to #{@options.path}..."
+			begin
+				if @dropbox
+					@dropbox.chunked_upload(dropbox_file(dst), open(dst))
+					File.delete(dst)
+				elsif @options.path
+					FileUtils.mv(dst, @options.path)
+				end
 				puts "done."
-			else
+			rescue => e
 				puts "failed."
-				$stderr.puts MediaConvertError.new(result[1])
+				$stderr.puts e.message
 			end
 		end
 	end
+
+	def dropbox_file(file)
+		path = @options.path.sub(%r|^dropbox://|, '')
+		File.join(path, file)
+	end
 end
 
 def WebRadio(url, options)

data/lib/youtube.rb

@@ -16,7 +16,7 @@ class YouTube < WebRadio
 		@src = "#{name}##{'%02d' % serial}.mp4"
 		@dst = "#{name}##{'%02d' % serial}.mp3"
 		mp3ize(@src, @dst) do
-			player_url = "http://www.youtube.com#{list[serial]}"
+			player_url = "https://www.youtube.com#{list[serial]}".sub(/&.*/, '')
      		result = Open3.capture3("viddl-rb -u -q '*:*:mp4' '#{player_url}'")
 			video_url = result[0].split.last.chomp
 			open(@src, 'wb:ASCII-8BIT') do |o|

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       = "2.1.1"
+  spec.version       = "2.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, animate, onsen, seaside communications, niconico and youtube.}
@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "niconico", ">= 1.7.0"
   spec.add_runtime_dependency "viddl-rb"
   spec.add_runtime_dependency "pit"
+  spec.add_runtime_dependency "dropbox-api"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - TADA Tadashi
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dropbox-api
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +152,7 @@ files:
 - Rakefile
 - bin/rget
 - lib/animate.rb
+- lib/dropbox.rb
 - lib/hibiki.rb
 - lib/nicovideo.rb
 - lib/onsen.rb