spfy 0.1.2 → 0.1.3

data/lib/spfy.rb

@@ -23,8 +23,9 @@ require "spfy/optionreader"
 require "optparse"
 require "ostruct"
 require "taglib"
+require 'find'
 
-$version = "0.1.2"
+$version = "0.1.3"
 $dirs = []
 
 # The main Spfy class
@@ -80,16 +81,14 @@ class Spfy
 				xmlFile.write("<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\">\n")
 				xmlFile.write("\t<trackList>\n")
 				
-				# repeat for each source path specified
-				$dirs.each do |path|
+				# repeat for each source dir argument
+				$dirs.each do |dir|
+		
+					# repeat for each file recursively
+					Find.find(dir) do |path|
 					
-					# 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|
+							TagLib::FileRef.open(path) do |fileref|
 								
 								tag = fileref.tag
 								
@@ -122,29 +121,26 @@ class Spfy
 				puts "<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\">\n"
 				puts "\t<trackList>\n"
 				
-				# repeat for each source path
-				$dirs.each do |path|
+				# repeat for each source dir argument
+				$dirs.each do |dir|
 				
-					# repeat for each file
-					Dir.foreach(path).sort.each do |file|
-						next if file == '.' or file == '..' or
-						next if file.start_with? '.'
-						
+					# repeat for each file recursively
+					Find.find(dir) do |path|
+					
 						begin
-							TagLib::FileRef.open(path + "/" + file) do |fileref|
+							TagLib::FileRef.open(path) do |fileref|
 							
 								tag = fileref.tag
 			
 								# skip files with no tags
 								next if tag.title.empty? and tag.artist.empty? and tag.album.empty?
 			
-								# write track metadata
+								# output track metadata
 								puts "\t\t<track>\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\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
@@ -152,6 +148,7 @@ class Spfy
 					end
 				end
 				
+				# write XSPF footer
 				puts "\t</trackList>\n"
 				puts "</playlist>\n"
 			end
@@ -163,6 +160,5 @@ class Spfy
 		end
 
 	end # def self.generate
-	
-end # class Spyf
 
+end # class Spyf

data/spfy.gemspec

@@ -21,7 +21,7 @@
 
 Gem::Specification.new do |s|
 	s.name			= 'spfy'
-	s.version		= '0.1.2'
+	s.version		= '0.1.3'
 	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.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spfy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -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