From 5057150a191adc56a9186b5f34b1765d0098a417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Trellu?= <gaetan.trellu@gmail.com>
Date: Tue, 21 Nov 2023 17:46:58 -0500
Subject: [PATCH] [ansible/telemetry] Detect properly sound server

---
 ansible/roles/ovos_installer/tasks/sound.yml         | 12 ++++++++++++
 .../roles/ovos_installer/templates/telemetry.json.j2 |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/ovos_installer/tasks/sound.yml b/ansible/roles/ovos_installer/tasks/sound.yml
index 558638b..74190fc 100644
--- a/ansible/roles/ovos_installer/tasks/sound.yml
+++ b/ansible/roles/ovos_installer/tasks/sound.yml
@@ -33,5 +33,17 @@
     state: touch
   notify: Start Sound Server
 
+- name: Re-detect sound server
+  ansible.builtin.shell:
+    cmd: |
+      if pgrep -x "pipewire-pulse$" &>/dev/null || pgrep -x "pulseaudio$" &>/dev/null; then
+        echo "pulseaudio"
+      elif pgrep -x "pipewire$" &>/dev/null; then
+        echo "pipewire"
+      fi
+    executable: /bin/bash
+  register: _detect_sound_server
+  changed_when: false
+
 - name: Flush handlers sound
   ansible.builtin.meta: flush_handlers
diff --git a/ansible/roles/ovos_installer/templates/telemetry.json.j2 b/ansible/roles/ovos_installer/templates/telemetry.json.j2
index e50f2a6..041c8c5 100644
--- a/ansible/roles/ovos_installer/templates/telemetry.json.j2
+++ b/ansible/roles/ovos_installer/templates/telemetry.json.j2
@@ -5,7 +5,7 @@
     "os_version": "{{ ansible_distribution_version }}",
     "os_kernel": "{{ ansible_kernel }}",
     "architecture": "{{ ansible_architecture }}",
-    "sound_server": "{{ ovos_installer_sound_server | lower }}",
+    "sound_server": "{{ _detect_sound_server.stdout }}",
     "python_version": "{{ ansible_python_version }}",
     "display_server": "{{ ovos_installer_display_server | lower }}",
     "container": {{ true if ovos_installer_method == 'containers' else false }},
@@ -13,7 +13,7 @@
     "installed_at": "{{ ansible_date_time.iso8601_micro }}",
     "channel": "{{ ovos_installer_channel }}",
     "profile": "{{ ovos_installer_profile }}",
-    "raspberry_pi": "{{ ovos_installer_raspberrypi }}",
+    "raspberry_pi": "{{ 'n/a' if ovos_installer_raspberrypi == 'N/A' else ovos_installer_raspberrypi }}",
     "skills_feature": {{ ovos_installer_feature_skills }},
     "gui_feature": {{ ovos_installer_feature_gui }},
     "cpu_capable": {{ ovos_installer_cpu_is_capable }},