Player: try avoiding too Linux-specific names

Author: CarterLi

src/detection/media/media.c

@@ -7,7 +7,7 @@ const FFMediaResult* ffDetectMedia(const FFinstance* instance)
 {
     FF_DETECTION_INTERNAL_GUARD(FFMediaResult,
         ffStrbufInitA(&result.error, 0);
-        ffStrbufInit(&result.busNameShort);
+        ffStrbufInit(&result.playerId);
         ffStrbufInit(&result.player);
         ffStrbufInit(&result.song);
         ffStrbufInit(&result.artist);

src/detection/media/media.h

@@ -8,7 +8,7 @@
 typedef struct FFMediaResult
 {
     FFstrbuf error;
-    FFstrbuf busNameShort; //e.g. plasma-browser-integration
+    FFstrbuf playerId; // Bus name on Linux, app bundle name on macOS. e.g. plasma-browser-integration
     FFstrbuf player; // e.g. Google Chrome
     FFstrbuf song;
     FFstrbuf artist;

src/detection/media/media_apple.m

@@ -57,17 +57,17 @@
             if (identifier == nil)
                 identifier = MRNowPlayingClientGetParentAppBundleIdentifier(clientObj);
             if (identifier != nil)
-                ffCfStrGetString(identifier, &result->busNameShort);
+                ffCfStrGetString(identifier, &result->playerId);
         }
         dispatch_group_leave(group);
     });
 
     dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
 
-    if(result->busNameShort.length > 0)
+    if(result->playerId.length > 0)
     {
         char buf[128];
-        snprintf(buf, sizeof(buf), "name of app id \"%s\"", result->busNameShort.chars);
+        snprintf(buf, sizeof(buf), "name of app id \"%s\"", result->playerId.chars);
         ffOsascript(buf, &result->player);
     }
 

src/detection/media/media_linux.c

@@ -87,14 +87,14 @@ static bool getBusProperties(FFDBusData* data, const char* busName, FFMediaResul
     }
 
     //Set short bus name
-    ffStrbufAppendS(&result->busNameShort, busName + sizeof(FF_DBUS_MPRIS_PREFIX) - 1);
+    ffStrbufAppendS(&result->playerId, busName + sizeof(FF_DBUS_MPRIS_PREFIX) - 1);
 
     //We found a song, get the player name
     ffDBusGetPropertyString(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "Identity", &result->player);
     if(result->player.length == 0)
         ffDBusGetPropertyString(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "DesktopEntry", &result->player);
     if(result->player.length == 0)
-        ffStrbufAppend(&result->player, &result->busNameShort);
+        ffStrbufAppend(&result->player, &result->playerId);
 
     return true;
 }

src/fastfetch.c

@@ -381,7 +381,7 @@ static inline void printCommandHelp(const char* command)
         constructAndPrintCommandHelpFormat("player", "{}", 4,
             "Pretty player name",
             "Player name",
-            "DBus bus name",
+            "Player Identifier",
             "URL name"
         );
     }

src/modules/player.c

@@ -22,8 +22,8 @@ void ffPrintPlayer(FFinstance* instance)
 
     //If we are on a website, prepend the website name
     if(
-        ffStrbufIgnCaseCompS(&media->busNameShort, "spotify") == 0 ||
-        ffStrbufIgnCaseCompS(&media->busNameShort, "vlc") == 0
+        ffStrbufIgnCaseCompS(&media->playerId, "spotify") == 0 ||
+        ffStrbufIgnCaseCompS(&media->playerId, "vlc") == 0
     ) {} // do noting, surely not a website, even if the url is set
     else if(ffStrbufStartsWithS(&media->url, "https://www."))
         ffStrbufAppendS(&playerPretty, media->url.chars + 12);
@@ -66,7 +66,7 @@ void ffPrintPlayer(FFinstance* instance)
         ffPrintFormat(instance, FF_PLAYER_MODULE_NAME, 0, &instance->config.player, FF_PLAYER_NUM_FORMAT_ARGS, (FFformatarg[]){
             {FF_FORMAT_ARG_TYPE_STRBUF, &playerPretty},
             {FF_FORMAT_ARG_TYPE_STRBUF, &media->player},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &media->busNameShort},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &media->playerId},
             {FF_FORMAT_ARG_TYPE_STRBUF, &media->url}
         });
     }