rget 4.13.0 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 680138673b4a74e24fc3114cfefd7e4d7a1f4f56fe37ca70b7848c0256b95d63
-  data.tar.gz: fe7fdd1168af355285b5ec7ab4c9741f1acdd4fc496ea3a2bc9e59b5869f7011
+  metadata.gz: 6dbba35e1e280d414d0fc23a842664ae5a53608ec664efa5cddfba3b30fb953f
+  data.tar.gz: 9f100b85aa2a709ba941d1d19fe26ec559c1ba2aead4142282dfef2dafcba08b
 SHA512:
-  metadata.gz: 394aac18d5099e78ef52c99896a132fdc805edc8670fa7e980e074ffd8ecd7fd02cf6ae423c059852c43253ab585b82d720d1400602c127a6dbd46ac80f3474e
-  data.tar.gz: d01d41849aa9e3ac8cef2e3e523b62445116bffe09952d7f91909a82c2e1b7d47de58429d537eb423a35c563ebe84ce29eecbdd42ed26c07629b0ee2a346fc88
+  metadata.gz: 69781f08c15fa0557f37c72d0a7261c89eb9f3a2e3ccc8f2bb1bbc911add7aa47831ead77d871a238080738c042c61fb2ba3b8c572ae5bca327c84cd8ae3c5bc
+  data.tar.gz: ffbedb19ac36aff619b76c9755b77f97495d421ac81422a8332f45061d5c72255ef4266a9a8afb42ef59322515d272e8531d7cd1858eb78d92b565818fc4eea8

data/lib/nicovideo.rb

@@ -31,7 +31,7 @@ class Nicovideo < WebRadio
 				serial = tmp if tmp > 0
 			end
 			appendix = title =~ /おまけ|アフタートーク/ ? 'a' : ''
-			@file = "#{@label}##{'%02d' % serial}#{appendix}.#{video.type}"
+			@file = "#{@label}##{'%02d' % serial}#{appendix}.#{video.type || 'mp4'}"
 			@mp3_file = @file.sub(/\....$/, '.mp3')
 			mp3nize(@file, @mp3_file) do
 				loop do
@@ -39,7 +39,7 @@ class Nicovideo < WebRadio
 					_, 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|AssertionError/
+					raise ForbiddenError.new("Could not access to #{video.url}") if err =~ /TypeError|AssertionError|The video can't be downloaded/
 					raise DownloadError.new(err) 
 				end
 			end

data/lib/onsen.rb

@@ -12,12 +12,24 @@ class Onsen < HLS
 	def initialize(params, options)
 		super
 		@cover = "//*[@class='newest-content--left']//img[1]/@src" unless @cover
+		@offset = 0
 	end
 
 	def download
+		program = File.basename(URI(@url).path)
 		html = URI.open(@url, HEADERS, &:read)
-		serial = Nokogiri(html).css('.play-video-info td')[0].text.scan(/\d+/)[0].to_i
-		m3u8 = JSON.parse(html.scan(%r|streaming_url:("https:.*?.m3u8")|).flatten.sort.last)
+		serial = 0
+		Nokogiri(html).css('.play-video-info tr').each do |tr|
+			begin
+				serial = tr.css('td')[0].text.scan(/\d+/)[0].to_i
+			rescue NoMethodError
+				next # the header of tables
+			end
+			break unless serial == 0
+		end
+		m3u8 = html.gsub(%r[\\u002F], '/').scan(%r|"(https:[^:]*?.m3u8)"|).flatten.select{|m|
+			m.match(%r|/\d+/#{program}.*?-#{serial}\.mp4|)
+		}.first
 		hls_download(@label, serial, m3u8, HEADERS)
 	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       = "4.13.0"
+  spec.version       = "4.14.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, himalaya, asobi store, stand.fm and youtube.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 4.13.0
+  version: 4.14.0
 platform: ruby
 authors:
 - Tada, Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-27 00:00:00.000000000 Z
+date: 2022-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Downloading newest radio programs on the web.