@@ -346,16 +346,26 @@ class AutoPlaylistUsermod : public Usermod {
346346 user = root.createNestedObject (" u" );
347347 }
348348
349- JsonArray infoArr = user. createNestedArray ( FPSTR (_name)); // name
349+ if (!enabled) return ; // usermod disabled -> don't add to info page
350350
351- String uiDomString = F (" " );
352-
351+ String uiNameString = FPSTR (_name);
353352 if (enabled && functionality_enabled) {
354- uiDomString += F (" AutoPlaylist is Running" );
353+ uiNameString += F (" Running" );
355354 } else if (!enabled) {
356- uiDomString += F (" AutoPlaylist is Disabled" );
355+ uiNameString += F (" Disabled" );
356+ } else {
357+ uiNameString += F (" Suspended" );
358+ }
359+ JsonArray infoArr = user.createNestedArray (uiNameString); // name + status
360+
361+ String uiDomString = (currentPlaylist > 0 ) ? String (" #" ) + String (currentPlaylist) + String (" " ) : String (" " );
362+
363+ if (currentPlaylist == musicPlaylist && currentPlaylist > 0 ) {
364+ uiDomString += F (" Music Playlist" );
365+ } else if (currentPlaylist == ambientPlaylist && currentPlaylist > 0 ) {
366+ uiDomString += F (" Ambient Playlist" );
357367 } else {
358- uiDomString += F (" AutoPlaylist is Suspended " );
368+ uiDomString += F (" Playlist Overridden " );
359369 }
360370
361371 uiDomString += F (" <br />" );
@@ -367,16 +377,6 @@ class AutoPlaylistUsermod : public Usermod {
367377 } else if (!autoChange) {
368378 uiDomString += F (" AutoChange is Disabled" );
369379 }
370-
371- uiDomString += F (" <br />" );
372-
373- if (currentPlaylist == musicPlaylist && currentPlaylist > 0 ) {
374- uiDomString += F (" Playlist: Music Playlist" );
375- } else if (currentPlaylist == ambientPlaylist && currentPlaylist > 0 ) {
376- uiDomString += F (" Playlist: Ambient Playlist" );
377- } else {
378- uiDomString += F (" Playlist: Overridden" );
379- }
380380
381381 // #ifdef USERMOD_AUTO_PLAYLIST_DEBUG
382382 // uiDomString += F("<br />");
0 commit comments