fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-03 11:44:18 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Global: code refactor

Browse Source
This commit is contained in:
李通洲
2023-10-26 15:39:28 +08:00
parent 72d138f8c4
commit f45654620f
5 changed files with 107 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fastfetch.c
+5 -4
View File
@@ -628,7 +628,7 @@ static void run(FFdata* data)
const bool useJsonConfig = data->structure.length == 0 && instance.state.configDoc;
if (useJsonConfig)
ffPrintJsonConfig(true /* prepare */);
ffPrintJsonConfig(true /* prepare */, instance.state.resultDoc);
else
ffPrepareCommandOption(data);
@@ -639,9 +639,9 @@ static void run(FFdata* data)
#endif
if (useJsonConfig)
ffPrintJsonConfig(false);
ffPrintJsonConfig(false, instance.state.resultDoc);
else
ffPrintCommandOption(data);
ffPrintCommandOption(data, instance.state.resultDoc);
if (instance.state.resultDoc)
yyjson_mut_write_fp(stdout, instance.state.resultDoc, YYJSON_WRITE_INF_AND_NAN_AS_NULL | YYJSON_WRITE_PRETTY_TWO_SPACES, NULL, NULL);
@@ -655,7 +655,8 @@ static void migrateConfig(FFdata* data)
ffOptionsGenerateDisplayJsonConfig(&instance.config.display, instance.state.migrateConfigDoc);
ffOptionsGenerateGeneralJsonConfig(&instance.config.general, instance.state.migrateConfigDoc);
ffOptionsGenerateLibraryJsonConfig(&instance.config.library, instance.state.migrateConfigDoc);
ffMigrateCommandOptionToJsonc(data);
ffMigrateCommandOptionToJsonc(data, instance.state.migrateConfigDoc);
yyjson_mut_write_fp(stdout, instance.state.migrateConfigDoc, YYJSON_WRITE_INF_AND_NAN_AS_NULL | YYJSON_WRITE_PRETTY_TWO_SPACES, NULL, NULL);
}
int main(int argc, const char** argv)