Include track titles in search

app/helpers/application_helper.rb

@@ -18,6 +18,12 @@ def link_to_song(song, term = nil)
     link_to(title, "/#{song.slug}")
   end
 
+  def link_to_track(track, term = nil)
+    title = track.title
+    title = highlight(title, term) if term.present?
+    link_to(title, "/#{track.show.date}/#{track.slug}")
+  end
+
   def song_title_with_alias(song)
     title = song.title
     title += " (aka #{song.alias})" if song.alias.present?

app/services/search_service.rb

@@ -2,6 +2,8 @@
 class SearchService
   attr_reader :term
 
+  LIMIT = 200
+
   def initialize(term)
     @term = term || ''
   end
@@ -30,12 +32,13 @@ def date_results
 
   def text_results
     {
+      show_tags:,
       songs:,
-      venues:,
-      tours:,
       tags:,
-      show_tags:,
-      track_tags:
+      tours:,
+      track_tags:,
+      tracks:,
+      venues:
     }
   end
 
@@ -62,8 +65,9 @@ def shows_on_day_of_year
   end
 
   def songs
+    return @songs if defined?(@songs)
     return [] if term_is_date?
-    Song.where(
+    @songs = Song.where(
       'title ILIKE :term OR alias ILIKE :term',
       term: "%#{term}%"
     ).order(title: :asc)
@@ -98,13 +102,29 @@ def show_tags
     ShowTag.includes(:tag, :show)
            .where('notes ILIKE ?', "%#{term}%")
            .order('tags.name, shows.date')
-           .limit(200)
+           .limit(LIMIT)
   end
 
   def track_tags
     TrackTag.includes(:tag, track: :show)
             .where('notes ILIKE ?', "%#{term}%")
             .order('tags.name, shows.date, tracks.position')
-            .limit(200)
+            .limit(LIMIT)
+  end
+
+  def song_titles
+    @song_titles ||= songs.map(&:title)
+  end
+
+  # Return only tracks that don't have a song title that matches the search term
+  # since those would produce essentially duplicate search results
+  def tracks
+    tracks_by_title.reject { |track| track.title.in?(song_titles) }
+  end
+
+  def tracks_by_title
+    Track.where('title ILIKE ?', "%#{term}%")
+         .order(title: :asc)
+         .limit(LIMIT)
   end
 end

app/views/search/_results_tracks.html.slim

@@ -0,0 +1,7 @@
+h2 Matched #{pluralize_with_delimiter(@tracks.size, 'Track')}
+ul.item_list.clickable
+  - @tracks.each do |track|
+    li name=track.slug
+      h2.wide = link_to_track(track, params[:term])
+      h3.alt = link_to_show(track.show, show_abbrev: false)
+      = clear_both

app/views/search/results.html.slim

@@ -16,6 +16,7 @@
         = render partial: 'results_exact_show' if @exact_show.present?
         = render partial: 'results_other_shows' if @other_shows.any?
         = render partial: 'results_songs' if @songs.any?
+        = render partial: 'results_tracks' if @tracks.any?
         = render partial: 'results_venues' if @venues.any?
         = render partial: 'results_tours' if @tours.any?
         = render partial: 'results_tags' if @tags.any?