itch 1.0.3 → 1.0.4

data/bin/itch

@@ -7,20 +7,33 @@ rescue LoadError
 	require 'itch'
 end
 
-#Create an iTunes controller.
-helper = Itch.new(Itch.create_itunes_interface)
+begin
+
+	#Create an iTunes controller.
+	helper = Itch.new(Itch.create_itunes_interface)
+
+	#Get program options.
+	config = helper.parse_options(ARGV)
+	#Set default options.
+	config = helper.set_default_options(config)
+	#Get playlists that tracks will be selected from.
+	playlists = helper.get_playlists(config)
+	#Delete requested playlists.
+	helper.delete_playlists(config)
+	#Get tracks for processing.
+	tracks = helper.get_tracks(config, playlists)
+	#Process general commands.
+	helper.perform_general_operations(config)
+	#Process commands for specified tracks.
+	helper.perform_track_operations(config, tracks)
 
-#Get program options.
-config = helper.parse_options(ARGV)
-#Set default options.
-config = helper.set_default_options(config)
-#Get playlists that tracks will be selected from.
-playlists = helper.get_playlists(config)
-#Delete requested playlists.
-helper.delete_playlists(config)
-#Get tracks for processing.
-tracks = helper.get_tracks(config, playlists)
-#Process general commands.
-helper.perform_general_operations(config)
-#Process commands for specified tracks.
-helper.perform_track_operations(config, tracks)
+rescue => exception
+
+	#If debug mode requested, print backtrace to STDERR.
+	if config and config.has_key?('debug')
+		$stderr.puts exception.backtrace
+	end
+	#Print error to STDERR and exit with an abnormal status.
+	abort "Error: " + exception.message
+
+end

data/lib/itch.rb

@@ -21,7 +21,11 @@ class Itch
 	
 	#Create an OLE/COM link to iTunes.
 	def Itch.create_itunes_interface
-		WIN32OLE.new('iTunes.Application') or raise "Couldn't take control of iTunes."
+		begin
+			WIN32OLE.new('iTunes.Application') or raise "Couldn't take control of iTunes."
+		rescue WIN32OLERuntimeError => exception
+			raise exception.exception("Couldn't take control of iTunes.  Could a prior instance be shutting down?")
+		end
 	end
 	
 	
@@ -31,13 +35,30 @@ class Itch
 		#Config will hold parsed option values.
 		config = Hash.new
 
-		#Define valid options with descriptions.
+		#Set up option parser.
 		options = OptionParser.new
+		#Modify option parser to wrap descriptions.
+		class <<options
+			alias old_on on
+			def on (*opts, &block)
+				opts.map! do |option|
+					if option.class == String and option.length > 40
+						option = option.scan(/\S.{0,40}\S(?=\s|$)|\S+/)
+					end
+					option
+				end
+				old_on(*opts.flatten, &block)
+			end
+		end
+		
+		#Set up valid options.
+		
 		options.separator("Program help:")
 		options.on("-h", "--help", TrueClass, "Display program help.") {
 			puts options.help
 			exit
 		}
+		
 		options.separator("Playback controls:")
 		options.on("-p", "--play-pause", TrueClass, "If currently paused, begin playing.  If currently playing, pause playback.") {|value| config['play-pause'] = value}
 		options.on("--pause", TrueClass, "Pause playback.") {|value| config['pause'] = value}
@@ -54,6 +75,7 @@ class Itch
 		options.on("--scan-backwards [seconds]", Integer, "Scan backwards X seconds within the current track (default 10).") {|value| config['scan-backwards'] = value || 10}
 		options.on("--scan-forwards [seconds]", Integer, "Scan forwards X seconds within the current track (default 10).") {|value| config['scan-forwards'] = value || 10}
 		options.on("--play-file name", Object, "Play the specified file or folder.") {|value| config['play-file'] = value}
+		
 		options.separator("Info on selected tracks:")
 		options.on("-i", "--print-info format", Object, "For each track, print information in the given format.  If the following strings appear in the given format, they will be replaced with the corresponding track information:", 
 			%q#"%a": artist#,
@@ -79,12 +101,14 @@ class Itch
 			%q#"%y": year#,
 			%q#"%%": percent sign#
 		) {|value| config['print-info'] = value}
