rget 1.1.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e69a5656c92e3e537b3a90b732918e67ce280f4
-  data.tar.gz: e72c03363b144e4cf614c011e0d78899ed82eea9
+  metadata.gz: 3948e94aa1e3af6de50e3932f601b9cca3d7f9bd
+  data.tar.gz: e81647ae6ecd6a38f29a8da45672108d0d4f2a29
 SHA512:
-  metadata.gz: 1a0d0ec0ce1c3383738f05b912d3720a5ef22daf22a17c75d67edb3c7ece3332073afaf33e721ee7b91812faa6425981538f631d8cd671fa2e94b2c322e64b2f
-  data.tar.gz: 6cdd6589c472f255fc9ae55ba57ea1f9ff6b97834c8b992f9db950d16574fb1a9ac3bcd96e90c0e9dd16a48cb21aecc0111fc9ade7d46d234a7f03ac904607de
+  metadata.gz: 831e83211408af8a52f7731a3bdaf3cfe33f3116d3ca525774d924df9d761a09f5f1181d9e79208d9a489b6b394088c916b805bcb1b156ffe4bba013a33e364b
+  data.tar.gz: be3ebe369368e0e73473b78a8791ae8bba96b1799b2224196687a013b388a1c0d7f32dff35e4c9ef8bd16b89a198bbe4960aef4f11b8fe2012d6c1819357e071

data/bin/rget

@@ -7,7 +7,7 @@ require 'webradio'
 require 'podcast'
 
 class GetWebRadio < Thor
