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

PowerAdapter: support JSON config

Browse Source
This commit is contained in:
李通洲 2023-06-05 16:57:55 +08:00 committed by 李通洲
parent d5557976d5
commit 823f773e26
14 changed files with 146 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -292,8 +292,8 @@ set(LIBFASTFETCH_SRC
src/modules/os/os.c
src/modules/packages/packages.c
src/modules/player.c
src/modules/poweradapter.c
src/modules/processes.c
src/modules/poweradapter/poweradapter.c
src/modules/publicip.c
src/modules/display/display.c
src/modules/separator/separator.c

4
src/common/init.c
View File

@ -88,7 +88,7 @@ static void defaultConfig(FFinstance* instance)
ffInitSwapOptions(&instance->config.swap);
ffInitDiskOptions(&instance->config.disk);
ffInitBatteryOptions(&instance->config.battery);
initModuleArg(&instance->config.powerAdapter);
ffInitPowerAdapterOptions(&instance->config.powerAdapter);
ffInitLocaleOptions(&instance->config.locale);
ffInitLocalIpOptions(&instance->config.localIP);
initModuleArg(&instance->config.publicIP);
@ -307,7 +307,7 @@ static void destroyConfig(FFinstance* instance)
ffDestroySwapOptions(&instance->config.swap);
ffDestroyDiskOptions(&instance->config.disk);
ffDestroyBatteryOptions(&instance->config.battery);
destroyModuleArg(&instance->config.powerAdapter);
ffDestroyPowerAdapterOptions(&instance->config.powerAdapter);
ffDestroyLocaleOptions(&instance->config.locale);
ffDestroyLocalIpOptions(&instance->config.localIP);
destroyModuleArg(&instance->config.publicIP);

4
src/detection/poweradapter/poweradapter.h
View File

@ -16,7 +16,7 @@ typedef struct PowerAdapterResult
const char* ffDetectPowerAdapterImpl(FFinstance* instance, FFlist* results);
#define FF_POWER_ADAPTER_UNSET -2
#define FF_POWER_ADAPTER_NOT_CONNECTED -1
#define FF_POWERADAPTER_UNSET -2
#define FF_POWERADAPTER_NOT_CONNECTED -1
#endif

4
src/detection/poweradapter/poweradapter_apple.c
View File

@ -32,14 +32,14 @@ const char* ffDetectPowerAdapterImpl(FFinstance* instance, FFlist* results)
ffStrbufInit(&adapter->description);
ffStrbufInit(&adapter->manufacturer);
ffStrbufInit(&adapter->modelName);
adapter->watts = FF_POWER_ADAPTER_UNSET;
adapter->watts = FF_POWERADAPTER_UNSET;
CFDictionaryRef adapterDict;
if(!ffCfDictGetDict(properties, CFSTR("AdapterDetails"), &adapterDict))
{
if (ffCfDictGetInt(adapterDict, CFSTR("Watts"), &adapter->watts))
{
adapter->watts = FF_POWER_ADAPTER_NOT_CONNECTED;
adapter->watts = FF_POWERADAPTER_NOT_CONNECTED;
continue;
}
ffCfDictGetString(adapterDict, CFSTR("Name"), &adapter->name);

6
src/fastfetch.c
View File

@ -1006,7 +1006,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
else if(ffParseSwapCommandOptions(&instance->config.swap, key, value)) {}
else if(ffParseDiskCommandOptions(&instance->config.disk, key, value)) {}
else if(ffParseBatteryCommandOptions(&instance->config.battery, key, value)) {}
else if(optionParseModuleArgs(key, value, "poweradapter", &instance->config.powerAdapter)) {}
else if(ffParsePowerAdapterCommandOptions(&instance->config.powerAdapter, key, value)) {}
else if(ffParseLocaleCommandOptions(&instance->config.locale, key, value)) {}
else if(ffParseLocalIpCommandOptions(&instance->config.localIP, key, value)) {}
else if(optionParseModuleArgs(key, value, "publicip", &instance->config.publicIP)) {}
@ -1228,8 +1228,8 @@ static void parseStructureCommand(FFinstance* instance, const char* line)
ffPrintDisk(instance, &instance->config.disk);
else if(strcasecmp(line, FF_BATTERY_MODULE_NAME) == 0)
ffPrintBattery(instance, &instance->config.battery);
else if(strcasecmp(line, "poweradapter") == 0)
ffPrintPowerAdapter(instance);
else if(strcasecmp(line, FF_POWERADAPTER_MODULE_NAME) == 0)
ffPrintPowerAdapter(instance, &instance->config.powerAdapter);
else if(strcasecmp(line, FF_LOCALE_MODULE_NAME) == 0)
ffPrintLocale(instance, &instance->config.locale);
else if(strcasecmp(line, "localip") == 0)

3
src/fastfetch.h
View File

@ -89,7 +89,7 @@ typedef struct FFconfig
FFSwapOptions swap;
FFDiskOptions disk;
FFBatteryOptions battery;
FFModuleArgs powerAdapter;
FFPowerAdapterOptions powerAdapter;
FFLocaleOptions locale;
FFLocalIpOptions localIP;
FFModuleArgs publicIP;
@ -203,7 +203,6 @@ void ffPrintWM(FFinstance* instance);
void ffPrintTheme(FFinstance* instance);
void ffPrintIcons(FFinstance* instance);
void ffPrintWallpaper(FFinstance* instance);
void ffPrintPowerAdapter(FFinstance* instance);
void ffPrintPlayer(FFinstance* instance);
void ffPrintMedia(FFinstance* instance);
void ffPrintPublicIp(FFinstance* instance);

2
src/flashfetch.c
View File

@ -49,7 +49,7 @@ int main(int argc, char** argv)
ffPrintSwap(&instance, &instance.config.swap);
ffPrintDisk(&instance, &instance.config.disk);
ffPrintBattery(&instance, &instance.config.battery);
ffPrintPowerAdapter(&instance);
ffPrintPowerAdapter(&instance, &instance.config.powerAdapter);
//ffPrintPlayer(&instance);
//ffPrintMedia(&instance);
//ffPrintLocalIp(&instance);

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

@ -103,6 +103,7 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, json_o
case 'P': {
return
tryModule(instance, type, module, FF_PACKAGES_MODULE_NAME, ffParsePackagesJsonObject) ||
tryModule(instance, type, module, FF_POWERADAPTER_MODULE_NAME, ffParsePowerAdapterJsonObject) ||
false;
}

1
src/modules/modules.h
View File

@ -27,6 +27,7 @@
#include "modules/memory/memory.h"
#include "modules/os/os.h"
#include "modules/packages/packages.h"
#include "modules/poweradapter/poweradapter.h"
#include "modules/separator/separator.h"
#include "modules/shell/shell.h"
#include "modules/sound/sound.h"

1
src/modules/options.h
View File

@ -25,6 +25,7 @@
#include "modules/memory/option.h"
#include "modules/os/option.h"
#include "modules/packages/option.h"
#include "modules/poweradapter/option.h"
#include "modules/separator/option.h"
#include "modules/shell/option.h"
#include "modules/sound/option.h"

66
src/modules/poweradapter.c
View File

@ -1,66 +0,0 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/poweradapter/poweradapter.h"
#define FF_POWER_ADAPTER_MODULE_NAME "Power Adapter"
#define FF_POWER_ADAPTER_MODULE_ARGS 5
static void printPowerAdapter(FFinstance* instance, const PowerAdapterResult* result, uint8_t index)
{
if(result->watts != FF_POWER_ADAPTER_UNSET)
{
if(instance->config.powerAdapter.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_POWER_ADAPTER_MODULE_NAME, index, &instance->config.powerAdapter.key);
if(result->name.length > 0)
puts(result->name.chars);
else if(result->watts == FF_POWER_ADAPTER_NOT_CONNECTED)
puts("not connected");
else
printf("%dW\n", result->watts);
}
else
{
ffPrintFormat(instance, FF_POWER_ADAPTER_MODULE_NAME, index, &instance->config.powerAdapter, FF_POWER_ADAPTER_MODULE_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_INT, &result->watts},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->name},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->manufacturer},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->modelName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->description},
});
}
}
}
void ffPrintPowerAdapter(FFinstance* instance)
{
FFlist results;
ffListInitA(&results, sizeof(PowerAdapterResult), 0);
const char* error = ffDetectPowerAdapterImpl(instance, &results);
if (error)
{
ffPrintError(instance, FF_POWER_ADAPTER_MODULE_NAME, 0, &instance->config.powerAdapter, "%s", error);
}
else if(results.length == 0)
{
ffPrintError(instance, FF_POWER_ADAPTER_MODULE_NAME, 0, &instance->config.powerAdapter, "No power adapters found");
}
else
{
for(uint8_t i = 0; i < (uint8_t) results.length; i++)
{
PowerAdapterResult* result = ffListGet(&results, i);
printPowerAdapter(instance, result, i);
ffStrbufDestroy(&result->manufacturer);
ffStrbufDestroy(&result->description);
ffStrbufDestroy(&result->modelName);
ffStrbufDestroy(&result->name);
}
}
ffListDestroy(&results);
}

