rget 2.5.4 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 858d994084e4cf000d71746ebd0f91858b3765d9
-  data.tar.gz: ff422c2351a9bc66a222d93dfa36e5cf4ccd7231
+  metadata.gz: 430ab60d77c7ae45f44ea928335585d08dab612c
+  data.tar.gz: 9a1c2aa1cc84bda8020cb741aab878d0e1209908
 SHA512:
-  metadata.gz: 5d8a0e56c23b1f1bd720a4d80701c39aee3e4dd7a51c9071c41a246351f9dd27df5878d1cd34a19476361ed4b0c616982f44776fb765134a6f57e27747524b23
-  data.tar.gz: ef19273117c868dec6f5ef4034354f10159f6c5d4fda2fa15ed57ade1de6d232646516d8f7c5d828bbbe78a49c4b94bd4484fb793adb92763b65889083cb1d7f
+  metadata.gz: fcbdfab23f88567de63d43265057479b0d67490cf3d7de7bb08855efbb54c6410cbb55c130fe9010284924dcfc786844b88f383109da1e8f66e3ea9b5a1b3e73
+  data.tar.gz: 295a9df1458733a29c528285000c5833b0a3260c22cb7c147ea39a6c10be6e1bcac2afdd8d5e784c6ce3a89369a04760acc2d1ac9722be8e867110e5edb7d881

data/bin/rget

@@ -47,6 +47,12 @@ class GetWebRadio < Thor
 			end
 		end
 	end
+
+	desc 'yaml', 'dump YAML of specified URL'
+	def yaml(url)
+		dump = WebRadio(url, OpenStruct.new({dump: true})).dump
+		puts YAML.dump(dump).lines.drop(1).map{|l| "  #{l}"}
+	end
 end
 
 GetWebRadio.start(ARGV)

data/lib/hibiki.rb

@@ -7,23 +7,43 @@ require 'uri'
 require 'openssl'
 
 class Hibiki < WebRadio
+	def initialize(url, options)
+		super
+		@url = @url.sub(%r|/detail\Z|, '')
+	end
+
 	def download(name)
-		hibiki_download(name, @url.scan(%r|/([^/]*)$|).flatten.first)
+		hibiki_download(name, Pathname(@url).basename.to_s)
+	end
+
+	def dump
+		tag = Pathname(@url).basename.to_s.gsub(%r|[-/]|, '_')
+		agent = Mechanize.new
+		media_info = hibiki_media_info(agent, tag)
+
+		return {
+			tag => {
+				'desc' => media_info[:name],
+				'url' => @url,
+				'label' => tag
+			}
+		}
 	end
 
 private
 	def header
-		{
-			'X-Requested-With' => 'XMLHttpRequest',
-		}
+		{'X-Requested-With' => 'XMLHttpRequest'}
 	end
 
-	def hibiki_download(name, program_id)
-		agent = Mechanize.new
+	def hibiki_media_info(agent, program_id)
 		agent.request_headers = header
+		JSON.parse(agent.get("https://vcms-api.hibiki-radio.jp/api/v1/programs/#{program_id}").body,{:symbolize_names => true})
+	end
 
+	def hibiki_download(name, program_id)
 		begin
-			media_info = JSON.parse(agent.get("https://vcms-api.hibiki-radio.jp/api/v1/programs/#{program_id}").body,{:symbolize_names => true})
+			agent = Mechanize.new
+			media_info = hibiki_media_info(agent, program_id)
 			serial = media_info[:episode][:name].scan(/([\d\.]+)/).flatten.first
 			video_id = media_info[:episode][:video][:id]
 
@@ -41,6 +61,7 @@ private
 			key = agent.get_file(key_url)
 			iv = m3u8.scan(/IV=0x(.*)$/).flatten.pack("H*")
 		rescue NoMethodError
+			$stderr.puts $!
 			raise NotFoundError.new("no radio program in #{program_id}.")
 		end
 

data/lib/nicovideo.rb

@@ -43,6 +43,23 @@ class Nicovideo < WebRadio
 		end
 	end
 
+	def dump
+		begin
+			tag = Pathname(@url).basename.to_s.gsub(%r|[-/]|, '_')
+			rss_url = "#{@url}/video?rss=2.0"
+			desc = RSS::Parser.parse(rss_url).channel.dc_creator
+			return {
+				tag => {
+					'desc' => desc,
+					'url' => rss_url,
+					'label' => tag
+				}
+			}
+		rescue RSS::NotWellFormedError
+			raise
+		end
+	end
+
 private
 	def get_player_url(list_url)
 		begin

data/lib/onsen.rb

@@ -8,6 +8,19 @@ class Onsen < WebRadio
 		onsen_download(name, @url.scan(%r|/([^/]*)/$|).flatten.first)
 	end
 
+	def dump
+		tag = Pathname(@url).basename.to_s.gsub(%r|[-/]|, '_')
+		html = Nokogiri(open(@url, &:read))
+		title = html.css('#outLineWrap h1').text
+		return {
+			tag => {
+				'desc' => title,
+				'url' => @url,
+				'label' => tag
+			}
+		}
+	end
+
 private
 	def onsen_download(name, program_id)
 		html = Nokogiri(open('http://onsen.ag/', 'User-Agent' => 'iPhone', &:read))

data/lib/webradio.rb

@@ -36,7 +36,7 @@ class WebRadio
 		raise 'do not instanciate directly, use WebRadio method.' if self.class == WebRadio
 		@url = url
 		@options = options
-		if @options.path =~ %r|^dropbox://|
+		if !@options.dump && @options.path =~ %r|^dropbox://|
 			require 'dropbox'
 			@dropbox = DropboxAuth.client
 		end
@@ -46,6 +46,10 @@ class WebRadio
 		raise 'not implemented.'
 	end
 
+	def dump
+		raise 'not implemented.'
+	end
+
 private
 	def mp3nize(src, dst, delete_src = true)
 		if @options.mp3

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       = "2.5.4"
+  spec.version       = "2.6.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, animate, onsen, seaside communications, niconico and youtube.}

metadata

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