-	class_option :mp3, type: :boolean, default:false, desc:'convert to mp3 with ffmpeg'
+	class_option :mp3, type: :boolean, default:true, desc:'convert to mp3 with ffmpeg'
 
 	config = nil
 	[
@@ -39,14 +39,13 @@ class GetWebRadio < Thor
 
 private
 	def process(uri, label)
-		WebRadio(uri) do |radio|
+		WebRadio(uri, options) do |radio|
 			radio.download(label)
-			radio.mp3ize if options.mp3?
 		end
 	end
 
 	def podcast(uri, label = nil)
-		Podcast.new(uri) do |pod|
+		Podcast.new(uri, options) do |pod|
 			pod.download(label)
 		end
 	end

data/lib/nicovideo.rb

@@ -6,7 +6,7 @@ require 'open-uri'
 require 'rss'
 
 class Nicovideo < WebRadio
-	def initialize(url)
+	def initialize(url, options)
 		account = Pit::get('nicovideo', :require => {
 			:id => 'your nicovideo id',
 			:pass => 'your nicovideo password'
@@ -21,23 +21,15 @@ class Nicovideo < WebRadio
 		video = @nico.video(Pathname(URI(player_url).path).basename.to_s)
 		serial = video.title.scan(/(?:[#第]| EP)(\d+)|/).flatten.compact[0].to_i
 		@file = "#{name}##{'%02d' % serial}.#{video.type}"
-		if File.exist? @file
-			puts "'#{@file}' is existent. skipped."
-			return
-		end
-
-		print "getting #{serial}..."
-		open(@file, 'wb:ASCII-8BIT') do |o|
-			video.get_video do |body|
-				print '.'
-				o.write(body)
+		@mp3_file = @file.sub(/\....$/, '.mp3')
+		mp3ize(@file, @mp3_file) do
+			open(@file, 'wb:ASCII-8BIT') do |o|
+				video.get_video do |body|
+					print '.'
+					o.write(body)
+				end
 			end
 		end
-		puts "done."
-	end
-
-	def mp3ize
-		mp3_convert(@file, @file.sub(/\....$/, '.mp3'))
 	end
 
 private
@@ -49,7 +41,7 @@ private
 		rescue RSS::NotWellFormedError
 			html = open(list_url, &:read)
 			url = html.scan(%r|http://www.nicovideo.jp/watch/[\w]+|).first
-			raise StandardError.new('video not found in this pege') unless url
+			raise WebRadio::DownloadError.new('video not found in this pege') unless url
 			return url
 		end
 	end

data/lib/onsen.rb

@@ -16,14 +16,10 @@ private
 			form.attr('action') =~ %r[/#{program_id}\w+\.mp3]
 		}.first.attr('action')
 		mp3_file = "#{name}##{serial}.mp3"
-		if File.exist? mp3_file
-			puts "'#{mp3_file}' is existent. skipped."
-			return
+		mp3ize(mp3_file, mp3_file, false) do
+			open(mp3_file, 'wb:ASCII-8BIT') do |mp3|
+				mp3.write open(mp3_url, 'rb:ASCII-8BIT', &:read)
+			end
 		end
-		print "getting #{serial}..."
-		open(mp3_file, 'wb:ASCII-8BIT') do |mp3|
-			mp3.write open(mp3_url, 'rb:ASCII-8BIT', &:read)
-		end
-		puts "done."
 	end
 end

data/lib/podcast.rb

@@ -3,8 +3,9 @@
 require 'rss'
 
 class Podcast
-	def initialize(url)
+	def initialize(url, options)
 		@url = url
+		@options = options
 		yield self if block_given?
 	end
 

data/lib/seaside-c.rb

@@ -1,16 +1,11 @@
 require 'webradio'
 
 class SeasideCommnunications < WebRadio
-	def mp3ize
-		mp3_convert(@wma_file, @wma_file.sub(/\.wma$/, '.mp3'))
-	end
-
 	def download(name)
 		html = open(@url, &:read)
 		playlist_url, serial = html.scan(%r[(http:.*?\_(\d+).wax)]).flatten
 		unless playlist_url
-			puts "fail: recent radio program not found."
-			exit -1
+			raise WebRadio::DownloadError.new("recent radio program not found.")
 		end
 		serial = serial.to_i
 
@@ -18,17 +13,12 @@ class SeasideCommnunications < WebRadio
 		wma_url, = playlist.scan(%r[http://.*?\.wma])
 
 		@wma_file = "#{name}##{serial}.wma"
-		if File.exist? @wma_file
-			puts "'#{@wma_file}' is existent. skipped."
-			return
-		end
-
-		print "getting #{serial}..."
-		open(@wma_file, 'wb:ASCII-8BIT') do |wma|
-			wma.write(open(wma_url, &:read))
+		@mp3_file = @wma_file.sub(/\.wma$/, '.mp3')
+		mp3ize(@wma_file, @mp3_file) do
+			open(@wma_file, 'wb:ASCII-8BIT') do |wma|
+				wma.write(open(wma_url, &:read))
+			end
 		end
-		puts "done."
-		self
 	end
 end
 

data/lib/uliza.rb

@@ -1,31 +1,20 @@
 require 'webradio'
 
 class Uliza < WebRadio
-	def mp3ize
-		mp3_convert(@m4a_file, @m4a_file.sub(/\.m4a$/, '.mp3'))
-	end
-
 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"
-		if File.exist? @m4a_file
-			puts "'#{@m4a_file}' is existent. skipped."
-			return
-		end
-
-		m3u_meta2 = html.scan(m3u_pattern).flatten.sort.last
-		unless m3u_meta2
-			puts "fail: recent radio program not found."
-			exit -1
+		@mp3_file = @m4a_file.sub(/\.m4a$/, '.mp3')
+		mp3ize(@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
-		print "getting #{serial}"
-
-		m3u_meta1 = open(m3u_meta2, &:read)
-		m3u = m3u_meta1.scan(/^[^#].*/).first
-		save_m4a(URI(m3u), @m4a_file)
-		puts "done."
-		self
 	end
 
 	def get_m4a(uri_playlist)

data/lib/webradio.rb

@@ -4,55 +4,76 @@ require 'open-uri'
 require 'open3'
 
 class WebRadio
-	def self.instance(url)
+	class DownloadError < StandardError; end
+
+	def self.instance(url, options)
 		case url
 		when %r[^http://hibiki-radio\.jp/]
 			require 'hibiki'
-			Hibiki.new(url)
+			Hibiki.new(url, options)
 		when %r[^http://sp\.animate\.tv/]
 			require 'animate'
 			Animate.new(url)
 		when %r[^http://onsen\.ag/program/]
 			require 'onsen'
-			Onsen.new(url)
+			Onsen.new(url, options)
 		when %r[^http://seaside-c\.jp/program/], %r[http://nakamuland\.net/]
 			require 'seaside-c'
-			SeasideCommnunications.new(url)
+			SeasideCommnunications.new(url, options)
 		when %r[nicovideo\.jp]
 			require 'nicovideo'
-			Nicovideo.new(url)
+			Nicovideo.new(url, options)
 		else
 			raise 'unsupported url.'
 		end
 	end
 
-	def initialize(url)
+	def initialize(url, options)
 		raise 'do not instanciate directly, use WebRadio method.' if self.class == WebRadio
 		@url = url
+		@options = options
 	end
 
 	def download(name)
 		raise 'not implemented.'
 	end
 
-	def mp3ize
-		return
-	end
-
 private
-	def mp3_convert(src, dst, bitrate = 64)
+	def mp3ize(src, dst, delete_src = true)
+		# download src file
+		if !File.exist?(src) && !File.exist?(dst)
+			print "getting #{src}..."
+			begin
+				yield
+				puts "done."
+			rescue DownloadError => e
+				puts "failed."
+				File.delete(src) if File.exist?(src)
+				$stderr.puts e.message
+				return
+			end
+		end
+
+		# convert to mp3
+		return self unless @options.mp3
+
+		print "converting to mp3..."
 		if File.exist? dst
-			puts "'#{dst}' is existent. skipped."
-			return self
+			puts "skipped."
+		else
+      	result = Open3.capture3("ffmpeg -i #{src} -ab 64k #{dst}")
+			if result[2].to_i == 0
+				File.delete(src) if delete_src
+			else
+				puts "failed."
+				$stderr.puts MediaConvertError.new(result[1])
+			end
 		end
-      result = Open3.capture3("ffmpeg -i #{src} -ab #{bitrate}k #{dst}")
-		$stderr.print result[1] unless result[2].to_i == 0
-		self
 	end
 end
 
-def WebRadio(url)
-	radio = WebRadio.instance(url)
+def WebRadio(url, options)
+	radio = WebRadio.instance(url, options)
 	yield radio if block_given?
 	radio
 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       = "1.1.4"
+  spec.version       = "2.0.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 and niconico.}
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "nokogiri"
-  spec.add_runtime_dependency "niconico"
+  spec.add_runtime_dependency "niconico", ">= 1.7.0"
   spec.add_runtime_dependency "pit"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 2.0.0
 platform: ruby
 authors:
 - TADA Tadashi
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: pit
   requirement: !ruby/object:Gem::Requirement