applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-01 19:35:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[welcome] Support GeoIP country lookup

Browse source
This commit is contained in:
Adriaan de Groot 2019-05-09 15:15:03 -04:00
parent 44559d24bd
commit cb7c38daba
2 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/modules/welcome/WelcomeViewStep.cpp
View file

@ -22,10 +22,12 @@
#include "WelcomePage.h"
#include "checker/GeneralRequirements.h"
#include "geoip/Handler.h"
#include "modulesystem/ModuleManager.h"
#include "utils/Logger.h"
#include "utils/Variant.h"
#include <QFutureWatcher>
#include <QVariant>
CALAMARES_PLUGIN_FACTORY_DEFINITION( WelcomeViewStepFactory, registerPlugin<WelcomeViewStep>(); )
@ -112,6 +114,26 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap )
else
cWarning() << "no valid requirements map found in welcome "
"module configuration.";
bool ok = false;
QVariantMap geoip = CalamaresUtils::getSubMap( configurationMap, "geoip", ok );
if ( ok )
{
using FWString = QFutureWatcher< QString >;
auto* handler = new CalamaresUtils::GeoIP::Handler(
CalamaresUtils::getString( geoip, "style" ),
CalamaresUtils::getString( geoip, "url" ),
CalamaresUtils::getString( geoip, "selector" ) );
auto* future = new FWString();
connect( future, &FWString::finished, [f=future, h=handler]()
{
cDebug() << "GeoIP result for welcome=" << f->future().result();
f->deleteLater();
delete h;
} );
future->setFuture( handler->queryRaw() );
}
}
Calamares::RequirementsList WelcomeViewStep::checkRequirements()