rget 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1d75196a6acef38d594dd860a9cf4fece40efd0
-  data.tar.gz: 6552d578e32c479e8769eed425e1473b5b9b937e
+  metadata.gz: db7ca2a7888ae0141a1478525ec3c3338dcf1645
+  data.tar.gz: 385a19c4d0af62a476932ed5207db91c514ae5ec
 SHA512:
-  metadata.gz: 1db1697a12e359844606500b5e27c1fe188eeedf3695836745abb0297c3ba2887a3645b4e79b90dd75e965b489da866d369ad05da73c7d3b329e6592af9987fd
-  data.tar.gz: e7161b4d203517679d908d5dbdd9342463eccedb203669cad95331658f8e798293c361e2ce07cd76caed336149aeeb2ab6339869a80c0193d8a7c2453c96b506
+  metadata.gz: ca0503e920246e6cc73ba39e801c110aa3dc10c6b8a33c42d965d4988007470fb81212524f56e91bbe2306cfc4c120afa2baa8645613710a169108a905822fa1
+  data.tar.gz: 513ec0cdd6f96859030d77cf1f5348e89d95cdb86a64f584136b9cd2dc7bec9dbe6444c3847b214c1781421d6779342c3f77f81df1fdedf39d30443b3945f132

data/bin/rget

@@ -34,10 +34,14 @@ class GetWebRadio < Thor
 		define_method(command) do
 			url = params['url']
 			opts = OpenStruct.new(config['options'].merge(options))
-			if params['podcast']
-				Podcast.new(url, opts){|media|media.download(params['label'])}
-			else
-				WebRadio(url, opts){|media|media.download(params['label'])}
+			begin
+				if params['podcast']
+					Podcast.new(url, opts){|media|media.download(params['label'])}
+				else
+					WebRadio(url, opts){|media|media.download(params['label'])}
+				end
+			rescue WebRadio::NotFoundError => e
+				$stderr.puts e.message
 			end
 		end
 	end

data/lib/onsen.rb

@@ -11,10 +11,14 @@ class Onsen < WebRadio
 private
 	def onsen_download(name, program_id)
 		html = Nokogiri(open('http://onsen.ag/', 'User-Agent' => 'iPhone', &:read))
-		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+\.mp3]
-		}.first.attr('action')
+		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+\.mp3]
+			}.first.attr('action')
+		rescue NoMethodError
+			raise NotFoundError.new("no radio program in #{program_id}.")
+		end
 		mp3_file = "#{name}##{serial}.mp3"
 		mp3ize(mp3_file, mp3_file, false) do
 			open(mp3_file, 'wb:ASCII-8BIT') do |mp3|

data/lib/webradio.rb

@@ -4,6 +4,7 @@ require 'open-uri'
 require 'open3'
 
 class WebRadio
+	class NotFoundError < StandardError; end
 	class DownloadError < StandardError; end
 
 	def self.instance(url, options)

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - TADA Tadashi