+		
 		options.separator("General iTunes controls:")
 		options.on("-a", "--add-file name", Object, "Add the specified file or folder to the library.") {|value| (config['add-file'] ||= []) << value}
 		options.on("-q", "--quit", TrueClass, "Exit iTunes.") {|value| config['quit'] = value}
 		options.on("--open-url url", Object, "Open the given URL.") {|value| config['open-url'] = value}
 		options.on("--goto-store-home-page", TrueClass, "Go to the Store.") {|value| config['goto-store-home-page'] = value}
 		options.on("--update-ipod", TrueClass, "Update the iPod.") {|value| config['update-ipod'] = value}
+		
 		options.separator("Playlist selection:")
 		options.on("--library", TrueClass, "Operation will include the entire iTunes library.  Used by default unless other libraries are selected.") {|value| config['library'] = value}
 		options.on("--current-playlist", TrueClass, "Operation will include the current playlist.") {|value| config['current-playlist'] = value}
@@ -92,6 +116,7 @@ class Itch
 		options.on("--all-playlists", TrueClass, "Operation will include all playlists.") {|value| config['all-playlists'] = value}
 		options.on("--create-playlist name", Object, "Create a playlist with the specified name and include it in the operation.  (This option can occur more than once.)") {|value| (config['create-playlist'] ||= []) << value}
 		options.on("--delete-playlist name", Object, "Delete the playlist with the specified name.  (This option can occur more than once.)") {|value| (config['delete-playlist'] ||= []) << value}
+		
 		options.separator("Track selection:")
 		options.on("-f", "--find string", Object, "Operation will include all tracks in the specified playlist(s) where any field matches the specified string.  (This option can occur more than once.)") {|value| (config['find'] ||= []) << value}
 		options.on("-c", "--current-track", TrueClass, "Operation will inclue the current track.") {|value| config['current-track'] = value}
@@ -103,6 +128,7 @@ class Itch
 		options.on("--find-composer string", Object, "Operation will include all tracks in the specified playlist(s) where the composer matches the specified string.  (This option can occur more than once.)") {|value| (config['find-composer'] ||= []) << value}
 		options.on("--find-track-name string", Object, "Operation will include all tracks in the specified playlist(s) where the track name matches the specified string.  (This option can occur more than once.)") {|value| (config['find-track-name'] ||= []) << value}
 		options.on("-F", "--play-found", TrueClass, "Play the first of the selected tracks.") {|value| config['play-found'] = value}
+		
 		options.separator("Set track info:")
 		options.on("--set-artist name", Object, "Set the artist for each track.") {|value| config['set-artist'] = value}
 		options.on("--set-album name", Object, "Set the album for each track.") {|value| config['set-album'] = value}
@@ -125,6 +151,9 @@ class Itch
 		options.on("--set-track-volume percent", Integer, "Set the volume adjustment percentage for each track, from -100 to 100.  Negative numbers decrease the volume, positive numbers increase it.  0 means no adjustment.") {|value| config['set-track-volume'] = value}
 		options.on("--set-year number", Integer, "Set the year of publication for each track.") {|value| config['set-year'] = value}
 		
+		options.separator("Troubleshooting:")
+		options.on("--debug", TrueClass, "When an error occurs, show a more detailed message.") {|value| config['debug'] = value}
+		
 		#Parse the options, printing usage if parsing fails.
 		options.parse(arguments) rescue puts "#{$!}\nType '#{$0} --help' for valid options."
 		
@@ -152,24 +181,24 @@ class Itch
 	def get_playlists (config)
 	
 		playlists = Array.new
-		playlists.push(@interface.LibraryPlaylist) if config['library']
+		playlists << @interface.LibraryPlaylist if config['library']
 		if config['current-playlist']
-			playlists.push(@interface.CurrentPlaylist) or raise "Can't find current playlist."
+			playlists << @interface.CurrentPlaylist or raise "Can't find current playlist."
 		end
 		if config['all-playlists']
 			if library_playlists = @interface.LibrarySource.Playlists
