rget 4.2.4 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58c0cccf4ff513e28b10ff4b8158348ec0e6a9d3ecf4effe79daf848e2aef70c
-  data.tar.gz: d7c2f8c4dd59afe8e4c5ec2d7400d7474641ce6ac85380cd80ba3c041d675ca2
+  metadata.gz: d6fa9111f5bf98f850fe37ffb0ae7c527fb3388bf3727fbd2b0d57d2b3a1046f
+  data.tar.gz: 83a382e8df65d131a76e3dd657cfe166fd8b58f25677848ef152a7145e78e861
 SHA512:
-  metadata.gz: 3b6b3e743533af3e138b8b23e1d99af9e4bd8dffe261b0962ec88e2aacbde3a7e35c8e0d35355307fe4ced11b638ac50651a8f25727aa3393f7afa1766f8c01c
-  data.tar.gz: 0bbec18f7c687d617ad9f0cec312df0bc0b71f48acf4d2fab23ef0bf2e110bbae82ad44690a6f0458f0cc0616dfe2afe196f7060ef7efcd15b085dc49c793db2
+  metadata.gz: c3724a95a6b539622e5d40a2a48b4335db37c12308af3fd7f534193bc746c0b4ed6a5e10f6430fd2f31e9b59f6c5bf50b6961bc4064f513c8f52ff9af1711ecb
+  data.tar.gz: f95c9f32efb1ae8d00c039dae7bc80fd763b07446f1152985e23d1831e29d687c08e0f951c3fb535b73b106aa7de45548beae06971b1fec356c4175c1c2d07e7

data/lib/nicovideo.rb

@@ -18,15 +18,12 @@ class Nicovideo < WebRadio
 
 	def download
 		begin
-			player_url = get_player_url(@url)
+			video = get_video(@url)
 		rescue NoMethodError
 			raise DownloadError.new('video not found')
 		end
-		video_id = Pathname(URI(player_url).path).basename.to_s
-		@cover = thumbinfo(video_id, 'thumbnail_url') unless @cover
-
-		video = @nico.video(video_id)
-		title = video.title || thumbinfo(video_id, 'title') || video_id
+		@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
 		appendix = title =~ /おまけ|アフタートーク/ ? 'a' : ''
@@ -64,21 +61,29 @@ class Nicovideo < WebRadio
 	end
 
 private
-	def get_player_url(list_url)
+	def get_video(list_url)
+		video_url = nil
+		offset = 0
 		begin
-			rss = RSS::Parser.parse(list_url)
-			item = rss.items.first
-			return item.link
-		rescue RSS::NotWellFormedError
-			html = open(list_url, &:read)
-			url = html.scan(%r|/watch/[\w]+|).first
-			raise WebRadio::DownloadError.new('video not found in this pege') unless url
-			return "http://www.nicovideo.jp#{url}"
+			begin
+				rss = RSS::Parser.parse(list_url)
+				item = rss.items.first
+				video_url = item.link
+			rescue RSS::NotWellFormedError
+				html = open(list_url, &:read)
+				url = html.scan(%r|/watch/[\w]+|).first
+				raise WebRadio::DownloadError.new('video not found in this pege') unless url
+				video_url = "http://www.nicovideo.jp#{url}"
+			end
+			video = @nico.video(Pathname(URI(video_url).path).basename.to_s)
+		rescue Net::HTTPForbidden
+			offset += 1
+			return
 		end
 	end
 
-	def thumbinfo(video_id, elem = nil)
-		xml = open("http://ext.nicovideo.jp/api/getthumbinfo/#{video_id}").read
+	def thumbinfo(video, elem = nil)
+		xml = open("http://ext.nicovideo.jp/api/getthumbinfo/#{video.id}").read
 		if elem
 			return xml.scan(%r|<#{elem}>(.*)</#{elem}>|m).flatten.first
 		else

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.2.4"
+  spec.version       = "4.3.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.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.3.0
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor