split bus TTS readouts (#979)

Author: panentheos

lib/content/audio.ex

@@ -15,9 +15,9 @@ defprotocol Content.Audio do
 
   @type language :: :english | :spanish
   @type value :: canned_message() | ad_hoc_message() | nil
+  @type audio_item :: String.t() | {:spanish, String.t()} | {:url, String.t()}
   @type tts_value ::
-          {audio :: String.t() | {:spanish, String.t()} | {:url, String.t()},
-           visual :: Content.Message.pages() | nil}
+          {audio :: audio_item() | [audio_item()], visual :: Content.Message.pages() | nil}
 
   @doc "Converts an audio struct to the mid/vars params for the PA system"
   @spec to_params(Content.Audio.t()) :: value()

lib/pa_ess/updater.ex

@@ -85,6 +85,9 @@ defmodule PaEss.Updater do
           {:spanish, text} ->
             [audio: inspect(text)]
 
+          list when is_list(list) ->
+            [audio: Enum.join(list, " ") |> inspect()]
+
           text ->
             [audio: inspect(text)]
         end ++
@@ -99,21 +102,24 @@ defmodule PaEss.Updater do
 
     if scu_migrated? do
       Task.Supervisor.start_child(PaEss.TaskSupervisor, fn ->
-        files =
-          Enum.map(tts_audios, fn {tts_audio, _} ->
-            Task.async(fn -> fetch_audio_file(tts_audio) end)
+        async_map = fn list, fun ->
+          Task.async_stream(list, fun) |> Enum.map(fn {:ok, value} -> value end)
+        end
+
+        file_lists =
+          async_map.(tts_audios, fn {tts_audio, _} ->
+            List.wrap(tts_audio) |> async_map.(&fetch_audio_file/1)
           end)
-          |> Task.await_many()
 
-        Enum.zip([files, tts_audios, tags, log_metas])
-        |> Enum.each(fn {file, {_, pages}, tag, log_meta} ->
+        Enum.zip([file_lists, tts_audios, tags, log_metas])
+        |> Enum.each(fn {file_list, {_, pages}, tag, log_meta} ->
           PaEss.ScuQueue.enqueue_message(
             scu_id,
             {:message, scu_id,
              %{
                zones: Enum.map(audio_zones, &"#{pa_ess_loc}-#{&1}"),
                visual_data: format_pages(pages),
-               audio_data: [Base.encode64(file)],
+               audio_data: Enum.map(file_list, &Base.encode64(&1)),
                expiration: 30,
                priority: priority,
                tag: tag

lib/signs/bus.ex

@@ -430,10 +430,7 @@ defmodule Signs.Bus do
             [long_message_tts_audio(single, current_time)]
 
           list ->
-            Enum.map(list, &message_tts_audio(&1, current_time))
-            |> Enum.join(" ")
-            |> add_tts_preamble()
-            |> List.wrap()
+            [Enum.map(list, &message_tts_audio(&1, current_time)) |> add_tts_preamble()]
         end
         |> Enum.map(&{&1, nil})
         |> Enum.concat(bridge_tts_audio(bridge_status, bridge_enabled?, current_time, state))
@@ -523,12 +520,8 @@ defmodule Signs.Bus do
           [] ->
             []
 
-          content ->
-            content
-            |> Enum.map(&message_tts_audio(&1, current_time))
-            |> Enum.join(" ")
-            |> add_tts_preamble()
-            |> List.wrap()
+          list ->
+            [Enum.map(list, &message_tts_audio(&1, current_time)) |> add_tts_preamble()]
         end
         |> Enum.map(&{&1, nil})
         |> Enum.concat(bridge_tts_audio(bridge_status, bridge_enabled?, current_time, state))
@@ -986,7 +979,8 @@ defmodule Signs.Bus do
   defp add_preamble([]), do: []
   defp add_preamble(items), do: [[:upcoming_departures] | items]
 
-  defp add_tts_preamble(str), do: "Upcoming departures: " <> str
+  defp add_tts_preamble([]), do: []
+  defp add_tts_preamble(items), do: ["Upcoming departures:" | items]
 
   # Returns a list of audio tokens describing the given message.
   defp message_audio({:predictions, [prediction | _]}, current_time) do
@@ -1159,7 +1153,6 @@ defmodule Signs.Bus do
 
       "The #{next_or_following} #{route}bus to #{prediction.headsign} #{time}."
     end)
-    |> Enum.join(" ")
   end
 
   defp long_message_tts_audio({:alert, config}, _) do
@@ -1210,7 +1203,7 @@ defmodule Signs.Bus do
   end
 
   # Fix for signs not accepting `-` as a value
-  # For Silver Line headways on short signs, we will show 
+  # For Silver Line headways on short signs, we will show
   # `Outbound    Every`, `Outbound  10 to 12m`
   def headway_message(
         %Message.Headway{destination: :silver_line, range: range, route: "Silver"},

test/signs/bus_test.exs

@@ -175,8 +175,10 @@ defmodule Signs.BusTest do
             ], :audio}}
         ],
         [
-          {"The next route 14 bus to Wakefield Ave arrives in 2 minutes. The following route 14 bus to Wakefield Ave arrives in 11 minutes.",
-           nil}
+          {[
+             "The next route 14 bus to Wakefield Ave arrives in 2 minutes.",
+             "The following route 14 bus to Wakefield Ave arrives in 11 minutes."
+           ], nil}
         ]
       )
 
@@ -217,8 +219,12 @@ defmodule Signs.BusTest do
             ], :audio}}
         ],
         [
-          {"Upcoming departures: Route 14, Wakefield Ave, 2 minutes. Chelsea, 4 minutes. Route 34, Clarendon Hill, 7 minutes.",
-           nil}
+          {[
+             "Upcoming departures:",
+             "Route 14, Wakefield Ave, 2 minutes.",
+             "Chelsea, 4 minutes.",
+             "Route 34, Clarendon Hill, 7 minutes."
+           ], nil}
         ]
       )
 
@@ -245,8 +251,11 @@ defmodule Signs.BusTest do
             :audio}}
         ],
         [
-          {"Upcoming departures: Route SL5, Nubian, 8 minutes. Route 14, Wakefield Ave, 2 minutes.",
-           nil}
+          {[
+             "Upcoming departures:",
+             "Route SL5, Nubian, 8 minutes.",
+             "Route 14, Wakefield Ave, 2 minutes."
+           ], nil}
         ]
       )
 
@@ -324,7 +333,7 @@ defmodule Signs.BusTest do
             {"112", ["548", "21012", "931", "33004", "932", "666", "5011", "511", "5013", "505"],
              :audio}
         ],
-        [{"Upcoming departures: Silver Line Outbound buses every 11 to 13 minutes.", nil}]
+        [{["Upcoming departures:", "Silver Line Outbound buses every 11 to 13 minutes."], nil}]
       )
 
       state =
@@ -377,8 +386,11 @@ defmodule Signs.BusTest do
              ], :audio}
         ],
         [
-          {"Upcoming departures: Chelsea buses every 11 to 13 minutes. Route 14, Wakefield Ave, 2 minutes.",
-           nil}
+          {[
+             "Upcoming departures:",
+             "Chelsea buses every 11 to 13 minutes.",
+             "Route 14, Wakefield Ave, 2 minutes."
+           ], nil}
         ]
       )
 
@@ -426,8 +438,11 @@ defmodule Signs.BusTest do
              ], :audio}
         ],
         [
-          {"Upcoming departures: South Station, 5 minutes. Silver Line Outbound buses every 11 to 13 minutes.",
-           nil}
+          {[
+             "Upcoming departures:",
+             "South Station, 5 minutes.",
+             "Silver Line Outbound buses every 11 to 13 minutes."
+           ], nil}
         ]
       )
 
@@ -490,8 +505,10 @@ defmodule Signs.BusTest do
           {:canned, {"152", ["37004"], :audio_visual}}
         ],
         [
-          {"The next route 14 bus to Wakefield Ave arrives in 2 minutes. The following route 14 bus to Wakefield Ave arrives in 11 minutes.",
-           nil},
+          {[
+             "The next route 14 bus to Wakefield Ave arrives in 2 minutes.",
+             "The following route 14 bus to Wakefield Ave arrives in 11 minutes."
+           ], nil},
           {"The Chelsea Street bridge is raised. We expect this to last for at least 4 more minutes. SL3 buses may be delayed, detoured, or turned back.",
            [
              {"The Chelsea Street", "bridge is raised. We", 3},
@@ -587,8 +604,11 @@ defmodule Signs.BusTest do
             :audio}}
         ],
         [
-          {"Upcoming departures: Route 14, Wakefield Ave, 2 minutes. Route 51, Reservoir Station, no service.",
-           nil}
+          {[
+             "Upcoming departures:",
+             "Route 14, Wakefield Ave, 2 minutes.",
+             "Route 51, Reservoir Station, no service."
+           ], nil}
         ]
       )