11
src/modules/poweradapter/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 FFPowerAdapterOptions
{
const char* moduleName;
FFModuleArgs moduleArgs;
} FFPowerAdapterOptions;

105
src/modules/poweradapter/poweradapter.c Normal file
View File

@ -0,0 +1,105 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/poweradapter/poweradapter.h"
#include "modules/poweradapter/poweradapter.h"
#define FF_POWERADAPTER_DISPLAY_NAME "Power Adapter"
#define FF_POWERADAPTER_MODULE_ARGS 5
void ffPrintPowerAdapter(FFinstance* instance, FFPowerAdapterOptions* options)
{
FFlist results;
ffListInit(&results, sizeof(PowerAdapterResult));
const char* error = ffDetectPowerAdapterImpl(instance, &results);
if (error)
{
ffPrintError(instance, FF_POWERADAPTER_DISPLAY_NAME, 0, &options->moduleArgs, "%s", error);
}
else if(results.length == 0)
{
ffPrintError(instance, FF_POWERADAPTER_DISPLAY_NAME, 0, &options->moduleArgs, "No power adapters found");
}
else
{
for(uint8_t i = 0; i < (uint8_t) results.length; i++)
{
PowerAdapterResult* result = ffListGet(&results, i);
if(result->watts != FF_POWERADAPTER_UNSET)
{
if(options->moduleArgs.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_POWERADAPTER_DISPLAY_NAME, i, &options->moduleArgs.key);
if(result->name.length > 0)
puts(result->name.chars);
else if(result->watts == FF_POWERADAPTER_NOT_CONNECTED)
puts("not connected");
else
printf("%dW\n", result->watts);
}
else
{
ffPrintFormat(instance, FF_POWERADAPTER_DISPLAY_NAME, i, &options->moduleArgs, FF_POWERADAPTER_MODULE_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_INT, &result->watts},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->name},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->manufacturer},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->modelName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->description},
});
}
}
ffStrbufDestroy(&result->manufacturer);
ffStrbufDestroy(&result->description);
ffStrbufDestroy(&result->modelName);
ffStrbufDestroy(&result->name);
}
}
ffListDestroy(&results);
}
void ffInitPowerAdapterOptions(FFPowerAdapterOptions* options)
{
options->moduleName = FF_POWERADAPTER_MODULE_NAME;
ffOptionInitModuleArg(&options->moduleArgs);
}
bool ffParsePowerAdapterCommandOptions(FFPowerAdapterOptions* options, const char* key, const char* value)
{
const char* subKey = ffOptionTestPrefix(key, FF_POWERADAPTER_MODULE_NAME);
if (!subKey) return false;
if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
return true;
return false;
}
void ffDestroyPowerAdapterOptions(FFPowerAdapterOptions* options)
{
ffOptionDestroyModuleArg(&options->moduleArgs);
}
#ifdef FF_HAVE_JSONC
void ffParsePowerAdapterJsonObject(FFinstance* instance, json_object* module)
{
FFPowerAdapterOptions __attribute__((__cleanup__(ffDestroyPowerAdapterOptions))) options;
ffInitPowerAdapterOptions(&options);
if (module)
{
json_object_object_foreach(module, key, val)
{
if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
continue;
ffPrintError(instance, FF_POWERADAPTER_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
}
}
ffPrintPowerAdapter(instance, &options);
}
#endif

15
src/modules/poweradapter/poweradapter.h Normal file
View File

@ -0,0 +1,15 @@
#pragma once
#include "fastfetch.h"
#define FF_POWERADAPTER_MODULE_NAME "PowerAdapter"
void ffPrintPowerAdapter(FFinstance* instance, FFPowerAdapterOptions* options);
void ffInitPowerAdapterOptions(FFPowerAdapterOptions* options);
bool ffParsePowerAdapterCommandOptions(FFPowerAdapterOptions* options, const char* key, const char* value);
void ffDestroyPowerAdapterOptions(FFPowerAdapterOptions* options);
#ifdef FF_HAVE_JSONC
#include "common/jsonconfig.h"
void ffParsePowerAdapterJsonObject(FFinstance* instance, json_object* module);
#endif