spfy 0.1.3 → 0.1.4

data/lib/spfy.rb

@@ -24,8 +24,9 @@ require "optparse"
 require "ostruct"
 require "taglib"
 require 'find'
+require 'uri'
 
-$version = "0.1.3"
+$version = "0.1.4"
 $dirs = []
 
 # The main Spfy class
@@ -97,6 +98,12 @@ class Spfy
 								
 								# write track metadata
 								xmlFile.write("\t\t<track>\n")
+								
+								if !options.hide_location
+									encoded_path = URI.escape(path)
+									xmlFile.write("\t\t\t<location>file://#{encoded_path}</location>\n")
+								end
+								
 								xmlFile.write("\t\t\t<title>#{tag.title}</title>\n") if !options.hide_title and !tag.title.empty?
 								xmlFile.write("\t\t\t<creator>#{tag.artist}</creator>\n") if !options.hide_artist and !tag.artist.empty?
 								xmlFile.write("\t\t\t<album>#{tag.album}</album>\n") if !options.hide_album and !tag.album.empty?
@@ -137,6 +144,12 @@ class Spfy
 			
 								# output track metadata
 								puts "\t\t<track>\n"
+								
+								if !options.hide_location
+									encoded_path = URI.escape(path)
+									puts "\t\t\t<location>file://#{encoded_path}</location>\n"
+								end
+								
 								puts "\t\t\t<title>#{tag.title}</title>\n" if !options.hide_title and !tag.title.empty?
 								puts "\t\t\t<creator>#{tag.artist}</creator>\n" if !options.hide_artist and !tag.artist.empty?
 								puts "\t\t\t<album>#{tag.album}</album>\n" if !options.hide_album and !tag.album.empty?

data/lib/spfy/optionreader.rb

@@ -8,9 +8,10 @@ class OptionReader
 		options.hide_title = false
 		options.hide_artist = false
 		options.hide_album = false
+		options.hide_location = false
 	
 		opts = OptionParser.new do |opts|
-			opts.banner = "Usage: #{File.basename($0)} [options] [dir1 ... dirx]"
+			opts.banner = "Usage: #{File.basename($0)} [options] dir1 ... dirN"
 			
 			opts.separator ""
 			opts.separator "Output:"
@@ -19,6 +20,10 @@ class OptionReader
 				options.output << out
 			end
 			
+			opts.on("-f", "--no-location", "Suppress file location output") do
+				options.hide_location = true
+			end
+			
 			opts.on("-t", "--no-title", "Suppress track title in output") do
 				options.hide_title = true
 			end

data/spfy.gemspec

@@ -21,10 +21,10 @@
 
 Gem::Specification.new do |s|
 	s.name			= 'spfy'
-	s.version		= '0.1.3'
+	s.version		= '0.1.4'
 	s.date			= '2012-05-06'
 	s.summary		= 'XSPF playlist generator'
-	s.description	= 'Spfy is a simple command-line ruby tool for generating XSPF playlists from metadata stored in several popular audio formats.'
+	s.description	= 'Spfy is a simple command-line tool for generating XSPF playlists from metadata stored in several popular audio formats.'
 	s.authors		= ["Marc Ransome"]
 	s.email			= 'marc.ransome@fidgetbox.co.uk'
 	s.files			= `git ls-files`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spfy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -27,8 +27,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
-description: Spfy is a simple command-line ruby tool for generating XSPF playlists
-  from metadata stored in several popular audio formats.
+description: Spfy is a simple command-line tool for generating XSPF playlists from
+  metadata stored in several popular audio formats.
 email: marc.ransome@fidgetbox.co.uk
 executables:
 - spfy