rget 4.8.4 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03b7d1828386cb0e82ac5a74e638df84d09261e127ed70ab6d3d0b5ab8ab0e27
-  data.tar.gz: 20ac0f562a4247470d0f805a3b6916c142089bc46ff93dc70ea83bf6a850e057
+  metadata.gz: eb55840b853e5fdb7a25521b025c3fb4cd18d164c8ad28c33896e113b1f2f5b2
+  data.tar.gz: 5ee1cde4d467a0cb7f641280bfbd663fba4f1d8eccca6c93a6946d61d8545128
 SHA512:
-  metadata.gz: 1ac0660ba7e663e31410fc9c5efa10d7700ae39e44605bab3a7be9b1981708ed41ee7611f5cab987830766eef8bc3433da777dcf76a4c20b90cb30708e69e36d
-  data.tar.gz: 04a08917dfbd660f2ba2e1be0df9d9ac8af7bd611d42795a6a278fcc9eedcd30d32cf36ab2f5e732e359eccdeda2b4aa29a5677aa1e885f61ae083b1543a6928
+  metadata.gz: 9329208c0d637d37b7c6e4f7dc7df19e8809b035e692b50571c6888ebab4d5e7548e5db110ad81c50991953ab7f36f0a6955c6bd3651e3e8a6607dd638925ae2
+  data.tar.gz: 2fd48e4acf50937d818e203cf47a9d9222a55707e20ca7ae23e40fcacd8d02640a886a28bfd8fbc3e5fd532ae18ef19f19b2d2e5adb9b72fe5e7f9b009c1760c

data/README.md

@@ -7,7 +7,7 @@ Downloading newest radio programs on the web. Supported radio stations are:
 * niconico
 * freshlive.tv
 * himalaya.fm
-* Abobi Store
+* Asobi Store
 
 If you want to save files as MP3, needs `ffmpeg` command.
 To download niconico video, also needs latest `youtube-dl` command (you can get it from `https://yt-dl.org/`), then specify niconico user ID and password to `~/.netrc` as:

data/bin/{ulizadl → hls-dl}

@@ -5,8 +5,8 @@ require 'open-uri'
 require 'thread'
 
 if ARGV.size != 2
-	$stderr.puts "download TS file decoded by Uliza style video streaming"
-	$stderr.puts "ulizadl <playlist.m3u8> <output(.ts)>"
+	$stderr.puts "high speed video downloader of Http Live Streaming (HLS)"
+	$stderr.puts "hls-dl <playlist.m3u8> <output(.ts)>"
 	exit 1
 end
 
@@ -21,7 +21,7 @@ begin
 	agent.get(m3u8)
 	body = agent.page.body
 rescue ArgumentError
-	body = open(m3u8, &:read)
+	body = URI.open(m3u8, &:read)
 end
 tses = body.scan(/.*\.ts.*/)
 key_url = body.scan(/URI="(.*)"/).flatten.first

data/lib/asobistore.rb

@@ -10,9 +10,9 @@ class AsobiStore < WebRadio
 
 	def download
 		player = find_player(@url)
-		html = Nokogiri(open("https:#{player}").read)
+		html = Nokogiri(URI.open("https:#{player}").read)
 		src_m3u8 = html.css('source').first.attr('src')
