lastfm-tail 1.0.2 → 1.1.0

data/README.md

@@ -19,8 +19,14 @@ or
                                          option. Implies -r.
         -F, --frequency NUM              Poll Last.fm every NUM seconds. Defaults
                                          to 5.  Implies `-f`. 
+            --no-translate               Don't auto-translate foreign artist names.
         -n, --number NUM                 List NUM tracks.
         -r, --reverse                    List tracks from oldest to newest.
         -v, --version                    Show the installed version of lastfm-tail.
         -h, --help                       Show this help dialog.
 
+If you change options from the defaults frequently, you can specify alternate
+default values in a configuration file.  Copy `config.ini.example` to
+`$HOME/.config/lastfm-tail/config.ini` and uncomment the lines you wish to
+change.
+

data/bin/lastfm-tail

@@ -1,19 +1,28 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
+
+# May you recognize your weaknesses and share your strengths.
+# May you share freely, never taking more than you give.
+# May you find love and love everyone you find.
 
 require 'date'
+require 'englify'
+require 'inifile'
+require 'nice-sigint'
 require 'open-uri'
 require 'optparse'
 require 'xmlsimple'
 
-# Show prettier output on interrupt (ctrl+c)
-trap("INT") do |s|
-	puts
-	exit(s)
-end
+translationCache = {}
+
+config = IniFile.new("#{Dir.home}/.config/lastfm-tail/config.ini")
+config = config['global']
+trackLimit    = config['trackLimit'].nil?    ? 10    : config['trackLimit'].to_i
+pollFrequency = config['pollFrequency'].nil? ? nil   : config['pollFrequency'].to_i
+reverse       = config['reverse'].nil?       ? false : config['reverse'] != 'false'
+autoTranslate = config['autoTranslate'].nil? ? true  : config['autoTranslate'] != 'false'
+username      = config['username'].nil?      ? 'xiongchiamiov' : config['username']
 
-trackLimit = 10
-pollFrequency = nil
-reverse = false
 OptionParser.new do |opts|
 	opts.banner = "Usage: #{$0.split('/').last} [options] [USER]"
 	
@@ -30,6 +39,10 @@ OptionParser.new do |opts|
 		reverse = true
 	end
 	
+	opts.on('--no-translate', "Don't auto-translate foreign artist names.") do
+		autoTranslate = false
+	end
+	
 	opts.on('-n', '--number NUM', Integer, 'List NUM tracks.') do |num|
 		if num > 10
 			puts 'Last.fm only provides the 10 latest tracks; sorry!'
@@ -44,7 +57,7 @@ OptionParser.new do |opts|
 	end
 	
 	opts.on('-v', '--version', 'Show the installed version of lastfm-tail.') do
-		puts 'lastfm-tail 1.0.2'
+		puts 'lastfm-tail 1.1.0'
 		exit 0
 	end
 	
@@ -54,12 +67,24 @@ OptionParser.new do |opts|
 	end
 end.parse!
 
-username = ARGV[-1] || 'xiongchiamiov'
+username = ARGV[-1] || username
 lastTimestamp = Time.at(0)
 
 # The logic here dealing with polling is a bit dirty.
 begin
-	rss = open("http://ws.audioscrobbler.com/2.0/user/#{username}/recenttracks.rss").read()
+	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"
+		networkError = true
+		next
+	end
+	networkError = false
 	xml = XmlSimple.xml_in rss
 	items = xml['channel'][0]['item']
 	items.reverse! if reverse
@@ -74,8 +99,16 @@ begin
 			next
 		end
 		
-		puts item['title']
+		artist, title = item['title'][0].split(' – ')
+		if autoTranslate && !artist.ascii_only?
+			if translationCache[artist].nil?
+				translationCache[artist] = englify(artist)
+			end
+			artist = translationCache[artist]
+		end
+		puts "#{artist} - #{title}"
+		
 		lastTimestamp = timestamp
 	end
-end while !pollFrequency.nil? && sleep(pollFrequency)
+end while networkError || (!pollFrequency.nil? && sleep(pollFrequency))
 

metadata

@@ -2,7 +2,7 @@
 name: lastfm-tail
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - xiongchiamiov
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-27 00:00:00 -08:00
+date: 2013-06-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: xml-simple
+  name: englify
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -24,6 +24,39 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: inifile
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: nice-sigint
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: xml-simple
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: A small script, inspired by the Unix tail utility, for viewing recently-scrobbled tracks on Last.fm.
 email: 
 - xiong.chiamiov@gmail.com