rget 4.8.3 → 4.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ef68f95f3fbafd9b06628962504a762ea8fa4782d98e87a006a0778f19d92e3
-  data.tar.gz: 698f889ccbf793023b8ee5409aee34039f759cb1d650c453fd6a38524a456fa2
+  metadata.gz: 222b83cd5f8c3cff4f1b3372ec7488cc2bc4643c66469be1259d123c54e53643
+  data.tar.gz: d2eda18075858e1e78fe0a862140161edfab2ad886075ba80e8b1a450f0ec617
 SHA512:
-  metadata.gz: 55a57b0f4190c235469156e8a9af6b87d0be727e2988d5d6ebe32110d89d1bfb4f269e79712dc7ed0170f3d05704aa9d870a2c2b8546a3619bea8d73dd89ff20
-  data.tar.gz: 16af48cd344bb6ff1e6638b4b5838605d8daae2d7bfd6ba4e5ba880ccc3451ee97aeda07026dea1c56939693db8878868e61f68742f9fe26c5e0a24a02ac6ee5
+  metadata.gz: 54d7bcead0ea3ddbb7a88afad7e7b95bde817c7272d0c2c4c567925bc41cc5ce35dff780624be93b92a49ec0e74ce9ac6cacf22f4c61c109543d73dc6d320728
+  data.tar.gz: f722aabcdaa8767d0fecaebedc400c26312ad44c5b8894f1cd3567c0eabbadee13aaeefbcc8a7211779b8427a386725e1a1406b788ae2c791183b2b07727e15a

data/.devcontainer/Dockerfile

@@ -0,0 +1,14 @@
+FROM ruby:2
+ENV USER vscode
+LABEL maintainer "@tdtds <t@tdtds.jp>"
+RUN apt-get -y update && apt-get -y install ffmpeg && \
+    curl -sLo /usr/local/bin/youtube-dl http://www.yt-dl.org/downloads/latest/youtube-dl && \
+    chmod +x /usr/local/bin/youtube-dl && \
+    useradd -u 1000 -m $USER && chsh -s /bin/bash $USER
+USER $USER
+RUN bundle config set path vendor/bundle && \
+    bundle config set with development:test && \
+    echo 'git config --global --unset core.editor' >> /home/$USER/.bashrc && \
+    echo 'git config --global --unset core.sshCommand' >> /home/$USER/.bashrc && \
+    echo 'git ls-remote -q > /dev/null' >> /home/$USER/.bashrc
+CMD [ "sleep", "infinity" ]

data/.devcontainer/devcontainer.json

@@ -0,0 +1,30 @@
+// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.122.1/containers/docker-from-docker-compose
+// If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml.
+{
+  "name": "rget",
+  "context": "..",
+  "dockerFile": "Dockerfile",
+  
+  // Set *default* container specific settings.json values on container create.
+  "settings": { 
+    "terminal.integrated.shell.linux": "/bin/bash"
+  },
+
+  // Add the IDs of extensions you want installed when the container is created.
+  "extensions": [
+		"rebornix.ruby"
+  ],
+
+  // Uncomment the next line if you want start specific services in your Docker Compose config.
+  // "runServices": [],
+
+  // Uncomment the next line if you want to keep your containers running after VS Code shuts down.
+  // "shutdownAction": "none",
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "docker --version",
+
+  // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
+  // "remoteUser": "vscode"
+}

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:
@@ -25,9 +25,10 @@ For customize radio programs, copy `rget.yaml` to `~/.rget` or current work dire
 * `~/.rget`
 * `<command path>/../rget.yaml` (for gem)
 
-## Installation
+## Installation and Setup
 ```
   $ gem install rget
+  $ rget init > ~/.rget # or your local rget.yaml
 ```
 
 ## Usage
@@ -41,14 +42,14 @@ rget yaml http://example.com/radio >> ~/.rget
 # download and convert to mp3 THE iDOLM@STER Cinderella Girls Radio
 rget imas_cg
 
-# download takamori only (saving movie file as .MP4)
-rget takamori --no-mp3
+# download suzakinishi only (saving movie file as .MP4)
+rget suzakinishi --no-mp3
 
 # srore mp3 file to specified directory
-rget suzakinishi --path=/home/hoge/radio
+rget matsui --path=/home/hoge/radio
 
 # store mp3 file to radio folder of Dropbox