-		m3u8 = "#{File.dirname(src_m3u8)}/#{open(src_m3u8).read.match(/^[^#].*/)[0]}"
+		m3u8 = "#{File.dirname(src_m3u8)}/#{URI.open(src_m3u8).read.match(/^[^#].*/)[0]}"
 
 		serial = html.title.scan(/#(\d+)/).flatten.first.to_i
 		@cover = "https:#{html.css('audio,video').first.attr('poster')}" unless @cover
@@ -24,7 +24,7 @@ class AsobiStore < WebRadio
 			agent.get(m3u8)
 			body = agent.page.body
 		rescue ArgumentError
-			body = open(m3u8, &:read)
+			body = URI.open(m3u8, &:read)
 		end
 		tses = body.scan(/.*\.ts.*/)
 		key_url = body.scan(/URI="(.*)"/).flatten.first
@@ -52,10 +52,10 @@ class AsobiStore < WebRadio
 
 private
 	def find_player(url)
-		programs = Nokogiri(open(url).read)
+		programs = Nokogiri(URI.open(url).read)
 		programs.css('.list-main-product a.wrap').each do |program|
 			begin
-				return Nokogiri(open("https://asobistore.jp#{program.attr('href')}").read).css('iframe').last.attr('src')
+				return Nokogiri(URI.open("https://asobistore.jp#{program.attr('href')}").read).css('iframe').last.attr('src')
 			rescue # access denied because only access by premium members
 				next
 			end

data/lib/freshlive.rb

@@ -10,7 +10,7 @@ class FreshLive < WebRadio
 			archive = URI(File.join(@url + '/programs/archive'))
 		end
 
-		each_programs(Nokogiri(open(archive).read)) do |meta|
+		each_programs(Nokogiri(URI.open(archive).read)) do |meta|
 			begin
 				serial = meta['data']['title'].scan(/\d+$/).first.to_i
 				src = "#{@label}##{'%02d' % serial}.ts"
@@ -24,7 +24,7 @@ class FreshLive < WebRadio
 						print "getting #{src}..."
 						ts_list(meta['data']['archiveStreamUrl']).each_with_index do |u, i|
 							print '.' if i % 50 == 0
-							w.write(open(u, 'rb').read)
+							w.write(URI.open(u, 'rb').read)
 						end
 					end
 				end
@@ -62,7 +62,7 @@ class FreshLive < WebRadio
 			}
 		else
 			tag = Pathname(u.path).basename.to_s
