fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Support detecting artist if a browser is current media player

Browse Source
This commit is contained in:
Linus Dierheimer
2022-02-14 13:04:57 +01:00
parent f54ac1c4e6
commit ed63ef1a28
1 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/media.c
+29 -21
View File
@@ -37,34 +37,42 @@ typedef struct DBusData
DBusConnection *connection;
} DBusData;
static bool getString(DBusMessageIter* iter, FFstrbuf* result, DBusData* data)
static bool getValue(DBusMessageIter* iter, FFstrbuf* result, DBusData* data)
{
if(data->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_STRING)
int argType = data->ffdbus_message_iter_get_arg_type(iter);
if(argType == DBUS_TYPE_STRING)
{
const char* value;
data->ffdbus_message_iter_get_basic(iter, &value);
if(!ffStrSet(value))
return false;
ffStrbufAppendS(result, value);
return true;
}
if(argType != DBUS_TYPE_ARRAY)
return false;
const char* value;
data->ffdbus_message_iter_get_basic(iter, &value);
ffStrbufAppendS(result, value);
return ffStrSet(value);
}
static void getArray(DBusMessageIter* iter, FFstrbuf* result, DBusData* data)
{
if(data->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY)
return;
DBusMessageIter arrayIter;
data->ffdbus_message_iter_recurse(iter, &arrayIter);
bool foundAValue = false;
while(true)
{
if(getString(&arrayIter, result, data))
if((foundAValue = getValue(&arrayIter, result, data)))
ffStrbufAppendS(result, ", ");
FF_DBUS_ITER_CONTINUE(arrayIter);
}
ffStrbufRemoveIgnCaseEndS(result, ", ");
if(foundAValue)
ffStrbufSubstrBefore(result, result->length - 2);
return foundAValue;
}
static bool detectSong(const char* player, FFMediaResult* result, DBusData* data)
@@ -127,12 +135,12 @@ static bool detectSong(const char* player, FFMediaResult* result, DBusData* data
if(data->ffdbus_message_iter_get_arg_type(&dictIterator) != DBUS_TYPE_STRING)
FF_DBUS_ITER_CONTINUE(arrayIterator)
const char* key;
data->ffdbus_message_iter_get_basic(&dictIterator, &key);
if(!data->ffdbus_message_iter_has_next(&dictIterator))
FF_DBUS_ITER_CONTINUE(arrayIterator)
const char* key;
data->ffdbus_message_iter_get_basic(&dictIterator, &key);
data->ffdbus_message_iter_next(&dictIterator);
if(data->ffdbus_message_iter_get_arg_type(&dictIterator) != DBUS_TYPE_VARIANT)
@@ -142,11 +150,11 @@ static bool detectSong(const char* player, FFMediaResult* result, DBusData* data
data->ffdbus_message_iter_recurse(&dictIterator, &valueIter);
if(strcmp(key, "xesam:title") == 0)
getString(&valueIter, &result->song, data);
getValue(&valueIter, &result->song, data);
else if(strcmp(key, "xesam:album") == 0)
getString(&valueIter, &result->album, data);
getValue(&valueIter, &result->album, data);
else if(strcmp(key, "xesam:artist") == 0)
getArray(&valueIter, &result->artist, data);
getValue(&valueIter, &result->artist, data);
if(result->song.length > 0 && result->artist.length > 0 && result->album.length > 0)
break;