From d42148d9944df471855d4da06d2c64aeea296b22 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 16 Apr 2024 17:57:31 +0200
Subject: [PATCH] Info page optimizations

* reduce from 3 lines to two lines
* don't add to info when usermod is disabled in UM settings
* show current playlist id
---
 .../usermod_v2_auto_playlist.h                | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h b/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
index 4ac05c24..c15f116e 100644
--- a/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
+++ b/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
@@ -346,16 +346,26 @@ class AutoPlaylistUsermod : public Usermod {
         user = root.createNestedObject("u");
       }
 
-      JsonArray infoArr = user.createNestedArray(FPSTR(_name));  // name
+      if (!enabled) return; // usermod disabled -> don't add to info page
 
-      String uiDomString = F("");
-      
+      String uiNameString = FPSTR(_name);
       if (enabled && functionality_enabled) {
-        uiDomString += F("AutoPlaylist is Running");
+        uiNameString += F(" Running");
       } else if (!enabled) {
-        uiDomString += F("AutoPlaylist is Disabled");
+        uiNameString += F(" Disabled");
       } else {
-        uiDomString += F("AutoPlaylist is Suspended");
+        uiNameString += F(" Suspended");
+      }
+      JsonArray infoArr = user.createNestedArray(uiNameString);  // name + status
+
+      String uiDomString = (currentPlaylist > 0) ? String("#") + String(currentPlaylist) + String(" ") : String("");
+
+      if (currentPlaylist == musicPlaylist && currentPlaylist > 0) {
+        uiDomString += F("Music Playlist");
+      } else if (currentPlaylist == ambientPlaylist && currentPlaylist > 0) {
+        uiDomString += F("Ambient Playlist");
+      } else {
+        uiDomString += F("Playlist Overridden");
       }
 
       uiDomString += F("<br />");
@@ -367,16 +377,6 @@ class AutoPlaylistUsermod : public Usermod {
       } else if (!autoChange) {
         uiDomString += F("AutoChange is Disabled");
       }
-
-      uiDomString += F("<br />");
-
-      if (currentPlaylist == musicPlaylist && currentPlaylist > 0) {
-        uiDomString += F("Playlist: Music Playlist");
-      } else if (currentPlaylist == ambientPlaylist && currentPlaylist > 0) {
-        uiDomString += F("Playlist: Ambient Playlist");
-      } else {
-        uiDomString += F("Playlist: Overridden");
-      }
       
       // #ifdef USERMOD_AUTO_PLAYLIST_DEBUG
       // uiDomString += F("<br />");