From 8c653e660b138264caacd207b3e883ef2857c02e Mon Sep 17 00:00:00 2001
From: Nico Jensch <njcrypted@protonmail.com>
Date: Fri, 13 Nov 2020 18:17:00 +0100
Subject: [PATCH] Add some players

---
 usr/bin/setup-assistant           | 35 +++++++++++++++----------------
 usr/lib/setup-assistant/audio.txt |  8 ++++++-
 usr/lib/setup-assistant/video.txt |  4 +++-
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/usr/bin/setup-assistant b/usr/bin/setup-assistant
index 033e28a..6c9ed35 100755
--- a/usr/bin/setup-assistant
+++ b/usr/bin/setup-assistant
@@ -96,25 +96,12 @@ function upgrade2ultimate
                 gnome-sound-recorder
                 vino
                 rygel
-                shotwell" >> /tmp/setup-assistant/pkgs.txt
+                shotwell
+                lollypop" >> /tmp/setup-assistant/pkgs.txt
         fi
     fi
 
 
-    if ! yad \
-        --image='pattern-games' \
-        --title="Upgrade to ULTIMATE 👾" \
-        --window-icon='update' \
-        --geometry=700x100 \
-        --button=No:0 \
-        --button=Yes:1 \
-        --text-align=center \
-        --center \
-        --text "Are you a gamer? The Garuda Gamer app will be installed for further configuration."; then
-            echo "garuda-gamer-git" >> /tmp/setup-assistant/pkgs.txt
-    fi 
-
-
     yad \
         --image='libreoffice-main' \
         --title="Upgrade to ULTIMATE 👾" \
@@ -200,7 +187,7 @@ function upgrade2ultimate
         --image='nextcloud-client' \
         --title="Upgrade to ULTIMATE 👾" \
         --window-icon='update' \
-        --text "Some general internet applications:" \
+        --text "Some general internet applications?" \
         --geometry=600x400 \
         --list \
         --checklist \
@@ -241,7 +228,7 @@ function upgrade2ultimate
         --image='telegram-desktop' \
         --title="Upgrade to ULTIMATE 👾" \
         --window-icon='update' \
-        --text "Communication software:" \
+        --text "Do you need communication software?" \
         --geometry=600x400 \
         --list \
         --checklist \
@@ -331,9 +318,18 @@ function upgrade2ultimate
     if grep -R "Kwave" /tmp/setup-assistant/audio.txt; then
         echo "kwave" >> /tmp/setup-assistant/pkgs.txt
     fi
+    if grep -R "Cantata" /tmp/setup-assistant/audio.txt; then
+        echo "cantata" >> /tmp/setup-assistant/pkgs.txt
+    fi
+    if grep -R "Audacious" /tmp/setup-assistant/audio.txt; then
+        echo "audavious" >> /tmp/setup-assistant/pkgs.txt
+    fi
     if grep -R "Audacity" /tmp/setup-assistant/audio.txt; then
         echo "audacity" >> /tmp/setup-assistant/pkgs.txt
     fi
+    if grep -R "Lollypop" /tmp/setup-assistant/audio.txt; then
+        echo "lollypop" >> /tmp/setup-assistant/pkgs.txt
+    fi
     if grep -R "Ardour" /tmp/setup-assistant/audio.txt; then
         echo "ardour" >> /tmp/setup-assistant/pkgs.txt
     fi
@@ -360,7 +356,7 @@ function upgrade2ultimate
         --image='Kdenlive' \
         --title="Upgrade to ULTIMATE 👾" \
         --window-icon='update' \
-        --text "What about video editing software?" \
+        --text "What about video software?" \
         --geometry=600x400 \
         --list \
         --checklist \
@@ -376,6 +372,9 @@ function upgrade2ultimate
         opus-tools
         frei0r-plugins" >> /tmp/setup-assistant/pkgs.txt
     fi
+    if grep -R "Baka-Mplayer" /tmp/setup-assistant/video.txt; then
+        echo "baka-mplayer" >> /tmp/setup-assistant/pkgs.txt
+    fi
     if grep -R "OBS Studio" /tmp/setup-assistant/video.txt; then
         echo "obs-studio" >> /tmp/setup-assistant/pkgs.txt
     fi
diff --git a/usr/lib/setup-assistant/audio.txt b/usr/lib/setup-assistant/audio.txt
index 31ccffc..7236b00 100644
--- a/usr/lib/setup-assistant/audio.txt
+++ b/usr/lib/setup-assistant/audio.txt
@@ -1,7 +1,13 @@
 true
 Olivia (Audio player with YouTube support)
 false
-Kwave (sound editor by KDE)
+Audacious
+false
+Cantata (Frontend for mpd)
+false
+Kwave (Sound editor by KDE)
+false
+Lollypop (GNOME music player)
 false
 Audacity (Record/edit audio)
 false
diff --git a/usr/lib/setup-assistant/video.txt b/usr/lib/setup-assistant/video.txt
index c2da500..7670d03 100644
--- a/usr/lib/setup-assistant/video.txt
+++ b/usr/lib/setup-assistant/video.txt
@@ -1,9 +1,11 @@
 true
 Kdenlive (Video editor by KDE)
 false
+Baka-Mplayer (libmpv & Qt based video player)
+false
 OBS Studio (Video recording/streaming)
 false
-SMPlayer (Build-in codecs, high compatability)
+SMPlayer (Build-in codecs, high compatability video player)
 false
 Shotcut (Qt-based video editor)
 false