rget 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 430ab60d77c7ae45f44ea928335585d08dab612c
-  data.tar.gz: 9a1c2aa1cc84bda8020cb741aab878d0e1209908
+  metadata.gz: 7c90456779aba13450998afcadce3edbe6cd9ece
+  data.tar.gz: c53800c64c011fae5ee65c5ee35ea121ae242ef9
 SHA512:
-  metadata.gz: fcbdfab23f88567de63d43265057479b0d67490cf3d7de7bb08855efbb54c6410cbb55c130fe9010284924dcfc786844b88f383109da1e8f66e3ea9b5a1b3e73
-  data.tar.gz: 295a9df1458733a29c528285000c5833b0a3260c22cb7c147ea39a6c10be6e1bcac2afdd8d5e784c6ce3a89369a04760acc2d1ac9722be8e867110e5edb7d881
+  metadata.gz: 0aba75ce2fd55381d14f7fcac499abfed5150f797a51e57e5c5daa000e09c4183df070b87192c4047baf7cc6581b3b4cfeeb3423daecabb002e8095ca322dd07
+  data.tar.gz: d53ff24fb9cb41ab6d0a8c5b07a720c827f344557d9dbe6051051b450afff66e0d85107a5c0a580b43ea283f00d0706d8ff0a3e4ee9f1bdc79d0417fefb55b1c

data/bin/nicodl

@@ -15,7 +15,17 @@ account = Pit::get('nicovideo', :require => {
 	:pass => 'your nicovideo password'
 })
 nico = Niconico.new(account[:id], account[:pass])
-nico.login
+retry_count = 0
+begin
+	nico.login
+rescue Mechanize::ResponseReadError
+	retry_count += 1
+	if retry_count < 10
+		puts "login faiure. retring(#{retry_count})"
+		sleep 5
+		retry
+	end
+end
 
 video_id = Pathname(URI(player_url).path).basename.to_s
 begin
@@ -28,43 +38,46 @@ begin
 rescue Mechanize::ResponseCodeError
 	# live streaming time-shift
 	live = nico.live(video_id)
-	if File.exist?("#{video_id}.flv")
-		$stderr.puts "#{video_id}.flv is existent. skipping."
-	else
-		begin
-			cmd = live.rtmpdump_commands(video_id).first
-		rescue Niconico::Live::TicketRetrievingFailed
-			$stderr.puts $!
-			exit 1
-		end
-		cmd[cmd.index('-o') + 1] = "./#{video_id}.flv"
-		begin
-			o, e, s = Open3.capture3(cmd.join(' '))
-			unless s.exitstatus == 0
-				$stderr.puts e
-				exit 1
+	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.join(' '))
+					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
-		rescue Errno::ENOENT
-			$stderr.puts $!
-			exit 1
-		end
-	end
 
-	avconv = 'avconv'
-	args = " -i '#{video_id}.flv' -acodec copy -vcodec copy '#{live.title}.mp4'"
-	begin
-		o, e, s = Open3.capture3(avconv + args)
-		unless s.exitstatus == 0
-			$stderr.puts e
-			exit 1
-		end
-		File.delete("#{video_id}.flv")
-	rescue Errno::ENOENT
-		if avconv == 'ffmpeg'
-			$stderr.puts $!
-		else
-			avconv = 'ffmpeg'
-			retry
+			avconv = 'avconv'
+			args = " -i '#{src}' -acodec copy -vcodec copy '#{dst}'"
+			begin
+				o, e, s = Open3.capture3(avconv + args)
+				unless s.exitstatus == 0
+					$stderr.puts e
+					next
+				end
+				File.delete(src)
+			rescue Errno::ENOENT
+				if avconv == 'ffmpeg'
+					$stderr.puts $!
+				else
+					avconv = 'ffmpeg'
+					retry
+				end
+			end
 		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       = "2.6.0"
+  spec.version       = "2.7.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.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Downloading newest radio programs on the web.