PublicIP: support JSON config

This commit is contained in:
李通洲
2023-06-08 09:41:22 +08:00
committed by 李通洲
parent a4a801d83a
commit 7f9ff587ce
12 changed files with 182 additions and 89 deletions
+2 -6
View File
@@ -90,7 +90,7 @@ static void defaultConfig(FFinstance* instance)
ffInitPowerAdapterOptions(&instance->config.powerAdapter);
ffInitLocaleOptions(&instance->config.locale);
ffInitLocalIpOptions(&instance->config.localIP);
initModuleArg(&instance->config.publicIP);
ffInitPublicIpOptions(&instance->config.publicIP);
initModuleArg(&instance->config.weather);
ffInitWifiOptions(&instance->config.wifi);
ffInitPlayerOptions(&instance->config.player);
@@ -132,9 +132,6 @@ static void defaultConfig(FFinstance* instance)
ffStrbufInit(&instance->config.libwlanapi);
ffStrbufInit(&instance->config.libnm);
instance->config.publicIpTimeout = 0;
ffStrbufInit(&instance->config.publicIpUrl);
instance->config.weatherTimeout = 0;
ffStrbufInitS(&instance->config.weatherOutputFormat, "%t+-+%C+(%l)");
@@ -307,7 +304,7 @@ static void destroyConfig(FFinstance* instance)
ffDestroyPowerAdapterOptions(&instance->config.powerAdapter);
ffDestroyLocaleOptions(&instance->config.locale);
ffDestroyLocalIpOptions(&instance->config.localIP);
destroyModuleArg(&instance->config.publicIP);
ffDestroyPublicIpOptions(&instance->config.publicIP);
ffDestroyWallpaperOptions(&instance->config.wallpaper);
destroyModuleArg(&instance->config.weather);
ffDestroyWifiOptions(&instance->config.wifi);
@@ -349,7 +346,6 @@ static void destroyConfig(FFinstance* instance)
ffStrbufDestroy(&instance->config.libwlanapi);
ffStrbufDestroy(&instance->config.libnm);
ffStrbufDestroy(&instance->config.publicIpUrl);
ffStrbufDestroy(&instance->config.weatherOutputFormat);
}