lastfm-top 0.1.0 → 0.2.0

data/COPYING

@@ -1,7 +1,7 @@
             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
                     Version 2, December 2004
 
- Copyright (C) 2011 James Pearson
+ Copyright (C) 2012 James Pearson
 
  Everyone is permitted to copy and distribute verbatim or modified
  copies of this license document, and changing it is allowed as long

data/bin/lastfm-top

@@ -4,6 +4,7 @@
 # May you share freely, never taking more than you give.
 # May you find love and love everyone you find.
 
+require 'englify'
 require 'json'
 require 'net/http'
 require 'optparse'
@@ -15,37 +16,49 @@ API_KEY = 'c7089003368bef3c8d0dd12ceede4978'
 period = 'overall'
 statistic = 'artists'
 limit = 10
+autoTranslate = true
 
-OptionParser.new do |opts|
-	opts.banner = "Usage: #{$0.split('/').last} [options] [USER]"
-	
-	opts.on('-l', '--limit NUM', Integer, 'Number of artists to show.  '\
-	                                     +'0 is all.  Defaults to 10.') do |num|
-		# We should actually restrict the range a bit.  Using a really, really
-		# big number causes the API to return no tracks at all.
-		limit = num
-	end
-	
-	opts.on('-p', '--period PERIOD', PERIOD_OPTIONS,
-	        "Time period to show.  Choices: #{PERIOD_OPTIONS.join(',')}") do |p|
-		period = p
-	end
-	
-	opts.on('-s', '--statistic STATISTIC', STAT_OPTIONS,
-	        "Statistic to show.  Choices: #{STAT_OPTIONS.join(',')}") do |s|
-		statistic = s
-	end
-	
-	opts.on('-v', '--version', 'Show the installed version of lastfm-top.') do
-		puts 'lastfm-top 0.1.0'
-		exit 0
-	end
-	
-	opts.on_tail('-h', '--help', 'Show this help dialog.') do
-		puts opts
-		exit 0
-	end
-end.parse!
+begin
+	OptionParser.new do |opts|
+		opts.banner = "Usage: #{$0.split('/').last} [options] [USER]"
+		
+		opts.on('-l', '--limit NUM', Integer, 'Number of artists to show.  '\
+											 +'0 is all.  Defaults to 10.') do |num|
+			# We should actually restrict the range a bit.  Using a really, really
+			# big number causes the API to return no tracks at all.
+			limit = num
+		end
+		
+		opts.on('--no-translate', "Don't auto-translate foreign artist names.") do
+			autoTranslate = false
+		end
+		
+		opts.on('-p', '--period PERIOD', PERIOD_OPTIONS,
+				"Time period to show.  Choices: #{PERIOD_OPTIONS.join(',')}") do |p|
+			period = p
+		end
+		
+		opts.on('-s', '--statistic STATISTIC', STAT_OPTIONS,
+				"Statistic to show.  Choices: #{STAT_OPTIONS.join(',')}") do |s|
+			statistic = s
+		end
+		
+		opts.on('-v', '--version', 'Show the installed version of lastfm-top.') do
+			puts 'lastfm-top 0.2.0'
+			exit 0
+		end
+		
+		opts.on_tail('-h', '--help', 'Show this help dialog.') do
+			puts opts
+			exit 0
+		end
+	end.parse!
+rescue OptionParser::InvalidArgument,
+       OptionParser::InvalidOption,
+       OptionParser::MissingArgument => e
+	puts e
+	exit 255
+end
 
 user = ARGV[-1] || 'xiongchiamiov'
 
@@ -60,6 +73,9 @@ end
 
 stats = results["top#{statistic}"][statistic.chop] # Chop off the 's'
 stats.each do |stat|
+	if autoTranslate && !stat['name'].ascii_only?
+		stat['name'] = englify(stat['name'])
+	end
 	# This could look a lot nicer.  There's also some additional information
 	# available that differs depending on the statistic we're looking at.
 	puts "#{stat['name']} - #{stat['playcount']}"

metadata

@@ -2,7 +2,7 @@
 name: lastfm-top
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - xiongchiamiov
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-11 00:00:00 -08:00
+date: 2012-08-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,6 +24,17 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: englify
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: A small script to view top artists, albums and tracks of a Last.fm user.
 email: 
 - xiong.chiamiov@gmail.com