malhuda/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2025-02-20 11:43:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wifi: support JSON config

Browse Source
This commit is contained in:
李通洲 2023-05-23 15:30:59 +08:00 committed by 李通洲
parent f3190b8979
commit 2f5c198a81
10 changed files with 86 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -310,7 +310,7 @@ set(LIBFASTFETCH_SRC
src/modules/vulkan.c
src/modules/wallpaper.c
src/modules/weather.c
src/modules/wifi.c
src/modules/wifi/wifi.c
src/modules/wm.c
src/modules/wmtheme/wmtheme.c
src/modules/jsonconfig/jsonconfig.c

4
src/common/init.c
View File

@ -93,7 +93,7 @@ static void defaultConfig(FFinstance* instance)
ffInitLocalIpOptions(&instance->config.localIP);
initModuleArg(&instance->config.publicIP);
initModuleArg(&instance->config.weather);
initModuleArg(&instance->config.wifi);
ffInitWifiOptions(&instance->config.wifi);
initModuleArg(&instance->config.player);
initModuleArg(&instance->config.media);
ffInitDateTimeOptions(&instance->config.dateTime);
@ -316,7 +316,7 @@ static void destroyConfig(FFinstance* instance)
destroyModuleArg(&instance->config.publicIP);
destroyModuleArg(&instance->config.wallpaper);
destroyModuleArg(&instance->config.weather);
destroyModuleArg(&instance->config.wifi);
ffDestroyWifiOptions(&instance->config.wifi);
destroyModuleArg(&instance->config.player);
destroyModuleArg(&instance->config.media);
ffDestroyDateTimeOptions(&instance->config.dateTime);

6
src/fastfetch.c
View File

@ -989,7 +989,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
else if(ffParseDisplayCommandOptions(&instance->config.display, key, value)) {}
else if(ffParseBrightnessCommandOptions(&instance->config.brightness, key, value)) {}
else if(optionParseModuleArgs(key, value, "de", &instance->config.de)) {}
else if(optionParseModuleArgs(key, value, "wifi", &instance->config.wifi)) {}
else if(ffParseWifiCommandOptions(&instance->config.wifi, key, value)) {}
else if(optionParseModuleArgs(key, value, "wm", &instance->config.wm)) {}
else if(ffParseWMThemeCommandOptions(&instance->config.wmTheme, key, value)) {}
else if(optionParseModuleArgs(key, value, "theme", &instance->config.theme)) {}
@ -1240,8 +1240,8 @@ static void parseStructureCommand(FFinstance* instance, const char* line)
ffPrintLocalIp(instance, &instance->config.localIP);
else if(strcasecmp(line, "publicip") == 0)
ffPrintPublicIp(instance);
else if(strcasecmp(line, "wifi") == 0)
ffPrintWifi(instance);
else if(strcasecmp(line, FF_WIFI_MODULE_NAME) == 0)
ffPrintWifi(instance, &instance->config.wifi);
else if(strcasecmp(line, "weather") == 0)
ffPrintWeather(instance);
else if(strcasecmp(line, "player") == 0)

3
src/fastfetch.h
View File

@ -72,7 +72,7 @@ typedef struct FFconfig
FFDisplayOptions display;
FFModuleArgs de;
FFModuleArgs wallpaper;
FFModuleArgs wifi;
FFWifiOptions wifi;
FFModuleArgs wm;
FFWMThemeOptions wmTheme;
FFModuleArgs theme;
@ -215,7 +215,6 @@ void ffPrintPlayer(FFinstance* instance);
void ffPrintMedia(FFinstance* instance);
void ffPrintPublicIp(FFinstance* instance);
void ffPrintWeather(FFinstance* instance);
void ffPrintWifi(FFinstance* instance);
void ffPrintColors(FFinstance* instance);
void ffPrintVulkan(FFinstance* instance);
void ffPrintOpenGL(FFinstance* instance);

1
src/modules/jsonconfig/jsonconfig.c
View File

@ -122,6 +122,7 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, json_o
case 'W': {
return
tryModule(instance, type, module, FF_WIFI_MODULE_NAME, ffParseWifiJsonObject) ||
tryModule(instance, type, module, FF_WMTHEME_MODULE_NAME, ffParseWMThemeJsonObject) ||
false;
}

1
src/modules/modules.h
View File

@ -32,4 +32,5 @@
#include "modules/title/title.h"
#include "modules/jsonconfig/jsonconfig.h"
#include "modules/uptime/uptime.h"
#include "modules/wifi/wifi.h"
#include "modules/wmtheme/wmtheme.h"

1
src/modules/options.h
View File

@ -29,4 +29,5 @@
#include "modules/swap/option.h"
#include "modules/title/option.h"
#include "modules/uptime/option.h"
#include "modules/wifi/option.h"
#include "modules/wmtheme/option.h"

11
src/modules/wifi/option.h Normal file
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 FFWifiOptions
{
const char* moduleName;
FFModuleArgs moduleArgs;
} FFWifiOptions;

56
src/modules/wifi.c → src/modules/wifi/wifi.c
View File

@ -1,23 +1,23 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/wifi/wifi.h"
#include "modules/wifi/wifi.h"
#define FF_WIFI_MODULE_NAME "Wifi"
#define FF_WIFI_NUM_FORMAT_ARGS 10
void ffPrintWifi(FFinstance* instance)
void ffPrintWifi(FFinstance* instance, FFWifiOptions* options)
{
FF_LIST_AUTO_DESTROY result = ffListCreate(sizeof(FFWifiResult));
const char* error = ffDetectWifi(instance, &result);
if(error)
{
ffPrintError(instance, FF_WIFI_MODULE_NAME, 0, &instance->config.wifi, "%s", error);
ffPrintError(instance, FF_WIFI_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
return;
}
if(!result.length)
{
ffPrintError(instance, FF_WIFI_MODULE_NAME, 0, &instance->config.wifi, "No Wifi interfaces found");
ffPrintError(instance, FF_WIFI_MODULE_NAME, 0, &options->moduleArgs, "No Wifi interfaces found");
return;
}
@ -26,9 +26,9 @@ void ffPrintWifi(FFinstance* instance)
FFWifiResult* item = (FFWifiResult*)ffListGet(&result, index);
uint8_t moduleIndex = result.length == 1 ? 0 : (uint8_t)(index + 1);
if(instance->config.wifi.outputFormat.length == 0)
if(options->moduleArgs.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_WIFI_MODULE_NAME, moduleIndex, &instance->config.wifi.key);
ffPrintLogoAndKey(instance, FF_WIFI_MODULE_NAME, moduleIndex, &options->moduleArgs.key);
if(item->conn.ssid.length)
{
ffStrbufWriteTo(&item->conn.ssid, stdout);
@ -45,7 +45,7 @@ void ffPrintWifi(FFinstance* instance)
}
else
{
ffPrintFormat(instance, FF_WIFI_MODULE_NAME, moduleIndex, &instance->config.wifi, FF_WIFI_NUM_FORMAT_ARGS, (FFformatarg[]){
ffPrintFormat(instance, FF_WIFI_MODULE_NAME, moduleIndex, &options->moduleArgs, FF_WIFI_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &item->inf.description},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->inf.status},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.status},
@ -68,3 +68,45 @@ void ffPrintWifi(FFinstance* instance)
ffStrbufDestroy(&item->conn.security);
}
}
void ffInitWifiOptions(FFWifiOptions* options)
{
options->moduleName = FF_WIFI_MODULE_NAME;
ffOptionInitModuleArg(&options->moduleArgs);
}
bool ffParseWifiCommandOptions(FFWifiOptions* options, const char* key, const char* value)
{
const char* subKey = ffOptionTestPrefix(key, FF_WIFI_MODULE_NAME);
if (!subKey) return false;
if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
return true;
return false;
}
void ffDestroyWifiOptions(FFWifiOptions* options)
{
ffOptionDestroyModuleArg(&options->moduleArgs);
}
#ifdef FF_HAVE_JSONC
void ffParseWifiJsonObject(FFinstance* instance, json_object* module)
{
FFWifiOptions __attribute__((__cleanup__(ffDestroyWifiOptions))) options;
ffInitWifiOptions(&options);
if (module)
{
json_object_object_foreach(module, key, val)
{
if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
continue;
ffPrintError(instance, FF_WIFI_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
}
}
ffPrintWifi(instance, &options);
}
#endif

16
src/modules/wifi/wifi.h Normal file
View File

@ -0,0 +1,16 @@
#pragma once
#include "fastfetch.h"
#include "modules/wifi/option.h"
#define FF_WIFI_MODULE_NAME "Wifi"
void ffPrintWifi(FFinstance* instance, FFWifiOptions* options);
void ffInitWifiOptions(FFWifiOptions* options);
bool ffParseWifiCommandOptions(FFWifiOptions* options, const char* key, const char* value);
void ffDestroyWifiOptions(FFWifiOptions* options);
#ifdef FF_HAVE_JSONC
#include "common/jsonconfig.h"
void ffParseWifiJsonObject(FFinstance* instance, json_object* module);
#endif