-				library_playlists.each {|playlist| playlists.push(playlist)}
+				library_playlists.each {|playlist| playlists << playlist}
 			else
 				raise "No playlists found."
 			end
 		end
 		with_option_values('playlist', config) do |name|
-			playlists.push(find_playlist(name)) or raise "Can't find playlist #{name}"
+			playlists << find_playlist(name) or raise "Can't find playlist #{name}"
 		end
 		
 		#If creation of playlist(s) requested, create them and add to the collection.
 		with_option_values('create-playlist', config) do |name|
-			playlists.push(@interface.CreatePlaylist(name)) or raise "Can't create playlist #{name}"
+			playlists << @interface.CreatePlaylist(name) or raise "Can't create playlist #{name}"
 		end
 		
 		playlists
@@ -188,34 +217,37 @@ class Itch
 	#Find requested tracks.
 	def get_tracks (config, playlists)
 	
-		tracks = Array.new
-		
+		tracks = []
+	
 		#Add current track to list if desired.
 		if config['current-track']
-			tracks.push(@interface.CurrentTrack) or raise "Can't find current track."
+			current_track = @interface.CurrentTrack or raise "No currently active/playing track." #"x << y.CurrentTrack or raise" won't work; nil is false but [nil] is true.
+			tracks << current_track
 		end
-		
+			
 		#Add highlighted tracks to list if desired.
 		if config['selected-tracks']
 			if selected_tracks = @interface.SelectedTracks
-				selected_tracks.each {|track| tracks.push(track)}
+				selected_tracks.each {|track| tracks << track}
 			else
 				raise "No tracks selected."
 			end
 		end
 		
 		#Find tracks in selected playlists.
-		for playlist in playlists
+		playlists.each do |playlist|
 		
 			#If all tracks are to be processed, select them all.
 			if config['all-tracks']
-				playlist.Tracks.each {|track| tracks.push(track)}
+				playlist.Tracks.each {|track| tracks << track}
 			#Otherwise, see if user wishes to search for tracks.
 			else
 				search_playlist = lambda {|option, field_id|
 					with_option_values(option, config) do |terms|
 						if (results = playlist.Search(terms, field_id))
-							results.each {|track| tracks.push(track)}
+							results.each {|track| tracks << track}
+						else
+							raise "No tracks found."
 						end
 					end
 				}
@@ -229,7 +261,7 @@ class Itch
 			
 			#Import files to library and add resulting tracks to list.
 			with_option_values('add-file', config) do |path|
-				tracks.concat(add_file(path, playlist))
+				tracks.concat(add_file(File.expand_path(path), playlist))
 			end
 			
 		end
@@ -269,7 +301,7 @@ class Itch
 	def perform_track_operations (config, tracks)
 		
 		#Operate on selected tracks.
-		for track in tracks
+		tracks.each do |track|
 			specified?(config, 'set-artist') {|v| track.Artist = v}
 			specified?(config, 'set-album') {|v| track.Album = v}
 			specified?(config, 'set-bpm') {|v| track.BPM = v}
@@ -328,7 +360,7 @@ class Itch
 			segment.gsub!(/%s/) {track.SkippedCount.to_s}
 			segment.gsub!(/%t/) {track.TrackNumber.to_s}
 			segment.gsub!(/%T/) {track.TrackCount.to_s}
-			segment.gsub!(/%v/) {track.VolumeAdjustment.to_s}
+			segment.gsub!(/%v/) {volume = track.VolumeAdjustment; (1 .. 98).include?(volume) ? volume.next.to_s : volume.to_s}
 			segment.gsub!(/%y/) {track.Year.to_s}
 			segment
 		end
@@ -363,7 +395,7 @@ class Itch
 			sleep 1 while status.InProgress
 			#Return added track(s).
 			tracks = Array.new
-			status.Tracks.each {|track| tracks.push(track)}
+			status.Tracks.each {|track| tracks << track}
 			tracks
 		end
 		

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: itch
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2007-05-07 00:00:00 -07:00
+  version: 1.0.4
+date: 2007-05-08 00:00:00 -07:00
 summary: Allows control of iTunes for Windows via a command line.
 require_paths: 
 - lib