-rget matsui --path=dropbpx://radio
+rget shiny_radio --path=dropbpx://radio
 ```
 
 ### add\_mp3info command

data/bin/hls-dl

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+require "open3"
+
+if ARGV.size != 2
+	$stderr.puts "HLS downloader wrapping ffmpeg"
+	$stderr.puts "hls-dl <playlist.m3u8> <output(.mp4,mp3,...)>"
+	exit 1
+end
+
+ffmpeg = %Q[ffmpeg -loglevel error -protocol_whitelist file,http,https,tcp,tls,crypto -n -i "#{ARGV[0]}" #{ARGV[1]}]
+result = Open3.capture3(ffmpeg)
+unless result[2].to_i == 0
+	p result
+	File.delete(ARGV[1]) if File.exist?(ARGV[1])
+	$stderr.puts result[1]
+	exit(1)
+end
+exit(0)

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/hibiki.rb

@@ -57,10 +57,12 @@ private
 			playlist_url = video_info[:playlist_url]
 			m3u8_url = URI(agent.get(playlist_url).body.scan(/http.*/).flatten.first)
 
-			m3u8 = agent.get(m3u8_url).body
+			# choice the max size element from multi-part m3u8 file
+			m3u8 = agent.get(m3u8_url).body.split("EXT-X-KEY").sort{|m,n|m.size <=> n.size}.last
+
 			key_url = m3u8.scan(/URI="(.*)"/).flatten.first
 
-			tses = m3u8.scan(/ts_.*\.ts/)
+			tses = m3u8.scan(/^.*ts_.*\.ts/)
 			key = agent.get_file(key_url)
 			iv = m3u8.scan(/IV=0x(.*)$/).flatten.pack("H*")
 		rescue NoMethodError

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/hls.rb

@@ -0,0 +1,19 @@
+require 'webradio'
+require 'open3'
+
+class HLS < WebRadio
+private
+	def hls_download(name, serial, m3u_meta)
+		mp4_file = "#{name}##{serial}.mp4"
+		mp3_file = "#{name}##{serial}.mp3"
+		m3u = URI.open(m3u_meta, &:read).scan(/^[^#].*/).first
+		m3u = Pathname(m3u_meta).dirname.join(m3u) if Pathname(m3u).relative?
+		mp3nize(mp4_file, mp3_file) do
+			result = Open3.capture3(%Q[ffmpeg -loglevel error -protocol_whitelist file,http,https,tcp,tls,crypto -i "#{m3u}" "#{mp4_file}"])
+			unless result[2].to_i == 0
+				raise WebRadio::DownloadError.new("failed download the radio program (#{@label}).")
+			end
+		end
+	end
+end
+

data/lib/nicovideo.rb

@@ -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/
+					raise ForbiddenError.new("Could not access to #{video.url}") if err =~ /TypeError|AssertionError/
 					raise DownloadError.new(err) 
 				end
 			end
@@ -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

@@ -1,22 +1,26 @@
 # encoding: utf-8
 
-require 'webradio'
+require 'hls'
 require 'nokogiri'
+require 'json'
 
-class Onsen < WebRadio
+class Onsen < HLS
 	def initialize(params, options)
 		super
-		@cover = "//*[@id='newProgramWrap']//img[1]/@src" unless @cover
+		@cover = "//*[@class='newest-content--left']//img[1]/@src" unless @cover
 	end
 
 	def download
-		onsen_download(@label, @url.scan(%r|/([^/]*)/$|).flatten.first)
+		html = URI.open(@url, &: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)
+		hls_download(@label, serial, m3u8)
 	end
 
 	def dump
 		tag = Pathname(@url).basename.to_s.gsub(%r|[-/]|, '_')
-		html = Nokogiri(open(@url, &:read))
-		title = html.css('#outLineWrap h1').text
+		html = Nokogiri(URI.open(@url, &:read))
+		title = html.css('h3')[0].text
 		return {
 			tag => {
 				'desc' => title,
@@ -25,24 +29,4 @@ class Onsen < WebRadio
 			}
 		}
 	end
-
-private
-	def onsen_download(name, program_id)
-		html = Nokogiri(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|
-				form.attr('action') =~ %r|/#{program_id}\w+\.mp[34]|
-			}.first.attr('action')
-		rescue NoMethodError
-			raise NotFoundError.new("no radio program in #{program_id}.")
-		end
-		src_file = "#{name}##{serial}#{mp3_url.scan(/\.mp[34]$/).first}"
-		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)
-			end
-		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

@@ -14,7 +14,7 @@ class WebRadio
 		when %r[^https?://hibiki-radio\.jp/]
 			require 'hibiki'
 			Hibiki.new(params, options)
-		when %r[^http://(www\.)?onsen\.ag/program/]
+		when %r[^https?://(www\.)?onsen\.ag/program/]
 			require 'onsen'
 			Onsen.new(params, options)
 		when %r[nicovideo\.jp]
@@ -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.3"
+  spec.version       = "4.9.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.}

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.3
+  version: 4.9.3
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -156,11 +156,13 @@ email:
 - t@tdtds.jp
 executables:
 - add_mp3info
+- hls-dl
 - rget
-- ulizadl
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/devcontainer.json"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -168,17 +170,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
@@ -201,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Downloading newest radio programs on the web.

data/bin/ulizadl

@@ -1,103 +0,0 @@
-#!/usr/bin/env ruby
-require "uri"
-require "mechanize"
-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)>"
-	exit 1
-end
-
-m3u8 = ARGV.shift
-ts_file = "#{ARGV.shift}.ts"
-ts_file = nil if File.basename(ts_file) == "-.ts"
-
-begin
-	agent = Mechanize.new
-	agent.user_agent_alias = 'Windows Chrome'
-	agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
-	agent.get(m3u8)
-	body = agent.page.body
-rescue ArgumentError
-	body = open(m3u8, &:read)
-end
-tses = body.scan(/.*\.ts.*/)
-key_url = body.scan(/URI="(.*)"/).flatten.first
-
-if key_url
-	key = agent.get_file(key_url)
-	decoder = OpenSSL::Cipher.new('aes-128-cbc')
-	decoder.key = key
-	decoder.decrypt
-else
-	decoder = ''
-	def decoder.update(s); return s; end
-	def decoder.final(); return ''; end
-end
-
-q = Queue.new
-tses.each_with_index{|ts_url, block_no| q.push([ts_url, block_no])}
-q.close
-results = [nil] * q.size
-
-msgs = Queue.new
-stats = [0] * 3
-stats.size.times do |thread_no|
-	Thread.start(thread_no) do |thread_no|
-		while (ts_url, block_no = q.pop)
-			begin
-				sleep(rand(0.1) * 3)
-				results[block_no] = agent.get_file(ts_url)
-				stats[thread_no] = block_no
-			rescue Mechanize::ResponseCodeError => e
-				case e.response_code
-				when "403" # Forbidden
-					msgs.push "T#{thread_no}: 403 Forbidden"
-					retry
-				when "429" # TooManyRequests
-					msgs.push "T#{thread_no}: 429 TooManyRequests"
-					retry
-				else
-					msgs.push "T#{thread_no}: #{e}"
-					retry # TODO: catch other status code
-				end
-			rescue
-				msgs.push "T#{thread_no}: #{e.class} #{e}"
-				break
-			end
-		end
-	end
-end
-
-def print_status(block, tses, stats, msgs)
-	$stderr.puts msgs.pop while !msgs.empty?
-	$stderr.print "#{block+1}/#{tses.size} saved --"
-	stats.each_with_index{|block_no, thread_no| $stderr.print " T#{thread_no+1}:#{block_no+1}"}
-	$stderr.print "\r"
-end
-
-def save(fd, results, tses, stats, msgs, decoder)
-	results.each_with_index do |data, i|
-		print_status(i, tses, stats, msgs)
-		loop do
-			if data
-				fd.write(decoder.update(data))
-				results[i] = nil # be saved data want to GC
-				break
-			else
-				sleep(1.0) # wait for complete of chunk download finished
-				data = results[i]
-			end
-		end
-	end
-	fd.write(decoder.final)
-	puts
-end
-
-if ts_file
-	open(ts_file, 'wb:ASCII-8BIT'){|f|save(f, results, tses, stats, msgs, decoder)}
-else
-	save($stdout, results, tses, stats, msgs, decoder)
-end

data/lib/uliza.rb

@@ -1,37 +0,0 @@
-require 'webradio'
-
-class Uliza < WebRadio
-private
-	def uliza_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')
-		mp3nize(@m4a_file, @mp3_file) do
-			m3u_meta2 = html.scan(m3u_pattern).flatten.sort.last
-			unless m3u_meta2
-				raise WebRadio::DownloadError.new("recent radio program not found.")
-			end
-			m3u_meta1 = 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|
-			next if /^#/ =~ l
-			l.chomp!
-			print "."
-			yield open(uri_playlist + l, 'r:ASCII-8BIT', &:read)
-		end
-	end
-	
-	def save_m4a(uri_playlist, m4a_file)
-		open(m4a_file, 'wb:ASCII-8BIT') do |m4a|
-			get_m4a(uri_playlist) do |part|
-				m4a.write part
-			end
-		end
-	end
-end
-