lib/uliza.rb in rget-1.1.4 vs lib/uliza.rb in rget-2.0.0

@@ -1,32 +1,21 @@
 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
+		@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
-
-		m3u_meta2 = html.scan(m3u_pattern).flatten.sort.last
-		unless m3u_meta2
-			puts "fail: recent radio program not found."
-			exit -1
-		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)
 		open(uri_playlist).each_line do |l|
 			next if /^#/ =~ l