fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-29 16:26:39 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Media: make it able to print player info in custom format

Browse Source
This commit is contained in:
Carter Li
2024-12-25 09:04:10 +08:00
parent 28ec935c42
commit f38a51c9bc
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/media/media.c
+14 -4
View File
@@ -99,6 +99,9 @@ void ffPrintMedia(FFMediaOptions* options)
FF_FORMAT_ARG(media->artist, "artist"),
FF_FORMAT_ARG(media->album, "album"),
FF_FORMAT_ARG(media->status, "status"),
FF_FORMAT_ARG(media->player, "player-name"),
FF_FORMAT_ARG(media->playerId, "player-id"),
FF_FORMAT_ARG(media->url, "url"),
}));
}
}
@@ -149,10 +152,17 @@ void ffGenerateMediaJsonResult(FF_MAYBE_UNUSED FFMediaOptions* options, yyjson_m
}
yyjson_mut_val* obj = yyjson_mut_obj_add_obj(doc, module, "result");
yyjson_mut_obj_add_strbuf(doc, obj, "song", &media->song);
yyjson_mut_obj_add_strbuf(doc, obj, "artist", &media->artist);
yyjson_mut_obj_add_strbuf(doc, obj, "album", &media->album);
yyjson_mut_obj_add_strbuf(doc, obj, "status", &media->status);
yyjson_mut_val* song = yyjson_mut_obj_add_obj(doc, obj, "song");
yyjson_mut_obj_add_strbuf(doc, song, "name", &media->song);
yyjson_mut_obj_add_strbuf(doc, song, "artist", &media->artist);
yyjson_mut_obj_add_strbuf(doc, song, "album", &media->album);
yyjson_mut_obj_add_strbuf(doc, song, "status", &media->status);
yyjson_mut_val* player = yyjson_mut_obj_add_obj(doc, obj, "player");
yyjson_mut_obj_add_strbuf(doc, player, "name", &media->player);
yyjson_mut_obj_add_strbuf(doc, player, "id", &media->playerId);
yyjson_mut_obj_add_strbuf(doc, player, "url", &media->url);
}
static FFModuleBaseInfo ffModuleInfo = {
src/modules/player/player.c
+1 -12
View File
@@ -118,18 +118,7 @@ void ffGeneratePlayerJsonConfig(FFPlayerOptions* options, yyjson_mut_doc* doc, y
void ffGeneratePlayerJsonResult(FF_MAYBE_UNUSED FFMediaOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
{
const FFMediaResult* media = ffDetectMedia();
if(media->error.length > 0)
{
yyjson_mut_obj_add_strbuf(doc, module, "error", &media->error);
return;
}
yyjson_mut_val* obj = yyjson_mut_obj_add_obj(doc, module, "result");
yyjson_mut_obj_add_strbuf(doc, obj, "player", &media->player);
yyjson_mut_obj_add_strbuf(doc, obj, "playerId", &media->playerId);
yyjson_mut_obj_add_strbuf(doc, obj, "url", &media->url);
yyjson_mut_obj_add_str(doc, module, "error", "Player module is an alias of Media module");
}
static FFModuleBaseInfo ffModuleInfo = {