-			meta = JSON.parse(Nokogiri(open(@url, &:read)).css('script').first)
+			meta = JSON.parse(Nokogiri(URI.open(@url, &:read)).css('script').first)
 			return {
 				tag => {
 					'desc' => meta['name'],
@@ -78,13 +78,13 @@ private
 		x = "//section[descendant::h1[contains(text(),'アーカイブ')]]//*[contains(@class,'ProgramTitle')]/a/@href"
 		html.xpath(x).each do |href|
 			id = Pathname(href.value).basename.to_s
-			yield JSON.parse(open("https://freshlive.tv/proxy/Programs;id=#{id}", &:read))
+			yield JSON.parse(URI.open("https://freshlive.tv/proxy/Programs;id=#{id}", &:read))
 		end
 	end
 
 	def ts_list(rate_m3u8)
-		ts_m3u8 = open(rate_m3u8).read.each_line.grep_v(/^#/)[1].chomp
-		open(URI(rate_m3u8) + ts_m3u8).read.each_line.grep_v(/^#/).map{|u|URI(rate_m3u8) + u.chomp}
+		ts_m3u8 = URI.open(rate_m3u8).read.each_line.grep_v(/^#/)[1].chomp
+		URI.open(URI(rate_m3u8) + ts_m3u8).read.each_line.grep_v(/^#/).map{|u|URI(rate_m3u8) + u.chomp}
 	end
 
 	def to_mp3(src)

data/lib/himalaya.rb

@@ -8,7 +8,7 @@ class Himalaya < WebRadio
 	end
 
 	def download
-		html = open(@url).read
+		html = URI.open(@url).read
 		json_str = html.scan(/__NEXT_DATA__ = (.*)/).flatten.first
 		json = JSON.parse(json_str)
 		tracks = json['props']['seo']['albumData']['data']['tracks']['list']
@@ -22,7 +22,7 @@ class Himalaya < WebRadio
 		mp3_file = "#{@label}##{serial}.mp3"
 		mp3nize(m4a_file, mp3_file) do
 			open(m4a_file, 'wb:ASCII-8BIT') do |m4a|
-				m4a.write(open(m4a_url).read)
+				m4a.write(URI.open(m4a_url).read)
 			end
 		end
 	end

data/lib/{uliza.rb → hls.rb}

@@ -1,8 +1,8 @@
 require 'webradio'
 
-class Uliza < WebRadio
+class HLS < WebRadio
 private
-	def uliza_download(name, html, serial_pattern, m3u_pattern)
+	def hls_download(name, html, serial_pattern, m3u_pattern)
 		serial = html.scan(serial_pattern).flatten.sort{|a,b| a.to_i <=> b.to_i}.last
 		@m4a_file = "#{name}##{serial}.m4a"
 		@mp3_file = @m4a_file.sub(/\.m4a$/, '.mp3')
@@ -11,18 +11,18 @@ private
 			unless m3u_meta2
 				raise WebRadio::DownloadError.new("recent radio program not found.")
 			end
-			m3u_meta1 = open(m3u_meta2, &:read)
+			m3u_meta1 = URI.open(m3u_meta2, &:read)
 			m3u = m3u_meta1.scan(/^[^#].*/).first
 			save_m4a(URI(m3u), @m4a_file)
 		end
 	end
 
 	def get_m4a(uri_playlist)
-		open(uri_playlist).each_line do |l|
+		URI.open(uri_playlist).each_line do |l|
 			next if /^#/ =~ l
 			l.chomp!
 			print "."
-			yield open(uri_playlist + l, 'r:ASCII-8BIT', &:read)
+			yield URI.open(uri_playlist + l, 'r:ASCII-8BIT', &:read)
 		end
 	end
 	

data/lib/nicovideo.rb

@@ -74,11 +74,11 @@ private
 		video_url = nil
 		begin
 			begin
-				rss = RSS::Parser.parse(open(list_url).read)
+				rss = RSS::Parser.parse(URI.open(list_url).read)
 				item = rss.items[offset]
 				video_url = item.link
 			rescue RSS::NotWellFormedError
-				html = open(list_url, &:read)
+				html = URI.open(list_url, &:read)
 				url = html.scan(%r|/watch/[\w]+|)[offset]
 				raise WebRadio::DownloadError.new('video not found in this pege') unless url
 				video_url = "http://www.nicovideo.jp#{url}"
@@ -93,7 +93,7 @@ private
 	end
 
 	def thumbinfo(video, elem = nil)
-		xml = open("http://ext.nicovideo.jp/api/getthumbinfo/#{video.id}").read
+		xml = URI.open("http://ext.nicovideo.jp/api/getthumbinfo/#{video.id}").read
 		if elem
 			return xml.scan(%r|<#{elem}>(.*)</#{elem}>|m).flatten.first
 		else

data/lib/onsen.rb

@@ -15,7 +15,7 @@ class Onsen < WebRadio
 
 	def dump
 		tag = Pathname(@url).basename.to_s.gsub(%r|[-/]|, '_')
-		html = Nokogiri(open(@url, &:read))
+		html = Nokogiri(URI.open(@url, &:read))
 		title = html.css('#outLineWrap h1').text
 		return {
 			tag => {
@@ -28,7 +28,7 @@ class Onsen < WebRadio
 
 private
 	def onsen_download(name, program_id)
-		html = Nokogiri(open('http://onsen.ag/', 'User-Agent' => 'iPhone', &:read))
+		html = Nokogiri(URI.open('http://onsen.ag/', 'User-Agent' => 'iPhone', &:read))
 		begin
 			serial = html.css("##{program_id}").text.scan(/#(\d+)/).flatten.first
 			mp3_url = html.css('form[target=_self]').select {|form|
@@ -41,7 +41,7 @@ private
 		mp3_file = "#{name}##{serial}.mp3"
 		mp3nize(src_file, mp3_file, false) do
 			open(src_file, 'wb:ASCII-8BIT') do |mp3|
-				mp3.write open(mp3_url, 'rb:ASCII-8BIT', &:read)
+				mp3.write URI.open(mp3_url, 'rb:ASCII-8BIT', &:read)
 			end
 		end
 	end

data/lib/podcast.rb

@@ -29,7 +29,7 @@ class Podcast
 		end
 		print "getting #{serial}..."
 		open(file, 'wb:ASCII-8BIT') do |o|
-			o.write(open(episode.enclosure.url, 'rb:ASCII-8BIT', &:read))
+			o.write(URI.open(episode.enclosure.url, 'rb:ASCII-8BIT', &:read))
 		end
 		puts "done."
 	end

data/lib/webradio.rb

@@ -132,13 +132,13 @@ private
 	end
 
 	def cover_image_as_url
-		open(@cover, 'rb', &:read)
+		URI.open(@cover, 'rb', &:read)
 	end
 
 	def cover_image_as_xpath
-		html = Nokogiri(open(@url, &:read))
+		html = Nokogiri(URI.open(@url, &:read))
 		image_url = (URI(@url) + (html.xpath(@cover)[0].text)).to_s
-		open(image_url, 'r:ASCII-8BIT', &:read)
+		URI.open(image_url, 'r:ASCII-8BIT', &:read)
 	end
 
 	def exist?(dst)

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

data/rget.yaml

@@ -1,5 +1,5 @@
 options:
-  mp3nize: ffmpeg -i '$1' -vn -acodec copy '$2' || ffmpeg -i '$1' -vn -y -ab 64k '$2'
+  mp3nize: ffmpeg -i '$1' -vn -acodec copy '$2' || ffmpeg -i '$1' -vn -y -ab 128k '$2'
 programs:
   imas_cg:
     desc: デレラジ☆
@@ -15,44 +15,11 @@ programs:
     url: http://ch.nicovideo.jp/search/%E6%B4%B2%E5%B4%8E%E8%A5%BF?channel_id=ch2589908&mode=s&sort=f&order=d&type=video
     label: 洲崎西
     cover: https://pbs.twimg.com/profile_images/836214019849506818/kXSasy1Y.jpg
-  takamori:
-    desc: 高森重戦舎 (声優バラエティ専門「声フレ」チャンネル内)
-    url: https://freshlive.tv/seifre
-    label: 高森重戦舎
-  bahamut:
-    desc: ラジオ神撃のバハムート
-    url: http://hibiki-radio.jp/description/bahamut
-    label: バハムート
-  ssc:
-    desc: 春佳・彩花のSSちゃんねる
-    url: http://ch.nicovideo.jp/search/SS%E3%81%A1%E3%82%83%E3%82%93%E3%81%AD%E3%82%8B?channel_id=ch2589908&mode=s&sort=f&order=d&type=video
-    label: 春佳・彩花のSSちゃんねる
-  remake:
-    desc: りめいく！
-    url: http://ch.nicovideo.jp/search/%E3%82%8A%E3%82%81%E3%81%84%E3%81%8F?channel_id=ch2589908&mode=s&sort=f&order=d&type=video
-    label: りめいく！
-  adlib:
-    desc: あどりぶ
-    url: http://ch.nicovideo.jp/search/%E3%81%82%E3%81%A9%E3%82%8A%E3%81%B6?channel_id=ch2589908&mode=s&sort=f&order=d&type=video
-    label: あどりぶ
-  trysail:
-    desc: TrySailのTRYangle harmony
-    url: http://ch.nicovideo.jp/search/TrySail?channel_id=ch2585696&mode=s&sort=f&order=d&type=video
-    label: トラハモ
-  banpresto:
-    desc: アイドルマスターWebラジオ～バンプレストスペシャル～
-    url: http://ch.nicovideo.jp/search/IDOLM@STER?channel_id=ch346&mode=s&sort=f&order=d&type=video
-    label: バンプレスト
-  rebuild:
-    desc: Rebuild.fm
-    url: http://feeds.rebuild.fm/rebuildfm
-    label: rebuildfm
-    podcast: true
-  taneharu:
-    desc: ラジオ「たねさんはるさんとはなそ。(意志)」
-    url: http://m.himalaya.fm/jp/podcast/190452
-    label: たねさんはるさんとはなそ。(意志)
   shiny_radio:
     desc: ラジオ「アイドルマスター シャイニーカラーズ はばたきラジオステーション」
     url: https://asobistore.jp/special/List?ip_seq%5B%5D=1&ip_seq%5B%5D=14&tag_seq%5B%5D=1
     label: シャニラジ
+  luminesan:
+    desc: ル美子さん
+    url: https://ch.nicovideo.jp/luminesan/video?rss=2.0
+    label: ル美子さん

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 4.8.4
+  version: 4.9.0
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2019-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -156,8 +156,8 @@ email:
 - t@tdtds.jp
 executables:
 - add_mp3info
+- hls-dl
 - rget
-- ulizadl
 extensions: []
 extra_rdoc_files: []
 files:
@@ -168,17 +168,17 @@ files:
 - README.md
 - Rakefile
 - bin/add_mp3info
+- bin/hls-dl
 - bin/rget
-- bin/ulizadl
 - lib/asobistore.rb
 - lib/dropbox.rb
 - lib/freshlive.rb
 - lib/hibiki.rb
 - lib/himalaya.rb
+- lib/hls.rb
 - lib/nicovideo.rb
 - lib/onsen.rb
 - lib/podcast.rb
-- lib/uliza.rb
 - lib/webradio.rb
 - rget.gemspec
 - rget.yaml