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

DateTime: init support of JSON config

Browse Source 
Redundant modules `Date` and `Time` are removed
This commit is contained in:
李通洲
2023-03-09 19:38:03 +08:00
parent c5dcf522c4
commit da81111575
13 changed files with 138 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/date.c
-20
View File
@@ -1,20 +0,0 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/datetime/datetime.h"
#define FF_DATE_MODULE_NAME "Date"
void ffPrintDate(FFinstance* instance)
{
if(instance->config.date.outputFormat.length > 0)
{
ffPrintDateTimeFormat(instance, FF_DATE_MODULE_NAME, &instance->config.date);
return;
}
const FFDateTimeResult* datetime = ffDetectDateTime(instance);
ffPrintLogoAndKey(instance, FF_DATE_MODULE_NAME, 0, &instance->config.date.key);
//yyyy-mm-dd
printf("%u-%s-%u\n", datetime->year, datetime->monthPretty.chars, datetime->dayInMonth);
}
src/modules/datetime.c
-48
View File
@@ -1,48 +0,0 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/datetime/datetime.h"
#define FF_DATETIME_MODULE_NAME "Date & Time"
#define FF_DATETIME_NUM_FORMAT_ARGS 20
void ffPrintDateTimeFormat(FFinstance* instance, const char* moduleName, const FFModuleArgs* moduleArgs)
{
const FFDateTimeResult* result = ffDetectDateTime(instance);
ffPrintFormat(instance, moduleName, 0, moduleArgs, FF_DATETIME_NUM_FORMAT_ARGS, (FFformatarg[]) {
{FF_FORMAT_ARG_TYPE_UINT16, &result->year},
{FF_FORMAT_ARG_TYPE_UINT8, &result->yearShort},
{FF_FORMAT_ARG_TYPE_UINT8, &result->month},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->monthPretty},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->monthName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->monthNameShort},
{FF_FORMAT_ARG_TYPE_UINT8, &result->week},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->weekday},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->weekdayShort},
{FF_FORMAT_ARG_TYPE_UINT16, &result->dayInYear},
{FF_FORMAT_ARG_TYPE_UINT8, &result->dayInMonth},
{FF_FORMAT_ARG_TYPE_UINT8, &result->dayInWeek},
{FF_FORMAT_ARG_TYPE_UINT8, &result->hour},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->hourPretty},
{FF_FORMAT_ARG_TYPE_UINT8, &result->hour12},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->hour12Pretty},
{FF_FORMAT_ARG_TYPE_UINT8, &result->minute},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->minutePretty},
{FF_FORMAT_ARG_TYPE_UINT8, &result->second},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->secondPretty}
});
}
void ffPrintDateTime(FFinstance* instance)
{
if(instance->config.dateTime.outputFormat.length > 0)
{
ffPrintDateTimeFormat(instance, FF_DATETIME_MODULE_NAME, &instance->config.dateTime);
return;
}
const FFDateTimeResult* datetime = ffDetectDateTime(instance);
ffPrintLogoAndKey(instance, FF_DATETIME_MODULE_NAME, 0, &instance->config.dateTime.key);
//yyyy-MM-dd HH:mm:ss
printf("%u-%s-%02u %s:%s:%s\n", datetime->year, datetime->monthPretty.chars, datetime->dayInMonth, datetime->hourPretty.chars, datetime->minutePretty.chars, datetime->secondPretty.chars);
}
src/modules/datetime/datetime.c
+102
View File
@@ -0,0 +1,102 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/datetime/datetime.h"
#include "modules/datetime/datetime.h"
#define FF_DATETIME_MODULE_NAME "DateTime"
#define FF_DATETIME_DISPLAY_NAME "Date & Time"
#define FF_DATETIME_NUM_FORMAT_ARGS 20
void ffPrintDateTimeFormat(FFinstance* instance, const char* moduleName, const FFModuleArgs* moduleArgs)
{
const FFDateTimeResult* result = ffDetectDateTime(instance);
ffPrintFormat(instance, moduleName, 0, moduleArgs, FF_DATETIME_NUM_FORMAT_ARGS, (FFformatarg[]) {
{FF_FORMAT_ARG_TYPE_UINT16, &result->year}, // 1
{FF_FORMAT_ARG_TYPE_UINT8, &result->yearShort}, // 2
{FF_FORMAT_ARG_TYPE_UINT8, &result->month}, // 3
{FF_FORMAT_ARG_TYPE_STRBUF, &result->monthPretty}, // 4
{FF_FORMAT_ARG_TYPE_STRBUF, &result->monthName}, // 5
{FF_FORMAT_ARG_TYPE_STRBUF, &result->monthNameShort}, // 6
{FF_FORMAT_ARG_TYPE_UINT8, &result->week}, // 7
{FF_FORMAT_ARG_TYPE_STRBUF, &result->weekday}, // 8
{FF_FORMAT_ARG_TYPE_STRBUF, &result->weekdayShort}, // 9
{FF_FORMAT_ARG_TYPE_UINT16, &result->dayInYear}, // 10
{FF_FORMAT_ARG_TYPE_UINT8, &result->dayInMonth}, // 11
{FF_FORMAT_ARG_TYPE_UINT8, &result->dayInWeek}, // 12
{FF_FORMAT_ARG_TYPE_UINT8, &result->hour}, // 13
{FF_FORMAT_ARG_TYPE_STRBUF, &result->hourPretty}, // 14
{FF_FORMAT_ARG_TYPE_UINT8, &result->hour12}, // 15
{FF_FORMAT_ARG_TYPE_STRBUF, &result->hour12Pretty}, // 16
{FF_FORMAT_ARG_TYPE_UINT8, &result->minute}, // 17
{FF_FORMAT_ARG_TYPE_STRBUF, &result->minutePretty}, // 18
{FF_FORMAT_ARG_TYPE_UINT8, &result->second}, // 19
{FF_FORMAT_ARG_TYPE_STRBUF, &result->secondPretty} // 20
});
}
void ffPrintDateTime(FFinstance* instance, FFDateTimeOptions* options)
{
if(options->moduleArgs.outputFormat.length > 0)
{
ffPrintDateTimeFormat(instance, FF_DATETIME_DISPLAY_NAME, &options->moduleArgs);
return;
}
const FFDateTimeResult* datetime = ffDetectDateTime(instance);
ffPrintLogoAndKey(instance, FF_DATETIME_DISPLAY_NAME, 0, &options->moduleArgs.key);
//yyyy-MM-dd HH:mm:ss
printf("%u-%s-%02u %s:%s:%s\n", datetime->year, datetime->monthPretty.chars, datetime->dayInMonth, datetime->hourPretty.chars, datetime->minutePretty.chars, datetime->secondPretty.chars);
}
void ffInitDateTimeOptions(FFDateTimeOptions* options)
{
options->moduleName = FF_DATETIME_MODULE_NAME;
ffOptionInitModuleArg(&options->moduleArgs);
}
bool ffParseDateTimeCommandOptions(FFDateTimeOptions* options, const char* key, const char* value)
{
const char* subKey = ffOptionTestPrefix(key, FF_DATETIME_MODULE_NAME);
if (!subKey) return false;
if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
return true;
return false;
}
void ffDestroyDateTimeOptions(FFDateTimeOptions* options)
{
ffOptionDestroyModuleArg(&options->moduleArgs);
}
#ifdef FF_HAVE_JSONC
bool ffParseDateTimeJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module)
{
if (strcasecmp(type, FF_DATETIME_MODULE_NAME) != 0)
return false;
FFDateTimeOptions __attribute__((__cleanup__(ffDestroyDateTimeOptions))) options;
ffInitDateTimeOptions(&options);
if (module)
{
struct lh_entry* entry;
lh_foreach(data->ffjson_object_get_object(module), entry)
{
const char* key = (const char *)lh_entry_k(entry);
if (strcasecmp(key, "type") == 0)
continue;
json_object* val = (struct json_object *)lh_entry_v(entry);
if (ffJsonConfigParseModuleArgs(data, key, val, &options.moduleArgs))
continue;
ffPrintError(instance, FF_DATETIME_DISPLAY_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
}
}
ffPrintDateTime(instance, &options);
return true;
}
#endif
src/modules/datetime/datetime.h
+14
View File
@@ -0,0 +1,14 @@
#pragma once
#include "fastfetch.h"
#include "modules/datetime/option.h"
void ffPrintDateTime(FFinstance* instance, FFDateTimeOptions* options);
void ffInitDateTimeOptions(FFDateTimeOptions* options);
bool ffParseDateTimeCommandOptions(FFDateTimeOptions* options, const char* key, const char* value);
void ffDestroyDateTimeOptions(FFDateTimeOptions* options);
#ifdef FF_HAVE_JSONC
#include "common/config.h"
bool ffParseDateTimeJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module);
#endif
src/modules/datetime/option.h
+11
View File
@@ -0,0 +1,11 @@
#pragma once
// This file will be included in "fastfetch.h", do NOT put unnecessary things here
#include "common/option.h"
typedef struct FFDateTimeOptions
{
const char* moduleName;
FFModuleArgs moduleArgs;
} FFDateTimeOptions;
src/modules/jsonconfig/jsonconfig.c
+1
View File
@@ -15,6 +15,7 @@ static inline bool parseModuleJsonObject(FFinstance* instance, const char* type,
ffParseTitleJsonObject(instance, type, data, module) ||
ffParseBatteryJsonObject(instance, type, data, module) ||
ffParseCommandJsonObject(instance, type, data, module) ||
ffParseDateTimeJsonObject(instance, type, data, module) ||
ffParseOSJsonObject(instance, type, data, module) ||
ffParseSeparatorJsonObject(instance, type, data, module) ||
false;
src/modules/modules.h
+1
View File
@@ -5,6 +5,7 @@
#include "modules/os/os.h"
#include "modules/battery/battery.h"
#include "modules/command/command.h"
#include "modules/datetime/datetime.h"
#include "modules/separator/separator.h"
#include "modules/title/title.h"
#include "modules/jsonconfig/jsonconfig.h"
src/modules/options.h
+2 -1
View File
@@ -3,7 +3,8 @@
// For "fastfetch.h"
#include "modules/battery/option.h"
#include "modules/os/option.h"
#include "modules/command/option.h"
#include "modules/datetime/option.h"
#include "modules/os/option.h"
#include "modules/separator/option.h"
#include "modules/title/option.h"
src/modules/time.c
-20
View File
@@ -1,20 +0,0 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/datetime/datetime.h"
#define FF_TIME_MODULE_NAME "Time"
void ffPrintTime(FFinstance* instance)
{
if(instance->config.time.outputFormat.length > 0)
{
ffPrintDateTimeFormat(instance, FF_TIME_MODULE_NAME, &instance->config.time);
return;
}
const FFDateTimeResult* datetime = ffDetectDateTime(instance);
ffPrintLogoAndKey(instance, FF_TIME_MODULE_NAME, 0, &instance->config.time.key);
//hh:mm:ss
printf("%s:%s:%s\n", datetime->hourPretty.chars, datetime->minutePretty.chars, datetime->secondPretty.chars);
}