spfy 0.1 → 0.1.1

data/lib/spfy/optionreader.rb

@@ -8,10 +8,9 @@ class OptionReader
 		options.hide_title = false
 		options.hide_artist = false
 		options.hide_album = false
-		options.hide_tracknum = false
 	
 		opts = OptionParser.new do |opts|
-			opts.banner = "Usage: #{File.basename($0)} [options] [source]"
+			opts.banner = "Usage: #{File.basename($0)} [options] [dir1 ... dirx]"
 			
 			opts.separator ""
 			opts.separator "Output:"
@@ -32,10 +31,6 @@ class OptionReader
 				options.hide_album = true
 			end
 			
-			opts.on("-n", "--no-tracknum", "Suppress track number in output") do
-				options.hide_tracknum = true
-			end
-			
 			opts.separator ""
 			opts.separator "Common options:"
 			

data/lib/spfy.rb

@@ -24,15 +24,18 @@ require "optparse"
 require "ostruct"
 require "taglib"
 
-$version = "0.1"
+$version = "0.1.1"
 $dirs = []
 
+# The main Spfy class
 class Spfy
 
+	##
+	# Starts the XSPF generator.
+	#
 	def self.generate
-		#
-		# Read command-line arguments
-		#
+
+		# start processing command line arguments
 		begin
 		
 			# short usage banner
@@ -64,85 +67,90 @@ class Spfy
 			exit
 		end
 		
-		#
-		# Process valid paths
-		#
+		# start processing source paths
 		begin
 			if options.output.any?
-				
-				# test whether there is an option for data to output
-				if options.hide_title and options.hide_artist and options.hide_album
-					
-					# all data has been suppressed, report to user
-					puts "All tags suppressed, no XML file created."
-					exit
-				end
 			
 				xmlFile = File.open(options.output[0], "w")
 				
 				print "Generating XML.."
-				
+	
+				# write XSPF header
 				xmlFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
-				xmlFile.write("<playlist version=\"1\" xmlns=\"http:#xspf.org/ns/0/\">\n")
+				xmlFile.write("<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\">\n")
 				xmlFile.write("\t<trackList>\n")
 				
-				Dir.foreach($dirs[0]).sort.each do |file|
-					next if file == '.' or file == '..' or
-					next if file.start_with? '.'
+				# repeat for each source path specified
+				$dirs.each do |path|
 					
-					begin
-						TagLib::FileRef.open($dirs[0] + "/" + file) do |fileref|
-		
-							tag = fileref.tag
-							
-							# skip files with no tags
-							next if tag.title.empty? and tag.artist.empty? and tag.album.empty?
-							
-							xmlFile.write("\t\t<track>\n")
-							#xmlFile.write("\t\t\t<location>http:##{host}#{musicDir}/#{file}</location>\n")
-							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?
-							xmlFile.write("\t\t</track>\n")
-							
+					# repeat for each file
+					Dir.foreach(path).sort.each do |file|
+						next if file == '.' or file == '..' or
+						next if file.start_with? '.'
+						
+						begin
+							TagLib::FileRef.open(path + "/" + file) do |fileref|
+								
+								tag = fileref.tag
+								
+								# skip files with no tags
+								next if tag.title.empty? and tag.artist.empty? and tag.album.empty? and tag.track.empty?
+								
+								# write track metadata
+								xmlFile.write("\t\t<track>\n")
+								#xmlFile.write("\t\t<location>file:/#{path}#{file}</location>\n")
+								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?
+								xmlFile.write("\t\t</track>\n")
+							end
+						rescue Exception => e
+							next
 						end
-					rescue Exception => e
-						next
 					end
 				end
 				
+				# write XSPF footer
 				xmlFile.write("\t</trackList>\n")
 				xmlFile.write("</playlist>\n")
+				
 				xmlFile.close
 				
 				print " success\n"
+				
 			else		
 				puts "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-				puts "<playlist version=\"1\" xmlns=\"http:#xspf.org/ns/0/\">\n"
+				puts "<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\">\n"
 				puts "\t<trackList>\n"
 				
-				Dir.foreach($dirs[0]).sort.each do |file|
-					next if file == '.' or file == '..' or
-					next if file.start_with? '.'
-					
-					begin
-						TagLib::FileRef.open($dirs[0] + "/" + file) do |fileref|
+				# repeat for each source path
+				$dirs.each do |path|
+				
+					# repeat for each file
+					Dir.foreach(path).sort.each do |file|
+						next if file == '.' or file == '..' or
+						next if file.start_with? '.'
 						
-							tag = fileref.tag
-		
-							# skip files with no tags
-							next if tag.title.empty? and tag.artist.empty? and tag.album.empty?
-		
-							puts "\t\t<track>\n"
-							#xmlFile.write("\t\t\t<location>http:##{host}#{musicDir}/#{file}</location>\n")
-							puts "\t\t\t<title>#{tag.title}</title>\n"
-							puts "\t\t\t<creator>#{tag.artist}</creator>\n"
-							puts "\t\t\t<album>#{tag.album}</album>\n"
-							puts "\t\t</track>\n"
+						begin
+# FIX THIS AS IT MAY NOT WORK MULTIPLATFORM!!!
+							TagLib::FileRef.open(path + "/" + file) do |fileref|
 							
+								tag = fileref.tag
+			
+								# skip files with no tags
+								next if tag.title.empty? and tag.artist.empty? and tag.album.empty? and tag.track.empty?
+			
+								# write track metadata
+								puts "\t\t<track>\n"
+								#puts "\t\t\t<location>file:/#{path}#{file}</location>"
+								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?
+								puts "\t\t</track>\n"
+							end
+						rescue Exception => e
+							next
 						end
-					rescue Exception => e
-						next
 					end
 				end
 				
@@ -156,6 +164,7 @@ class Spfy
 			abort("Exiting.. (#{e})")
 		end
 
-	end
-end
+	end # def self.generate
+	
+end # class Spyf
 

data/spfy.gemspec

@@ -21,7 +21,7 @@
 
 Gem::Specification.new do |s|
 	s.name			= 'spfy'
-	s.version		= '0.1'
+	s.version		= '0.1.1'
 	s.date			= '2012-05-05'
 	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.'
@@ -30,5 +30,5 @@ Gem::Specification.new do |s|
 	s.files			= `git ls-files`.split("\n")
 	s.executables		<< 'spfy' 
 	s.add_runtime_dependency 'taglib-ruby', '>= 0.5.0'
-	s.homepage		= 'http://rubygems.org/gems/spfy'
+	s.homepage		= 'http://github.com/marcransome/spfy'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spfy
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ files:
 - lib/spfy/optionreader.rb
 - license.txt
 - spfy.gemspec
-homepage: http://rubygems.org/gems/spfy
+homepage: http://github.com/marcransome/spfy
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: XSPF playlist generator.