rget 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46805266651d74da9ca5da604b0deb68d0e95dc8
-  data.tar.gz: 5a0906689e313fadc2acc78186f59122ed53041f
+  metadata.gz: 1036d1b31cf0c12651c08e002dcf385d11101233
+  data.tar.gz: 92c4cd83fd3b35c15f255c28413661bc000e4f45
 SHA512:
-  metadata.gz: 2dcced2e7d0e0d1ab90af16aee2595b8008564a14fb57228ce827dbe20b656089af6a767f59817cc04b23435ee3b5287d52b286326adeaa17ecb1e28388a0c24
-  data.tar.gz: b31b72532e1b0200534ecb7098daf2d7a7ccfa142812bfcd1a7ca730ae1457ce639baf0154a3b410aa1c77983dd13de50f5dab34b9b84ef046120e310ee25882
+  metadata.gz: '09b0fd82e8aad1d1c545f6242b56134d80bd935f5e3408c502244730c66c1f8021525467e230ba0df0aa1376c68a0f07b0fc7cc804ce0e6eb13e02c5b8ebfbf5'
+  data.tar.gz: 6ea0a06f15fe8679a8d333145cde5b4a7bc589b177dd2efc796bef22f7c2436eee08be1d830da2cd66565d787e7dff93126db9fc23e6e4fb64c317620837858c

data/bin/nicodl

@@ -5,11 +5,11 @@ require 'niconico'
 require 'pathname'
 require 'open3'
 
-player_url = ARGV.shift
-unless player_url
-	$stderr.puts "usage: nicodl <URL>"
+if ARGV.size == 0
+	$stderr.puts "usage: nicodl <URL> [URL...]"
 	exit -1
 end
+
 account = Pit::get('nicovideo', :require => {
 	:id => 'your nicovideo id',
 	:pass => 'your nicovideo password'
@@ -25,59 +25,63 @@ rescue Mechanize::ResponseReadError
 		sleep 5
 		retry
 	end
+	$stderr.puts 'login faiure.'
+	exit -2
 end
 
-video_id = Pathname(URI(player_url).path).basename.to_s
-begin
-	# downloading video
-	video = nico.video(video_id)
-	file = "#{video.title}.#{video.type}".gsub(%r([\\/\?:*"'><|]), '_')
-	open(file, 'wb:ASCII-8BIT') do |o|
-		video.get_video{|body|o.write(body)}
-	end
-rescue Mechanize::ResponseCodeError, Errno::EISDIR
-	# live streaming time-shift
-	live = nico.live(video_id)
+ARGV.each do |player_url|
+	video_id = Pathname(URI(player_url).path).basename.to_s
 	begin
-		live.rtmpdump_commands(video_id).each_with_index do |cmd, i|
-			src = "#{video_id}-#{i+1}.flv"
-			dst = "#{live.title.gsub(%r([\\/\?:*"'><|]), '_')}-#{i+1}.mp4"
-			unless File.exist?(src)
-				cmd[cmd.index('-o') + 1] = "./#{src}"
+		# downloading video
+		video = nico.video(video_id)
+		file = "#{video.title}.#{video.type}".gsub(%r([\\/\?:*"'><|]), '_')
+		open(file, 'wb:ASCII-8BIT') do |o|
+			video.get_video{|body|o.write(body)}
+		end
+	rescue Mechanize::ResponseCodeError, Errno::EISDIR
+		# live streaming time-shift
+		live = nico.live(video_id)
+		begin
+			live.rtmpdump_commands(video_id).each_with_index do |cmd, i|
+				src = "#{video_id}-#{i+1}.flv"
+				dst = "#{live.title.gsub(%r([\\/\?:*"'><|]), '_')}-#{i+1}.mp4"
+				unless File.exist?(src)
+					cmd[cmd.index('-o') + 1] = "./#{src}"
+					begin
+						o, e, s = Open3.capture3(*cmd)
+						unless s.exitstatus == 0
+							$stderr.puts e
+							next
+						end
+					rescue Errno::ENOENT # rtmdump command not found
+						$stderr.puts $!
+						exit 1
+					end
+				else
+					$stderr.puts "#{src} is existent. skipping."
+				end
+
+				cmd = 'ffmpeg'
+				args = ['-i', src, '-acodec', 'copy', '-vcodec', 'copy', dst]
 				begin
-					o, e, s = Open3.capture3(*cmd)
+					o, e, s = Open3.capture3(cmd, *args)
 					unless s.exitstatus == 0
 						$stderr.puts e
 						next
 					end
-				rescue Errno::ENOENT # rtmdump command not found
-					$stderr.puts $!
-					exit 1
-				end
-			else
-				$stderr.puts "#{src} is existent. skipping."
-			end
-
-			cmd = 'ffmpeg'
-			args = ['-i', src, '-acodec', 'copy', '-vcodec', 'copy', dst]
-			begin
-				o, e, s = Open3.capture3(cmd, *args)
-				unless s.exitstatus == 0
-					$stderr.puts e
-					next
-				end
-				File.delete(src)
-			rescue Errno::ENOENT
-				if cmd == 'avconv'
-					$stderr.puts "ffmpeg or avconv not found."
-				else # retry with avconv command instead of ffmpeg
-					cmd = 'avconv'
-					retry
+					File.delete(src)
+				rescue Errno::ENOENT
+					if cmd == 'avconv'
+						$stderr.puts "ffmpeg or avconv not found."
+					else # retry with avconv command instead of ffmpeg
+						cmd = 'avconv'
+						retry
+					end
 				end
 			end
+		rescue Niconico::Live::TicketRetrievingFailed
+			$stderr.puts $!
+			exit 2
 		end
-	rescue Niconico::Live::TicketRetrievingFailed
-		$stderr.puts $!
-		exit 2
 	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       = "3.0.2"
+  spec.version       = "3.1.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 and niconico.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Downloading newest radio programs on the web.