lastfm-tail 1.1.0 → 1.1.1

data/bin/lastfm-tail

@@ -57,7 +57,7 @@ OptionParser.new do |opts|
 	end
 	
 	opts.on('-v', '--version', 'Show the installed version of lastfm-tail.') do
-		puts 'lastfm-tail 1.1.0'
+		puts 'lastfm-tail 1.1.1'
 		exit 0
 	end
 	
@@ -70,23 +70,35 @@ end.parse!
 username = ARGV[-1] || username
 lastTimestamp = Time.at(0)
 
+def print_retry(message)
+	$stderr.write "#{message}  Trying again in "
+	5.downto 1 do |i|
+		$stderr.print "#{i} "
+		sleep 1
+	end
+	$stderr.write "\n"
+end
+
 # The logic here dealing with polling is a bit dirty.
 begin
 	begin
 		rss = open("http://ws.audioscrobbler.com/2.0/user/#{username}/recenttracks.rss").read()
-	rescue SocketError, OpenURI::HTTPError, EOFError, Net::HTTPServiceUnavailable
-		$stderr.write "Network unreachable, trying again in "
-		5.downto 1 do |i|
-			$stderr.print "#{i} "
-			sleep 1
-		end
-		$stderr.write "\n"
+	rescue SocketError, OpenURI::HTTPError, EOFError, Errno::ENETDOWN,
+	       Net::HTTPServiceUnavailable
+		print_retry 'Network unreachable.'
 		networkError = true
 		next
 	end
 	networkError = false
+	
 	xml = XmlSimple.xml_in rss
 	items = xml['channel'][0]['item']
+	if items.nil?
+		print_retry 'Empty response from server.'
+		networkError = true
+		next
+	end
+	
 	items.reverse! if reverse
 	items.each_with_index do |item, i|
 		if i == trackLimit

metadata

@@ -2,7 +2,7 @@
 name: lastfm-tail
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - xiongchiamiov
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-21 00:00:00 -07:00
+date: 2013-07-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency