rget 4.8.2 → 4.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08a6e1d811d25034273a863fd06a6380e367fd5cd1e68bb3cbe8535de865a7ab'
-  data.tar.gz: 842d8c9e1886a91958b5585e32ff1910ca8fac2ba0e0ff2f83df8109c848e3e4
+  metadata.gz: 3ef68f95f3fbafd9b06628962504a762ea8fa4782d98e87a006a0778f19d92e3
+  data.tar.gz: 698f889ccbf793023b8ee5409aee34039f759cb1d650c453fd6a38524a456fa2
 SHA512:
-  metadata.gz: 2f44d8305dc261a7ace1a15dfc251db6ad2708576f63b22c05f6060ab3dc5bf6bc02bcf20bf8d93249b58b8b06a811be08d8d5d66364609f6a05fc2c5c6b0462
-  data.tar.gz: 6c7d7ec810bf2395264153b2f46c220199ecc2dc515815e35250e842c12e228e849c3131b857c8af109868b7b84c3c074e93ff4dbc6d601227641bdecf239840
+  metadata.gz: 55a57b0f4190c235469156e8a9af6b87d0be727e2988d5d6ebe32110d89d1bfb4f269e79712dc7ed0170f3d05704aa9d870a2c2b8546a3619bea8d73dd89ff20
+  data.tar.gz: 16af48cd344bb6ff1e6638b4b5838605d8daae2d7bfd6ba4e5ba880ccc3451ee97aeda07026dea1c56939693db8878868e61f68742f9fe26c5e0a24a02ac6ee5

data/lib/nicovideo.rb

@@ -6,6 +6,8 @@ require 'open-uri'
 require 'rss'
 
 class Nicovideo < WebRadio
+	class ForbiddenError < StandardError; end
+
 	def initialize(params, options)
 		account = Pit::get('nicovideo', :require => {
 			:id => 'your nicovideo id',
@@ -17,29 +19,36 @@ class Nicovideo < WebRadio
 	end
 
 	def download
+		offset = 0
 		begin
-			video = get_video(@url)
-		rescue NoMethodError
-			raise DownloadError.new('video not found')
-		end
-		@cover = thumbinfo(video, 'thumbnail_url') unless @cover
-		title = video.title || thumbinfo(video, 'title') || video.id
-		title.tr!('０-９', '0-9')
-		serial = title.scan(/(?:[#第]|[ 　]EP|track-)(\d+)|/).flatten.compact[0].to_i
-		if serial == 0
-			tmp = title.scan(/\d+/).last.to_i
-			serial = tmp if tmp > 0
-		end
-		appendix = title =~ /おまけ|アフタートーク/ ? 'a' : ''
-		@file = "#{@label}##{'%02d' % serial}#{appendix}.#{video.type}"
-		@mp3_file = @file.sub(/\....$/, '.mp3')
-		mp3nize(@file, @mp3_file) do
-			loop do
-				print '.'
-				_, err, status = Open3.capture3("youtube-dl -f mp4 -o #{@file} --netrc #{video.url}")
-				break if status == 0
-				raise DownloadError.new(err) unless err =~ /403: Forbidden/
+			video = get_video(@url, offset)
+			@cover = thumbinfo(video, 'thumbnail_url') unless @cover
+			title = video.title || thumbinfo(video, 'title') || video.id
+			title.tr!('０-９', '0-9')
+			serial = title.scan(/(?:[#第]|[ 　]EP|track-)(\d+)|/).flatten.compact[0].to_i
+			if serial == 0
+				tmp = title.scan(/\d+/).last.to_i
+				serial = tmp if tmp > 0
 			end
+			appendix = title =~ /おまけ|アフタートーク/ ? 'a' : ''
+			@file = "#{@label}##{'%02d' % serial}#{appendix}.#{video.type}"
+			@mp3_file = @file.sub(/\....$/, '.mp3')
+			mp3nize(@file, @mp3_file) do
+				loop do
+					print '.'
+					_, err, status = Open3.capture3("youtube-dl -f mp4 -o #{@file} --netrc #{video.url}")
+					break if status == 0
+					next if err =~ /403: Forbidden/
+					raise ForbiddenError.new("Could not access to #{video.url}") if err =~ /TypeError/
+					raise DownloadError.new(err) 
+				end
+			end
+		rescue ForbiddenError
+			puts "#{$!.message}, try next."
+			offset += 1
+			retry
+		rescue NotFoundError
+			raise DownloadError.new('video not found')
 		end
 	end
 
@@ -61,9 +70,8 @@ class Nicovideo < WebRadio
 	end
 
 private
-	def get_video(list_url)
+	def get_video(list_url, offset = 0)
 		video_url = nil
-		offset = 0
 		begin
 			begin
 				rss = RSS::Parser.parse(open(list_url).read)
@@ -76,6 +84,8 @@ private
 				video_url = "http://www.nicovideo.jp#{url}"
 			end
 			video = @nico.video(Pathname(URI(video_url).path).basename.to_s)
+		rescue NoMethodError
+			raise NotFoundError.new('video not found')
 		rescue Net::HTTPForbidden, Mechanize::ResponseCodeError
 			offset += 1
 			retry

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.8.2"
+  spec.version       = "4.8.3"
   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, freshlive, himalaya and asobi store.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 4.8.2
+  version: 4.8.3
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor