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

JsonConfig: prepare for module weather and public ip

Browse Source
This commit is contained in:
李通洲
2023-08-18 13:28:07 +08:00
parent 55b9e274b6
commit 77e0d9dba1
6 changed files with 63 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fastfetch.c
+8 -4
View File
@@ -564,7 +564,7 @@ static bool parseJsoncFile(const char* path)
{
if (error.code != YYJSON_READ_ERROR_FILE_OPEN)
{
fprintf(stderr, "ERROR: failed to parse JSON config file `%s` at pos %zu: %s\n", path, error.pos, error.msg);
fprintf(stderr, "Error: failed to parse JSON config file `%s` at pos %zu: %s\n", path, error.pos, error.msg);
exit(477);
}
return false;
@@ -1256,7 +1256,11 @@ int main(int argc, const char** argv)
}
}
if(data.structure.length > 0 || !instance.state.configDoc)
const bool useJsonConfig = data.structure.length == 0 && instance.state.configDoc;
if(useJsonConfig)
ffPrintJsonConfig(true);
else
{
//If we don't have a custom structure, use the default one
if(data.structure.length == 0)
@@ -1281,9 +1285,9 @@ int main(int argc, const char** argv)
if (!instance.config.noBuffer) fflush(stdout);
#endif
if (data.structure.length == 0 && instance.state.configDoc)
if (useJsonConfig)
{
ffPrintJsonConfig();
ffPrintJsonConfig(false);
}
else
{